cvs: php-src(PHP_5_2) / NEWS /ext/soap soap.c
| From: | Dmitry Stogov | Date: | Mon, 04 Sep 2006 10:52:34 +0000 |
| Subject: | cvs: php-src(PHP_5_2) / NEWS /ext/soap soap.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-40299@lists.php.net to get a copy of this message | ||
dmitry Mon Sep 4 10:52:34 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src NEWS
/php-src/ext/soap soap.c
Log:
Fixed bug #38700 (SoapClient::__getTypes never returns)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.232&r2=1.2027.2.547.2.233&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.232 php-src/NEWS:1.2027.2.547.2.233
--- php-src/NEWS:1.2027.2.547.2.232 Sun Sep 3 16:32:27 2006
+++ php-src/NEWS Mon Sep 4 10:52:34 2006
@@ -1,6 +1,7 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? Sep 2006, PHP 5.2.0RC4
+- Fixed bug #38700 (SoapClient::__getTypes never returns). (Dmitry)
- Fixed bug #38661 (mixed-case URL breaks url-wrappers). (Ilia)
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.156.2.28.2.9&r2=1.156.2.28.2.10&diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.28.2.9 php-src/ext/soap/soap.c:1.156.2.28.2.10
--- php-src/ext/soap/soap.c:1.156.2.28.2.9 Thu Aug 24 06:18:30 2006
+++ php-src/ext/soap/soap.c Mon Sep 4 10:52:34 2006
@@ -17,7 +17,7 @@
| Dmitry Stogov <dmitry@zend.com> |
+----------------------------------------------------------------------+
*/
-/* $Id: soap.c,v 1.156.2.28.2.9 2006/08/24 06:18:30 dmitry Exp $ */
+/* $Id: soap.c,v 1.156.2.28.2.10 2006/09/04 10:52:34 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -4543,6 +4543,7 @@
type->kind == XSD_TYPEKIND_EXTENSION) && type->encode) {
encodePtr enc = type->encode;
while (enc && enc->details.sdl_type &&
+ enc != enc->details.sdl_type->encode &&
enc->details.sdl_type->kind != XSD_TYPEKIND_SIMPLE &&
enc->details.sdl_type->kind != XSD_TYPEKIND_LIST &&
enc->details.sdl_type->kind != XSD_TYPEKIND_UNION) {