From: Dmitry Stogov Date: Fri, 10 Mar 2006 11:46:52 +0000 (+0000) Subject: Fixed bug #36629 (SoapServer::handle() exits on SOAP faults) X-Git-Tag: php-5.1.3RC2~138 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7ffc24b9f3c99efc2288271418f4848b010e1c18;p=php Fixed bug #36629 (SoapServer::handle() exits on SOAP faults) --- diff --git a/NEWS b/NEWS index 9da6e6cdb1..7ce12fa8da 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,7 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? Mar 2006, PHP 5.1.3RC2 - Fixed debug_zval_dump() to support private and protected members. (Dmitry) +- Fixed bug #36629 (SoapServer::handle() exits on SOAP faults). (Dmitry) 09 Mar 2006, PHP 5.1.3RC1 - Updated PCRE to version 6.6. (Andrei) diff --git a/ext/soap/soap.c b/ext/soap/soap.c index f14d479077..6fe86c483d 100644 --- a/ext/soap/soap.c +++ b/ext/soap/soap.c @@ -1361,7 +1361,7 @@ PHP_METHOD(SoapServer, handle) int num_params = 0, size, i, call_status = 0; xmlChar *buf; HashTable *function_table; - soapHeader *soap_headers; + soapHeader *soap_headers = NULL; sdlFunctionPtr function; char *arg = NULL; int arg_len; @@ -1559,16 +1559,15 @@ PHP_METHOD(SoapServer, handle) php_error_docref(NULL TSRMLS_CC, E_ERROR, "Error calling constructor"); } if (EG(exception)) { + php_end_ob_buffer(0, 0 TSRMLS_CC); if (Z_TYPE_P(EG(exception)) == IS_OBJECT && instanceof_function(Z_OBJCE_P(EG(exception)), soap_fault_class_entry TSRMLS_CC)) { - soap_server_fault_ex(function, EG(exception), NULL TSRMLS_CC); - } else { - zval_dtor(&constructor); - zval_dtor(&c_ret); - zval_ptr_dtor(&tmp_soap); - php_end_ob_buffer(0, 0 TSRMLS_CC); - goto fail; + soap_server_fault_ex(function, EG(exception), NULL TSRMLS_CC); } + zval_dtor(&constructor); + zval_dtor(&c_ret); + zval_ptr_dtor(&tmp_soap); + goto fail; } zval_dtor(&constructor); zval_dtor(&c_ret); @@ -1592,17 +1591,16 @@ PHP_METHOD(SoapServer, handle) } #ifdef ZEND_ENGINE_2 if (EG(exception)) { + php_end_ob_buffer(0, 0 TSRMLS_CC); if (Z_TYPE_P(EG(exception)) == IS_OBJECT && instanceof_function(Z_OBJCE_P(EG(exception)), soap_fault_class_entry TSRMLS_CC)) { soap_server_fault_ex(function, EG(exception), NULL TSRMLS_CC); - } else { - zval_dtor(&constructor); - zval_dtor(&c_ret); - efree(class_name); - zval_ptr_dtor(&tmp_soap); - php_end_ob_buffer(0, 0 TSRMLS_CC); - goto fail; } + zval_dtor(&constructor); + zval_dtor(&c_ret); + efree(class_name); + zval_ptr_dtor(&tmp_soap); + goto fail; } #endif zval_dtor(&constructor); @@ -1664,30 +1662,33 @@ PHP_METHOD(SoapServer, handle) } if (Z_TYPE(h->retval) == IS_OBJECT && instanceof_function(Z_OBJCE(h->retval), soap_fault_class_entry TSRMLS_CC)) { - zval *headerfault = NULL, **tmp; + zval *headerfault = NULL, **tmp; if (zend_hash_find(Z_OBJPROP(h->retval), "headerfault", sizeof("headerfault"), (void**)&tmp) == SUCCESS && Z_TYPE_PP(tmp) != IS_NULL) { headerfault = *tmp; } + php_end_ob_buffer(0, 0 TSRMLS_CC); soap_server_fault_ex(function, &h->retval, h TSRMLS_CC); + efree(fn_name); + if (soap_obj) {zval_ptr_dtor(&soap_obj);} + goto fail; #ifdef ZEND_ENGINE_2 } else if (EG(exception)) { + php_end_ob_buffer(0, 0 TSRMLS_CC); if (Z_TYPE_P(EG(exception)) == IS_OBJECT && instanceof_function(Z_OBJCE_P(EG(exception)), soap_fault_class_entry TSRMLS_CC)) { - zval *headerfault = NULL, **tmp; + zval *headerfault = NULL, **tmp; if (zend_hash_find(Z_OBJPROP_P(EG(exception)), "headerfault", sizeof("headerfault"), (void**)&tmp) == SUCCESS && Z_TYPE_PP(tmp) != IS_NULL) { headerfault = *tmp; } soap_server_fault_ex(function, EG(exception), h TSRMLS_CC); - } else { + } efree(fn_name); if (soap_obj) {zval_ptr_dtor(&soap_obj);} - php_end_ob_buffer(0, 0 TSRMLS_CC); goto fail; - } #endif } } else if (h->mustUnderstand) { @@ -1720,20 +1721,19 @@ PHP_METHOD(SoapServer, handle) #ifdef ZEND_ENGINE_2 if (EG(exception)) { + php_end_ob_buffer(0, 0 TSRMLS_CC); if (Z_TYPE_P(EG(exception)) == IS_OBJECT && instanceof_function(Z_OBJCE_P(EG(exception)), soap_fault_class_entry TSRMLS_CC)) { soap_server_fault_ex(function, EG(exception), NULL TSRMLS_CC); - } else { + } #if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION) - if (soap_obj && service->soap_class.persistance != SOAP_PERSISTENCE_SESSION) { + if (soap_obj && service->soap_class.persistance != SOAP_PERSISTENCE_SESSION) { #else - if (soap_obj) { + if (soap_obj) { #endif - zval_ptr_dtor(&soap_obj); - } - php_end_ob_buffer(0, 0 TSRMLS_CC); - goto fail; + zval_ptr_dtor(&soap_obj); } + goto fail; } #endif if (call_status == SUCCESS) { @@ -1741,7 +1741,9 @@ PHP_METHOD(SoapServer, handle) if (Z_TYPE(retval) == IS_OBJECT && instanceof_function(Z_OBJCE(retval), soap_fault_class_entry TSRMLS_CC)) { + php_end_ob_buffer(0, 0 TSRMLS_CC); soap_server_fault_ex(function, &retval, NULL TSRMLS_CC); + goto fail; } if (function && function->responseName) { @@ -1875,7 +1877,6 @@ static void soap_server_fault_ex(sdlFunctionPtr function, zval* fault, soapHeade xmlFreeDoc(doc_return); xmlFree(buf); zend_clear_exception(TSRMLS_C); - zend_bailout(); } static void soap_server_fault(char* code, char* string, char *actor, zval* details, char* name TSRMLS_DC) @@ -1887,6 +1888,7 @@ static void soap_server_fault(char* code, char* string, char *actor, zval* detai set_soap_fault(&ret, NULL, code, string, actor, details, name TSRMLS_CC); /* TODO: Which function */ soap_server_fault_ex(NULL, &ret, NULL TSRMLS_CC); + zend_bailout(); } static void soap_error_handler(int error_num, const char *error_filename, const uint error_lineno, const char *format, va_list args) @@ -2024,6 +2026,7 @@ static void soap_error_handler(int error_num, const char *error_filename, const if (fault) { soap_server_fault_ex(NULL, &fault_obj, NULL TSRMLS_CC); + zend_bailout(); } } } diff --git a/ext/soap/tests/bugs/bug36629.phpt b/ext/soap/tests/bugs/bug36629.phpt new file mode 100755 index 0000000000..ae646c27f3 --- /dev/null +++ b/ext/soap/tests/bugs/bug36629.phpt @@ -0,0 +1,51 @@ +--TEST-- +Bug #36629 (SoapServer::handle() exits on SOAP faults) +--FILE-- +"http://testuri.org")); +$server->addfunction(array("test1","test2")); + +$HTTP_RAW_POST_DATA = << + + + + + +EOF; +$server->handle(); + +$HTTP_RAW_POST_DATA = << + + + + + +EOF; +$server->handle(); +echo "ok\n"; +?> +--EXPECT-- + +SOAP-ENV:Servertest1 + +SOAP-ENV:Servertest2 +ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_001w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_001w.phpt index c95d3d1693..24f421277c 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_001w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_001w.phpt @@ -24,3 +24,4 @@ echo "ok\n"; arg34325.325 SOAP-ENV:ServerFault in response to 'echoSOAPStructFault'.arg34325.325 +ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_002w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_002w.phpt index ce7d00b619..acfcd15126 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_002w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_002w.phpt @@ -30,3 +30,4 @@ echo "ok\n"; a11112.34511 SOAP-ENV:ServerFault in response to 'echoBaseStructFault'.a11112.34511 +ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_003w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_003w.phpt index c9f31e00d8..4def17b3e4 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_003w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_003w.phpt @@ -38,3 +38,4 @@ echo "ok\n"; a11112.34512arg-35 SOAP-ENV:ServerFault in response to 'echoExtendedStructFault'.a11112.34512arg-35 +ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_004w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_004w.phpt index 4c917b73ef..3ff805d0ae 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_004w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_004w.phpt @@ -33,3 +33,4 @@ echo "ok\n"; 1arg134325.325arg234325.32512 SOAP-ENV:ServerFault in response to 'echoMultipleFaults1'.arg134325.325 +ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_005w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_005w.phpt index 1a50cfa4a0..024918dd3b 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_005w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_005w.phpt @@ -33,3 +33,4 @@ echo "ok\n"; 2arg134325.325arg234325.32512 SOAP-ENV:ServerFault in response to 'echoMultipleFaults1'.arg234325.32512 +ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_006w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_006w.phpt index 88302b817a..de0f337a52 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_006w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_006w.phpt @@ -33,3 +33,4 @@ echo "ok\n"; 3arg134325.325arg234325.32512 SOAP-ENV:ServerFault in response to 'echoMultipleFaults1'.arg134325.325 +ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_007w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_007w.phpt index 77f3b24d53..98487ec022 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_007w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_007w.phpt @@ -49,3 +49,4 @@ echo "ok\n"; 1s111.11s222.22arg-35s333.33arg-35true SOAP-ENV:ServerFault in response to 'echoMultipleFaults2'.s111.11 +ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_008w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_008w.phpt index aebb9e9ef5..d1e15b27a3 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_008w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_008w.phpt @@ -49,3 +49,4 @@ echo "ok\n"; 2s111.11s222.22arg-35s333.33arg-35true SOAP-ENV:ServerFault in response to 'echoMultipleFaults2'.s222.22arg-35 +ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_009w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_009w.phpt index a27c2ad012..1fc6dd141e 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_009w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_009w.phpt @@ -49,3 +49,4 @@ echo "ok\n"; 3s111.11s222.22arg-35s333.33arg-35true SOAP-ENV:ServerFault in response to 'echoMultipleFaults2'.s333.33arg-35true +ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_010w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_010w.phpt index adf98fc259..2f00d037bb 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_010w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_010w.phpt @@ -49,3 +49,4 @@ echo "ok\n"; 4s111.11s222.22arg-35s333.33arg-35true SOAP-ENV:ServerFault in response to 'echoMultipleFaults2'.s111.11 +ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_001w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_001w.phpt index b42bae918e..7d5104a20f 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_001w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_001w.phpt @@ -24,3 +24,4 @@ echo "ok\n"; arg34325.325 SOAP-ENV:ServerFault in response to 'echoSOAPStructFault'.arg34325.325 +ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_002w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_002w.phpt index 7368213d18..0587b6e1f2 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_002w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_002w.phpt @@ -23,3 +23,4 @@ echo "ok\n"; 12.34512 SOAP-ENV:ServerFault in response to 'echoBaseStructFault'.12.34512 +ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_003w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_003w.phpt index ee05b4c3fa..a06d7e7444 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_003w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_003w.phpt @@ -31,3 +31,4 @@ echo "ok\n"; 12.34512arg-35 SOAP-ENV:ServerFault in response to 'echoExtendedStructFault'.12.34512arg-35 +ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_004w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_004w.phpt index 76202308fc..d93e0d7a61 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_004w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_004w.phpt @@ -31,3 +31,4 @@ echo "ok\n"; 1arg34325.32512.34512 SOAP-ENV:ServerFault in response to 'echoMultipleFaults1'.arg34325.325 +ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_005w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_005w.phpt index f4395d3b98..f11191daf2 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_005w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_005w.phpt @@ -31,3 +31,4 @@ echo "ok\n"; 2arg34325.32512.34512 SOAP-ENV:ServerFault in response to 'echoMultipleFaults1'.12.34512 +ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_006w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_006w.phpt index 1d41c29658..88017ace1b 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_006w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_006w.phpt @@ -31,3 +31,4 @@ echo "ok\n"; 3arg34325.32512.34512 SOAP-ENV:ServerFault in response to 'echoMultipleFaults1'.arg34325.325 +ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_007w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_007w.phpt index 1184b41e46..c58485ce1a 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_007w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_007w.phpt @@ -39,3 +39,4 @@ echo "ok\n"; 112.345112.3452arg-3512.3453arg-35true SOAP-ENV:ServerFault in response to 'echoMultipleFaults2'.12.3451 +ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_008w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_008w.phpt index 0d0a800fa1..09978000ac 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_008w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_008w.phpt @@ -39,3 +39,4 @@ echo "ok\n"; 212.345112.3452arg-3512.3453arg-35true SOAP-ENV:ServerFault in response to 'echoMultipleFaults2'.12.3452arg-35 +ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_009w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_009w.phpt index 21f643a569..2d8504183f 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_009w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_009w.phpt @@ -39,3 +39,4 @@ echo "ok\n"; 312.345112.3452arg-3512.3453arg-35true SOAP-ENV:ServerFault in response to 'echoMultipleFaults2'.12.3453arg-35true +ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_010w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_010w.phpt index 7cf18fb366..0e0a3c237b 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_010w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_010w.phpt @@ -39,3 +39,4 @@ echo "ok\n"; 412.345112.3452arg-3512.3453arg-35true SOAP-ENV:ServerFault in response to 'echoMultipleFaults2'.12.3451 +ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_001w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_001w.phpt index ac473c88d7..49bbce814a 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_001w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_001w.phpt @@ -16,3 +16,4 @@ echo "ok\n"; SOAP-ENV:ServerFault in response to 'echoEmptyFault'. +ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_002w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_002w.phpt index ff4014da3f..a2eddc68bf 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_002w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_002w.phpt @@ -16,3 +16,4 @@ echo "ok\n"; Hello World SOAP-ENV:ServerFault in response to 'echoStringFault'.Hello World +ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_003w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_003w.phpt index 26c62476db..7d29db3ab7 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_003w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_003w.phpt @@ -16,3 +16,4 @@ echo "ok\n"; 3412 SOAP-ENV:ServerFault in response to 'echoIntArrayFault'.3412 +ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_004w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_004w.phpt index 4abff69f66..cd3c59251c 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_004w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_004w.phpt @@ -18,3 +18,4 @@ echo "ok\n"; 1Hello world12.34545678 SOAP-ENV:ServerFault in response to 'echoMultipleFaults1'. +ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_005w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_005w.phpt index b290e4da88..c50068be82 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_005w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_005w.phpt @@ -18,3 +18,4 @@ echo "ok\n"; 2Hello world12.34545678 SOAP-ENV:ServerFault in response to 'echoMultipleFaults1'.Hello world +ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_006w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_006w.phpt index d857dc3546..5e94cb6b4b 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_006w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_006w.phpt @@ -18,3 +18,4 @@ echo "ok\n"; 3Hello world12.34545678 SOAP-ENV:ServerFault in response to 'echoMultipleFaults1'.12.34545678 +ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_007w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_007w.phpt index 02517c0039..c8b02e7107 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_007w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_007w.phpt @@ -18,3 +18,4 @@ echo "ok\n"; 4Hello world12.34545678 SOAP-ENV:ServerFault in response to 'echoMultipleFaults1'. +ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_008w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_008w.phpt index 691ebda7be..a216449971 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_008w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_008w.phpt @@ -19,3 +19,4 @@ echo "ok\n"; 1Hello world12.345onetwothree SOAP-ENV:ServerFault in response to 'echoMultipleFaults2'.12.345 +ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_009w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_009w.phpt index 2af8b01016..065296e9b5 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_009w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_009w.phpt @@ -19,3 +19,4 @@ echo "ok\n"; 2Hello world12.345onetwothree SOAP-ENV:ServerFault in response to 'echoMultipleFaults2'.Hello world +ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_010w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_010w.phpt index 594c444f2b..cb1ce27296 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_010w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_010w.phpt @@ -19,3 +19,4 @@ echo "ok\n"; 3Hello world12.345onetwothree SOAP-ENV:ServerFault in response to 'echoMultipleFaults2'.onetwothree +ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_011w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_011w.phpt index 21389c0b5f..449512afa2 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_011w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_011w.phpt @@ -19,3 +19,4 @@ echo "ok\n"; 4Hello world12.345onetwothree SOAP-ENV:ServerFault in response to 'echoMultipleFaults2'.12.345 +ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_012w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_012w.phpt index 3e2e41dd33..cb32e62af8 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_012w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_012w.phpt @@ -18,3 +18,4 @@ echo "ok\n"; 1arg1arg2 SOAP-ENV:ServerFault in response to 'echoMultipleFaults3'.arg1 +ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_013w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_013w.phpt index 8b847a85ec..f8cc39a9f0 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_013w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_013w.phpt @@ -18,3 +18,4 @@ echo "ok\n"; 2arg1arg2 SOAP-ENV:ServerFault in response to 'echoMultipleFaults3'.arg2 +ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_014w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_014w.phpt index 3a3e61a464..bcc1d248cf 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_014w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_014w.phpt @@ -18,3 +18,4 @@ echo "ok\n"; 3arg1arg2 SOAP-ENV:ServerFault in response to 'echoMultipleFaults3'.arg1 +ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_015w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_015w.phpt index b831484d70..622cb3c6cc 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_015w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_015w.phpt @@ -18,3 +18,4 @@ echo "ok\n"; 11621 SOAP-ENV:ServerFault in response to 'echoMultipleFaults4'.162 +ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_016w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_016w.phpt index cbf7f16f28..6511770f79 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_016w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_016w.phpt @@ -18,3 +18,4 @@ echo "ok\n"; 21621 SOAP-ENV:ServerFault in response to 'echoMultipleFaults4'.1 +ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_017w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_017w.phpt index aa7e28527a..fd812007ef 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_017w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_017w.phpt @@ -18,3 +18,4 @@ echo "ok\n"; 31621 SOAP-ENV:ServerFault in response to 'echoMultipleFaults4'.162 +ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_001w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_001w.phpt index 6818838747..41c53ee024 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_001w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_001w.phpt @@ -16,3 +16,4 @@ echo "ok\n"; SOAP-ENV:ServerFault in response to 'echoEmptyFault'. +ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_002w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_002w.phpt index 20dad785f5..b7167d8092 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_002w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_002w.phpt @@ -16,3 +16,4 @@ echo "ok\n"; Hello World SOAP-ENV:ServerFault in response to 'echoStringFault'.Hello World +ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_003w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_003w.phpt index eb7638371c..6db29e9e5b 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_003w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_003w.phpt @@ -16,3 +16,4 @@ echo "ok\n"; 3412 SOAP-ENV:ServerFault in response to 'echoIntArrayFault'.3412 +ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_004w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_004w.phpt index c095b486d1..ad6c1a2ed2 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_004w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_004w.phpt @@ -16,3 +16,4 @@ echo "ok\n"; 1Hello world12.34545678 SOAP-ENV:ServerFault in response to 'echoMultipleFaults1'. +ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_005w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_005w.phpt index e2c706bd0a..7f9dfc8acb 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_005w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_005w.phpt @@ -16,3 +16,4 @@ echo "ok\n"; 2Hello world12.34545678 SOAP-ENV:ServerFault in response to 'echoMultipleFaults1'.Hello world +ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_006w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_006w.phpt index e4a397d8e1..dd7b52f664 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_006w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_006w.phpt @@ -16,3 +16,4 @@ echo "ok\n"; 3Hello world12.34545678 SOAP-ENV:ServerFault in response to 'echoMultipleFaults1'.12.34545678 +ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_007w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_007w.phpt index b879fe3a3d..a9f30b92a5 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_007w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_007w.phpt @@ -16,3 +16,4 @@ echo "ok\n"; 4Hello world12.34545678 SOAP-ENV:ServerFault in response to 'echoMultipleFaults1'. +ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_008w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_008w.phpt index 057ff4d54f..9c8421877b 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_008w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_008w.phpt @@ -16,3 +16,4 @@ echo "ok\n"; 1Hello World12.345onetwothree SOAP-ENV:ServerFault in response to 'echoMultipleFaults2'.12.345 +ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_009w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_009w.phpt index 18f1d8d23d..5efaaa146e 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_009w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_009w.phpt @@ -16,3 +16,4 @@ echo "ok\n"; 2Hello World12.345onetwothree SOAP-ENV:ServerFault in response to 'echoMultipleFaults2'.Hello World +ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_010w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_010w.phpt index faca6c1225..43793dcb34 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_010w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_010w.phpt @@ -16,3 +16,4 @@ echo "ok\n"; 3Hello World12.345onetwothree SOAP-ENV:ServerFault in response to 'echoMultipleFaults2'.onetwothree +ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_011w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_011w.phpt index 5e93891589..6941bb2572 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_011w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_011w.phpt @@ -16,3 +16,4 @@ echo "ok\n"; 4Hello World12.345onetwothree SOAP-ENV:ServerFault in response to 'echoMultipleFaults2'.12.345 +ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_012w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_012w.phpt index 073a2a0f79..984f05bcb9 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_012w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_012w.phpt @@ -16,3 +16,4 @@ echo "ok\n"; 1arg1arg2 SOAP-ENV:ServerFault in response to 'echoMultipleFaults3'.arg1 +ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_013w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_013w.phpt index b0113ae342..4ff8afc9d5 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_013w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_013w.phpt @@ -16,3 +16,4 @@ echo "ok\n"; 2arg1arg2 SOAP-ENV:ServerFault in response to 'echoMultipleFaults3'.arg2 +ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_014w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_014w.phpt index ee5b4cb0e6..a84ad6db97 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_014w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_014w.phpt @@ -16,3 +16,4 @@ echo "ok\n"; 3arg1arg2 SOAP-ENV:ServerFault in response to 'echoMultipleFaults3'.arg1 +ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_015w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_015w.phpt index 4a9cb4a816..9deae78563 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_015w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_015w.phpt @@ -16,3 +16,4 @@ echo "ok\n"; 11621 SOAP-ENV:ServerFault in response to 'echoMultipleFaults4'.162 +ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_016w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_016w.phpt index d8a47d009a..d324fb31a2 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_016w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_016w.phpt @@ -16,3 +16,4 @@ echo "ok\n"; 21621 SOAP-ENV:ServerFault in response to 'echoMultipleFaults4'.1 +ok diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_017w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_017w.phpt index 5aaec3088f..7a820922a9 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_017w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_017w.phpt @@ -16,3 +16,4 @@ echo "ok\n"; 31621 SOAP-ENV:ServerFault in response to 'echoMultipleFaults4'.162 +ok diff --git a/ext/soap/tests/server017.phpt b/ext/soap/tests/server017.phpt index 2f5dd6b6e7..cc4af5e707 100644 --- a/ext/soap/tests/server017.phpt +++ b/ext/soap/tests/server017.phpt @@ -31,3 +31,4 @@ echo "ok\n"; --EXPECT-- MyFaultMy fault string +ok diff --git a/ext/soap/tests/server018.phpt b/ext/soap/tests/server018.phpt index 724f0d8841..22c37a09b2 100644 --- a/ext/soap/tests/server018.phpt +++ b/ext/soap/tests/server018.phpt @@ -31,3 +31,4 @@ echo "ok\n"; --EXPECT-- MyFaultMy fault string +ok diff --git a/ext/soap/tests/server022.phpt b/ext/soap/tests/server022.phpt index 7b74d8923f..90b06d5a15 100755 --- a/ext/soap/tests/server022.phpt +++ b/ext/soap/tests/server022.phpt @@ -38,3 +38,4 @@ echo "ok\n"; --EXPECT-- MyFaultMy fault string +ok diff --git a/ext/soap/tests/soap12/T63.phpt b/ext/soap/tests/soap12/T63.phpt index 8b7aa291a6..5a41ef0109 100644 --- a/ext/soap/tests/soap12/T63.phpt +++ b/ext/soap/tests/soap12/T63.phpt @@ -22,3 +22,4 @@ include "soap12-test.inc"; --EXPECT-- Country code must be 2 letters.env:SenderNot a valid country code +ok