[PHP-CVS] cvs: php-src(PHP_5_2) /ext/soap php_sdl.c /ext/soap/tests/bugs bug29109.phpt multiport.phpt multiport.wsdl
dmitry Wed Jun 18 07:23:42 2008 UTC Added files: (Branch: PHP_5_2) /php-src/ext/soap/tests/bugsmultiport.phpt multiport.wsdl Modified files: /php-src/ext/soap php_sdl.c /php-src/ext/soap/tests/bugsbug29109.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.11r2=1.88.2.12.2.12diff_format=u Index: php-src/ext/soap/php_sdl.c diff -u php-src/ext/soap/php_sdl.c:1.88.2.12.2.11 php-src/ext/soap/php_sdl.c:1.88.2.12.2.12 --- php-src/ext/soap/php_sdl.c:1.88.2.12.2.11 Wed May 7 14:57:56 2008 +++ php-src/ext/soap/php_sdl.c Wed Jun 18 07:23:42 2008 @@ -17,7 +17,7 @@ | Dmitry Stogov [EMAIL PROTECTED] | +--+ */ -/* $Id: php_sdl.c,v 1.88.2.12.2.11 2008/05/07 14:57:56 davidc Exp $ */ +/* $Id: php_sdl.c,v 1.88.2.12.2.12 2008/06/18 07:23:42 dmitry Exp $ */ #include php_soap.h #include ext/libxml/php_libxml.h @@ -721,12 +721,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.6.1r2=1.1.6.2diff_format=u Index: php-src/ext/soap/tests/bugs/bug29109.phpt diff -u php-src/ext/soap/tests/bugs/bug29109.phpt:1.1.6.1 php-src/ext/soap/tests/bugs/bug29109.phpt:1.1.6.2 --- php-src/ext/soap/tests/bugs/bug29109.phpt:1.1.6.1 Wed Jan 9 16:45:28 2008 +++ php-src/ext/soap/tests/bugs/bug29109.phpt Wed Jun 18 07:23:42 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=markuprev=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=markuprev=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
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/soap php_sdl.c
davidc Wed May 7 14:57:56 2008 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/soap php_sdl.c Log: - Fixed Bug #44811: Improved error message when creating a new SoapClient has invalid data. http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_sdl.c?r1=1.88.2.12.2.10r2=1.88.2.12.2.11diff_format=u Index: php-src/ext/soap/php_sdl.c diff -u php-src/ext/soap/php_sdl.c:1.88.2.12.2.10 php-src/ext/soap/php_sdl.c:1.88.2.12.2.11 --- php-src/ext/soap/php_sdl.c:1.88.2.12.2.10 Mon Dec 31 07:20:11 2007 +++ php-src/ext/soap/php_sdl.c Wed May 7 14:57:56 2008 @@ -17,7 +17,7 @@ | Dmitry Stogov [EMAIL PROTECTED] | +--+ */ -/* $Id: php_sdl.c,v 1.88.2.12.2.10 2007/12/31 07:20:11 sebastian Exp $ */ +/* $Id: php_sdl.c,v 1.88.2.12.2.11 2008/05/07 14:57:56 davidc Exp $ */ #include php_soap.h #include ext/libxml/php_libxml.h @@ -240,7 +240,12 @@ wsdl = soap_xmlParseFile(struri TSRMLS_CC); if (!wsdl) { - soap_error1(E_ERROR, Parsing WSDL: Couldn't load from '%s', struri); + xmlErrorPtr xmlErrorPtr = xmlGetLastError(); + if (xmlErrorPtr) { + soap_error2(E_ERROR, Parsing WSDL: Couldn't load from '%s' : %s, struri, xmlErrorPtr-message); + } else { + soap_error1(E_ERROR, Parsing WSDL: Couldn't load from '%s', struri); + } } zend_hash_add(ctx-docs, struri, strlen(struri)+1, (void**)wsdl, sizeof(xmlDocPtr), NULL); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/soap php_sdl.c /ext/soap/tests/bugs bug41337_2.phpt bug41337_2.wsdl bug41337_2_1.wsdl
dmitry Mon May 21 13:13:51 2007 UTC Added files: (Branch: PHP_5_2) /php-src/ext/soap/tests/bugsbug41337_2.phpt bug41337_2.wsdl bug41337_2_1.wsdl Modified files: /php-src/ext/soap php_sdl.c Log: Fixed bug #41337 WSDL parsing doesn't ignore non soap bindings http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_sdl.c?r1=1.88.2.12.2.8r2=1.88.2.12.2.9diff_format=u Index: php-src/ext/soap/php_sdl.c diff -u php-src/ext/soap/php_sdl.c:1.88.2.12.2.8 php-src/ext/soap/php_sdl.c:1.88.2.12.2.9 --- php-src/ext/soap/php_sdl.c:1.88.2.12.2.8Thu May 10 14:58:17 2007 +++ php-src/ext/soap/php_sdl.c Mon May 21 13:13:50 2007 @@ -17,7 +17,7 @@ | Dmitry Stogov [EMAIL PROTECTED] | +--+ */ -/* $Id: php_sdl.c,v 1.88.2.12.2.8 2007/05/10 14:58:17 dmitry Exp $ */ +/* $Id: php_sdl.c,v 1.88.2.12.2.9 2007/05/21 13:13:50 dmitry Exp $ */ #include php_soap.h #include ext/libxml/php_libxml.h @@ -717,7 +717,7 @@ trav2 = trav2-next; } if (!address) { - if (has_soap_port || trav-next) { + if (has_soap_port || trav-next || i n-1) { efree(tmpbinding); trav = trav-next; continue; http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug41337_2.phpt?view=markuprev=1.1 Index: php-src/ext/soap/tests/bugs/bug41337_2.phpt +++ php-src/ext/soap/tests/bugs/bug41337_2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug41337_2.wsdl?view=markuprev=1.1 Index: php-src/ext/soap/tests/bugs/bug41337_2.wsdl +++ php-src/ext/soap/tests/bugs/bug41337_2.wsdl http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug41337_2_1.wsdl?view=markuprev=1.1 Index: php-src/ext/soap/tests/bugs/bug41337_2_1.wsdl +++ php-src/ext/soap/tests/bugs/bug41337_2_1.wsdl -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/soap php_sdl.c
stasFri Feb 23 20:40:55 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/soap php_sdl.c Log: use safe_emalloc http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_sdl.c?r1=1.88.2.12.2.6r2=1.88.2.12.2.7diff_format=u Index: php-src/ext/soap/php_sdl.c diff -u php-src/ext/soap/php_sdl.c:1.88.2.12.2.6 php-src/ext/soap/php_sdl.c:1.88.2.12.2.7 --- php-src/ext/soap/php_sdl.c:1.88.2.12.2.6Mon Jan 1 09:36:06 2007 +++ php-src/ext/soap/php_sdl.c Fri Feb 23 20:40:55 2007 @@ -17,7 +17,7 @@ | Dmitry Stogov [EMAIL PROTECTED] | +--+ */ -/* $Id: php_sdl.c,v 1.88.2.12.2.6 2007/01/01 09:36:06 sebastian Exp $ */ +/* $Id: php_sdl.c,v 1.88.2.12.2.7 2007/02/23 20:40:55 stas Exp $ */ #include php_soap.h #include ext/libxml/php_libxml.h @@ -1250,7 +1250,7 @@ WSDL_CACHE_GET_INT(i, in); if (i 0) { - elements = emalloc((i+1) * sizeof(sdlTypePtr)); + elements = safe_emalloc((i+1), sizeof(sdlTypePtr), 0); elements[0] = NULL; type-elements = emalloc(sizeof(HashTable)); zend_hash_init(type-elements, i, NULL, delete_type, 0); @@ -1479,7 +1479,7 @@ WSDL_CACHE_GET_INT(num_encoders, in); i = num_groups+num_types+num_elements; - types = emalloc((i+1)*sizeof(sdlTypePtr)); + types = safe_emalloc((i+1), sizeof(sdlTypePtr), 0); types[0] = NULL; while (i 0) { types[i] = emalloc(sizeof(sdlType)); @@ -1492,7 +1492,7 @@ while (enc-details.type != END_KNOWN_TYPES) { i++; enc++; } - encoders = emalloc((i+1)*sizeof(encodePtr)); + encoders = safe_emalloc((i+1), sizeof(encodePtr), 0); i = num_encoders; encoders[0] = NULL; while (i 0) { @@ -1550,7 +1550,7 @@ /* deserialize bindings */ WSDL_CACHE_GET_INT(num_bindings, in); - bindings = emalloc(num_bindings*sizeof(sdlBindingPtr)); + bindings = safe_emalloc(num_bindings, sizeof(sdlBindingPtr), 0); if (num_bindings 0) { sdl-bindings = emalloc(sizeof(HashTable)); zend_hash_init(sdl-bindings, num_bindings, NULL, delete_binding, 0); @@ -1576,7 +1576,7 @@ WSDL_CACHE_GET_INT(num_func, in); zend_hash_init(sdl-functions, num_func, NULL, delete_function, 0); if (num_func 0) { - functions = emalloc(num_func*sizeof(sdlFunctionPtr)); + functions = safe_emalloc(num_func, sizeof(sdlFunctionPtr), 0); for (i = 0; i num_func; i++) { int binding_num, num_faults; sdlFunctionPtr func = emalloc(sizeof(sdlFunction)); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/soap php_sdl.c
Thanks, I've applied the fix. Ilia -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/soap php_sdl.c
iliaa Thu Dec 21 01:16:11 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/soap php_sdl.c Log: Optimize out zend_hash_num_elements() call http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_sdl.c?r1=1.88.2.12.2.4r2=1.88.2.12.2.5diff_format=u Index: php-src/ext/soap/php_sdl.c diff -u php-src/ext/soap/php_sdl.c:1.88.2.12.2.4 php-src/ext/soap/php_sdl.c:1.88.2.12.2.5 --- php-src/ext/soap/php_sdl.c:1.88.2.12.2.4Thu Nov 30 23:51:24 2006 +++ php-src/ext/soap/php_sdl.c Thu Dec 21 01:16:10 2006 @@ -17,7 +17,7 @@ | Dmitry Stogov [EMAIL PROTECTED] | +--+ */ -/* $Id: php_sdl.c,v 1.88.2.12.2.4 2006/11/30 23:51:24 iliaa Exp $ */ +/* $Id: php_sdl.c,v 1.88.2.12.2.5 2006/12/21 01:16:10 iliaa Exp $ */ #include php_soap.h #include ext/libxml/php_libxml.h @@ -1862,8 +1862,8 @@ if (i 0) { sdlTypePtr *tmp; - tmp_elements = emalloc(sizeof(HashTable)); - zend_hash_init(tmp_elements, zend_hash_num_elements(type-elements), NULL, NULL, 0); + tmp_elements = emalloc(sizeof(HashTable)); + zend_hash_init(tmp_elements, i, NULL, NULL, 0); zend_hash_internal_pointer_reset(type-elements); while (zend_hash_get_current_data(type-elements, (void**)tmp) == SUCCESS) { -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/soap php_sdl.c
Oops, forgot to attach the patches! - Original Message - From: Matt Wilmas Sent: Tuesday, December 19, 2006 Hi Ilia, A little late, but I made a patch for HEAD since this wasn't applied there. In the process, I noticed that i has the value of zend_hash_num_elements() so the second call to it isn't needed. (Indentation was also off on those 2 lines...) Matt Index: ext/soap/php_sdl.c === RCS file: /repository/php-src/ext/soap/php_sdl.c,v retrieving revision 1.105 diff -u -r1.105 php_sdl.c --- ext/soap/php_sdl.c 20 Sep 2006 13:43:04 - 1.105 +++ ext/soap/php_sdl.c 20 Dec 2006 03:48:01 - @@ -1862,8 +1862,8 @@ if (i 0) { sdlTypePtr *tmp; - tmp_elements = emalloc(sizeof(HashTable)); - zend_hash_init(tmp_elements, 0, NULL, NULL, 0); + tmp_elements = emalloc(sizeof(HashTable)); + zend_hash_init(tmp_elements, i, NULL, NULL, 0); zend_hash_internal_pointer_reset(type-elements); while (zend_hash_get_current_data(type-elements, (void**)tmp) == SUCCESS) { Index: ext/soap/php_sdl.c === RCS file: /repository/php-src/ext/soap/php_sdl.c,v retrieving revision 1.88.2.12.2.4 diff -u -r1.88.2.12.2.4 php_sdl.c --- ext/soap/php_sdl.c 30 Nov 2006 23:51:24 - 1.88.2.12.2.4 +++ ext/soap/php_sdl.c 20 Dec 2006 03:49:58 - @@ -1862,8 +1862,8 @@ if (i 0) { sdlTypePtr *tmp; - tmp_elements = emalloc(sizeof(HashTable)); - zend_hash_init(tmp_elements, zend_hash_num_elements(type-elements), NULL, NULL, 0); + tmp_elements = emalloc(sizeof(HashTable)); + zend_hash_init(tmp_elements, i, NULL, NULL, 0); zend_hash_internal_pointer_reset(type-elements); while (zend_hash_get_current_data(type-elements, (void**)tmp) == SUCCESS) { -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/soap php_sdl.c
iliaa Thu Nov 30 23:51:24 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/soap php_sdl.c Log: Small hash table optimization http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_sdl.c?r1=1.88.2.12.2.3r2=1.88.2.12.2.4diff_format=u Index: php-src/ext/soap/php_sdl.c diff -u php-src/ext/soap/php_sdl.c:1.88.2.12.2.3 php-src/ext/soap/php_sdl.c:1.88.2.12.2.4 --- php-src/ext/soap/php_sdl.c:1.88.2.12.2.3Wed Sep 20 13:42:50 2006 +++ php-src/ext/soap/php_sdl.c Thu Nov 30 23:51:24 2006 @@ -17,7 +17,7 @@ | Dmitry Stogov [EMAIL PROTECTED] | +--+ */ -/* $Id: php_sdl.c,v 1.88.2.12.2.3 2006/09/20 13:42:50 dmitry Exp $ */ +/* $Id: php_sdl.c,v 1.88.2.12.2.4 2006/11/30 23:51:24 iliaa Exp $ */ #include php_soap.h #include ext/libxml/php_libxml.h @@ -1863,7 +1863,7 @@ sdlTypePtr *tmp; tmp_elements = emalloc(sizeof(HashTable)); - zend_hash_init(tmp_elements, 0, NULL, NULL, 0); + zend_hash_init(tmp_elements, zend_hash_num_elements(type-elements), NULL, NULL, 0); zend_hash_internal_pointer_reset(type-elements); while (zend_hash_get_current_data(type-elements, (void**)tmp) == SUCCESS) { -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php