dmitry Thu Aug 26 11:23:57 2004 EDT
Added files: (Branch: PHP_5_0)
/php-src/ext/soap/tests/bugs bug29795.phpt bug29795.wsdl
Modified files:
/php-src NEWS
/php-src/ext/soap php_encoding.c
Log:
Fixed bug #29795 (SegFault with Soap and Amazon's Web Services)
Fixed bug #27994 (segfault with Soapserver when WSDL-Cache is enabled)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.59&r2=1.1760.2.60&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.59 php-src/NEWS:1.1760.2.60
--- php-src/NEWS:1.1760.2.59 Thu Aug 26 08:20:12 2004
+++ php-src/NEWS Thu Aug 26 11:23:57 2004
@@ -16,6 +16,7 @@
- Fixed bug #29821 (Fixed possible crashes in convert_uudecode() on invalid
data). (Ilia)
- Fixed bug #29808 (array_count_values() breaks with numeric strings). (Ilia)
+- Fixed bug #29795 (SegFault with Soap and Amazon's Web Services). (Dmitry)
- Fixed bug #29737 (ip2long should return -1 if IP is 255.255.255.255 and FALSE
on error). (Tony)
- Fixed bug #29711 (Changed ext/xml to default to UTF-8 output). (Rob)
@@ -25,6 +26,8 @@
(Christian, Rob)
- Fixed bug #29656 (segfault on result and statement properties). (Georg)
- Fixed bug #29447 (Reflection API issues). (Marcus)
+- Fixed bug #27994 (segfault with Soapserver when WSDL-Cache is enabled).
+ (Dmitry)
- Fixed bug #27791 (Apache 2.0 SAPI build against Apache 2 HEAD). (Joe Orton,
Derick)
- Fixed bug #26737 (private/protected properties not serialized when user
http://cvs.php.net/diff.php/php-src/ext/soap/php_encoding.c?r1=1.71.2.1&r2=1.71.2.2&ty=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.71.2.1
php-src/ext/soap/php_encoding.c:1.71.2.2
--- php-src/ext/soap/php_encoding.c:1.71.2.1 Tue Aug 10 12:30:30 2004
+++ php-src/ext/soap/php_encoding.c Thu Aug 26 11:23:57 2004
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_encoding.c,v 1.71.2.1 2004/08/10 16:30:30 dmitry Exp $ */
+/* $Id: php_encoding.c,v 1.71.2.2 2004/08/26 15:23:57 dmitry Exp $ */
#include <time.h>
@@ -2437,6 +2437,9 @@
sdlTypePtr type;
type = enc->sdl_type;
+ if (type == NULL) {
+ return guess_zval_convert(enc, data);
+ }
/*FIXME: restriction support
if (type && type->restrictions &&
data && data->children && data->children->content) {
@@ -2500,6 +2503,13 @@
type = enc->sdl_type;
+ if (type == NULL) {
+ ret = guess_xml_convert(enc, data, style, parent);
+ if (style == SOAP_ENCODED) {
+ set_ns_and_type(ret, enc);
+ }
+ return ret;
+ }
/*FIXME: restriction support
if (type) {
if (type->restrictions && Z_TYPE_P(data) == IS_STRING) {
http://cvs.php.net/co.php/php-src/ext/soap/tests/bugs/bug29795.phpt?r=1.1&p=1
Index: php-src/ext/soap/tests/bugs/bug29795.phpt
+++ php-src/ext/soap/tests/bugs/bug29795.phpt
http://cvs.php.net/co.php/php-src/ext/soap/tests/bugs/bug29795.wsdl?r=1.1&p=1
Index: php-src/ext/soap/tests/bugs/bug29795.wsdl
+++ php-src/ext/soap/tests/bugs/bug29795.wsdl
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
