@@ -1141,9 +1141,7 @@ PHP_METHOD(SoapServer, addFunction)
1141
1141
RETURN_THROWS ();
1142
1142
}
1143
1143
1144
- SOAP_SERVER_BEGIN_CODE ();
1145
-
1146
- FETCH_THIS_SERVICE (service );
1144
+ FETCH_THIS_SERVICE_NO_BAILOUT (service );
1147
1145
1148
1146
/* TODO: could use zend_is_callable here */
1149
1147
@@ -1162,7 +1160,6 @@ PHP_METHOD(SoapServer, addFunction)
1162
1160
1163
1161
if (Z_TYPE_P (tmp_function ) != IS_STRING ) {
1164
1162
zend_argument_type_error (1 , "must contain only strings" );
1165
- SOAP_SERVER_END_CODE ();
1166
1163
RETURN_THROWS ();
1167
1164
}
1168
1165
@@ -1171,7 +1168,6 @@ PHP_METHOD(SoapServer, addFunction)
1171
1168
if ((f = zend_hash_find_ptr (EG (function_table ), key )) == NULL ) {
1172
1169
zend_string_release_ex (key , false);
1173
1170
zend_type_error ("SoapServer::addFunction(): Function \"%s\" not found" , Z_STRVAL_P (tmp_function ));
1174
- SOAP_SERVER_END_CODE ();
1175
1171
RETURN_THROWS ();
1176
1172
}
1177
1173
@@ -1190,7 +1186,6 @@ PHP_METHOD(SoapServer, addFunction)
1190
1186
if ((f = zend_hash_find_ptr (EG (function_table ), key )) == NULL ) {
1191
1187
zend_string_release_ex (key , false);
1192
1188
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 ();
1194
1189
RETURN_THROWS ();
1195
1190
}
1196
1191
if (service -> soap_functions .ft == NULL ) {
@@ -1215,8 +1210,6 @@ PHP_METHOD(SoapServer, addFunction)
1215
1210
} else {
1216
1211
zend_argument_type_error (1 , "must be of type array|string|int, %s given" , zend_zval_value_name (function_name ));
1217
1212
}
1218
-
1219
- SOAP_SERVER_END_CODE ();
1220
1213
}
1221
1214
/* }}} */
1222
1215
0 commit comments