Skip to content

Commit 03ff8d1

Browse files
committed
ext/soap: SoapServer::addFunction() does not need bailout handler wrapper
As this methods never uses the bailout mechanism
1 parent 81ccaac commit 03ff8d1

File tree

1 file changed

+1
-8
lines changed

1 file changed

+1
-8
lines changed

ext/soap/soap.c

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1141,9 +1141,7 @@ PHP_METHOD(SoapServer, addFunction)
11411141
RETURN_THROWS();
11421142
}
11431143

1144-
SOAP_SERVER_BEGIN_CODE();
1145-
1146-
FETCH_THIS_SERVICE(service);
1144+
FETCH_THIS_SERVICE_NO_BAILOUT(service);
11471145

11481146
/* TODO: could use zend_is_callable here */
11491147

@@ -1162,7 +1160,6 @@ PHP_METHOD(SoapServer, addFunction)
11621160

11631161
if (Z_TYPE_P(tmp_function) != IS_STRING) {
11641162
zend_argument_type_error(1, "must contain only strings");
1165-
SOAP_SERVER_END_CODE();
11661163
RETURN_THROWS();
11671164
}
11681165

@@ -1171,7 +1168,6 @@ PHP_METHOD(SoapServer, addFunction)
11711168
if ((f = zend_hash_find_ptr(EG(function_table), key)) == NULL) {
11721169
zend_string_release_ex(key, false);
11731170
zend_type_error("SoapServer::addFunction(): Function \"%s\" not found", Z_STRVAL_P(tmp_function));
1174-
SOAP_SERVER_END_CODE();
11751171
RETURN_THROWS();
11761172
}
11771173

@@ -1190,7 +1186,6 @@ PHP_METHOD(SoapServer, addFunction)
11901186
if ((f = zend_hash_find_ptr(EG(function_table), key)) == NULL) {
11911187
zend_string_release_ex(key, false);
11921188
zend_argument_type_error(1, "must be a valid function name, function \"%s\" not found", Z_STRVAL_P(function_name));
1193-
SOAP_SERVER_END_CODE();
11941189
RETURN_THROWS();
11951190
}
11961191
if (service->soap_functions.ft == NULL) {
@@ -1215,8 +1210,6 @@ PHP_METHOD(SoapServer, addFunction)
12151210
} else {
12161211
zend_argument_type_error(1, "must be of type array|string|int, %s given", zend_zval_value_name(function_name));
12171212
}
1218-
1219-
SOAP_SERVER_END_CODE();
12201213
}
12211214
/* }}} */
12221215

0 commit comments

Comments
 (0)