dmitry Wed Feb 18 13:25:32 2009 UTC Added files: (Branch: PHP_5_2) /php-src/ext/soap/tests/bugs bug47049.phpt bug47049.wsdl
Modified files: /php-src NEWS /php-src/ext/soap soap.c Log: Fixed bug #47049 (SoapClient::__soapCall causes a segmentation fault) http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1424&r2=1.2027.2.547.2.1425&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1424 php-src/NEWS:1.2027.2.547.2.1425 --- php-src/NEWS:1.2027.2.547.2.1424 Tue Feb 17 17:09:24 2009 +++ php-src/NEWS Wed Feb 18 13:25:31 2009 @@ -5,6 +5,8 @@ (Matt) - Fixed bug #47399 (mb_check_encoding() returns true for some illegal SJIS characters). (for-bugs at hnw dot jp, Moriyoshi) +- Fixed bug #47049 (SoapClient::__soapCall causes a segmentation fault). + (Dmitry) - Fixed bug #45940 (MySQLI OO does not populate connect_error property on failed connect). (Johannes) - Fixed bug #45923 (mb_st[r]ripos() offset not handled correctly). (Moriyoshi) http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.156.2.28.2.43&r2=1.156.2.28.2.44&diff_format=u Index: php-src/ext/soap/soap.c diff -u php-src/ext/soap/soap.c:1.156.2.28.2.43 php-src/ext/soap/soap.c:1.156.2.28.2.44 --- php-src/ext/soap/soap.c:1.156.2.28.2.43 Mon Feb 2 10:00:32 2009 +++ php-src/ext/soap/soap.c Wed Feb 18 13:25:32 2009 @@ -17,7 +17,7 @@ | Dmitry Stogov <dmi...@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: soap.c,v 1.156.2.28.2.43 2009/02/02 10:00:32 felipe Exp $ */ +/* $Id: soap.c,v 1.156.2.28.2.44 2009/02/18 13:25:32 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -4187,7 +4187,17 @@ /*style = SOAP_RPC;*/ if (style == SOAP_RPC) { ns = encode_add_ns(body, uri); - method = xmlNewChild(body, ns, BAD_CAST(function_name), NULL); + if (function_name) { + method = xmlNewChild(body, ns, BAD_CAST(function_name), NULL); + } else if (function && function->requestName) { + method = xmlNewChild(body, ns, BAD_CAST(function->requestName), NULL); + } else if (function && function->functionName) { + method = xmlNewChild(body, ns, BAD_CAST(function->functionName), NULL); + } else { + method = body; + } + } else { + method = body; } if (zend_hash_find(Z_OBJPROP_P(this_ptr), "use", sizeof("use"), (void **)&zuse) == SUCCESS && http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug47049.phpt?view=markup&rev=1.1 Index: php-src/ext/soap/tests/bugs/bug47049.phpt +++ php-src/ext/soap/tests/bugs/bug47049.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug47049.wsdl?view=markup&rev=1.1 Index: php-src/ext/soap/tests/bugs/bug47049.wsdl +++ php-src/ext/soap/tests/bugs/bug47049.wsdl -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php