dmitry Wed Jun 18 07:23:58 2008 UTC Added files: (Branch: PHP_5_3) /php-src/ext/soap/tests/bugs multiport.phpt multiport.wsdl
Modified files: /php-src/ext/soap php_sdl.c /php-src/ext/soap/tests/bugs bug29109.phpt Log: Fixed SOAP binding selection http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_sdl.c?r1=1.88.2.12.2.9.2.3&r2=1.88.2.12.2.9.2.4&diff_format=u Index: php-src/ext/soap/php_sdl.c diff -u php-src/ext/soap/php_sdl.c:1.88.2.12.2.9.2.3 php-src/ext/soap/php_sdl.c:1.88.2.12.2.9.2.4 --- php-src/ext/soap/php_sdl.c:1.88.2.12.2.9.2.3 Wed May 7 15:23:10 2008 +++ php-src/ext/soap/php_sdl.c Wed Jun 18 07:23:58 2008 @@ -17,7 +17,7 @@ | Dmitry Stogov <[EMAIL PROTECTED]> | +----------------------------------------------------------------------+ */ -/* $Id: php_sdl.c,v 1.88.2.12.2.9.2.3 2008/05/07 15:23:10 davidc Exp $ */ +/* $Id: php_sdl.c,v 1.88.2.12.2.9.2.4 2008/06/18 07:23:58 dmitry Exp $ */ #include "php_soap.h" #include "ext/libxml/php_libxml.h" @@ -722,12 +722,12 @@ } trav2 = trav2->next; } - if (!address) { + if (!address || tmpbinding->bindingType == BINDING_HTTP) { if (has_soap_port || trav->next || i < n-1) { efree(tmpbinding); trav = trav->next; continue; - } else { + } else if (!address) { soap_error0(E_ERROR, "Parsing WSDL: No address associated with <port>"); } } http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug29109.phpt?r1=1.1.8.2&r2=1.1.8.3&diff_format=u Index: php-src/ext/soap/tests/bugs/bug29109.phpt diff -u php-src/ext/soap/tests/bugs/bug29109.phpt:1.1.8.2 php-src/ext/soap/tests/bugs/bug29109.phpt:1.1.8.3 --- php-src/ext/soap/tests/bugs/bug29109.phpt:1.1.8.2 Sat May 24 15:22:18 2008 +++ php-src/ext/soap/tests/bugs/bug29109.phpt Wed Jun 18 07:23:58 2008 @@ -10,11 +10,7 @@ var_dump($client->__getFunctions()); ?> --EXPECT-- -array(3) { +array(1) { [0]=> string(53) "HelloWorldResponse HelloWorld(HelloWorld $parameters)" - [1]=> - string(19) "string HelloWorld()" - [2]=> - string(19) "string HelloWorld()" } \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/multiport.phpt?view=markup&rev=1.1 Index: php-src/ext/soap/tests/bugs/multiport.phpt +++ php-src/ext/soap/tests/bugs/multiport.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/multiport.wsdl?view=markup&rev=1.1 Index: php-src/ext/soap/tests/bugs/multiport.wsdl +++ php-src/ext/soap/tests/bugs/multiport.wsdl -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php