dmitry Mon Nov 28 05:08:35 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src NEWS
/php-src/ext/soap php_sdl.c
Log:
Fixed bug #35399 (Since fix of bug #35273 SOAP decoding of
soapenc:base64binary fails)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.237&r2=1.2027.2.238&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.237 php-src/NEWS:1.2027.2.238
--- php-src/NEWS:1.2027.2.237 Sun Nov 27 16:17:17 2005
+++ php-src/NEWS Mon Nov 28 05:08:30 2005
@@ -3,6 +3,8 @@
?? ??? 200?, PHP 5.1.2
- Fixed bug #35431 (PDO crashes when using LAZY fetch with fetchAll). (Wez)
- Fixed bug #35430 (PDO crashes on incorrect FETCH_FUNC use). (Tony)
+- Fixed bug #35399 (Since fix of bug #35273 SOAP decoding of
+ soapenc:base64binary fails). (Dmitry)
28 Nov 2005, PHP 5.1.1
- Disabled native date class to prevent pear::date conflict. (Ilia)
http://cvs.php.net/diff.php/php-src/ext/soap/php_sdl.c?r1=1.88.2.2&r2=1.88.2.3&ty=u
Index: php-src/ext/soap/php_sdl.c
diff -u php-src/ext/soap/php_sdl.c:1.88.2.2 php-src/ext/soap/php_sdl.c:1.88.2.3
--- php-src/ext/soap/php_sdl.c:1.88.2.2 Fri Nov 18 06:00:15 2005
+++ php-src/ext/soap/php_sdl.c Mon Nov 28 05:08:34 2005
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_sdl.c,v 1.88.2.2 2005/11/18 11:00:15 dmitry Exp $ */
+/* $Id: php_sdl.c,v 1.88.2.3 2005/11/28 10:08:34 dmitry Exp $ */
#include "php_soap.h"
#include "ext/libxml/php_libxml.h"
@@ -1289,6 +1289,40 @@
enc->details.sdl_type = types[i];
enc->to_xml = sdl_guess_convert_xml;
enc->to_zval = sdl_guess_convert_zval;
+
+ if (enc->details.sdl_type == NULL) {
+ int ns_len = strlen(enc->details.ns);
+ int type_len = strlen(enc->details.type_str);
+
+ if (((ns_len == sizeof(SOAP_1_1_ENC_NAMESPACE)-1 &&
+ memcmp(enc->details.ns, SOAP_1_1_ENC_NAMESPACE,
sizeof(SOAP_1_1_ENC_NAMESPACE)-1) == 0) ||
+ (ns_len == sizeof(SOAP_1_2_ENC_NAMESPACE)-1 &&
+ memcmp(enc->details.ns, SOAP_1_2_ENC_NAMESPACE,
sizeof(SOAP_1_2_ENC_NAMESPACE)-1) == 0))) {
+ char *enc_nscat;
+ int enc_ns_len;
+ int enc_len;
+ encodePtr real_enc;
+
+ enc_ns_len = sizeof(XSD_NAMESPACE)-1;
+ enc_len = enc_ns_len + type_len + 1;
+ enc_nscat = emalloc(enc_len + 1);
+ memcpy(enc_nscat, XSD_NAMESPACE,
sizeof(XSD_NAMESPACE)-1);
+ enc_nscat[enc_ns_len] = ':';
+ memcpy(enc_nscat+enc_ns_len+1, enc->details.type_str,
type_len);
+ enc_nscat[enc_len] = '\0';
+
+ real_enc = get_encoder_ex(NULL, enc_nscat, enc_len);
+ efree(enc_nscat);
+ if (real_enc) {
+ enc->to_zval = real_enc->to_zval;
+ enc->to_xml = real_enc->to_xml;
+ enc->to_zval_before = real_enc->to_zval_before;
+ enc->to_xml_before = real_enc->to_xml_before;
+ enc->to_zval_after = real_enc->to_zval_after;
+ enc->to_xml_after = real_enc->to_xml_after;
+ }
+ }
+ }
}
static void sdl_deserialize_soap_body(sdlSoapBindingFunctionBodyPtr body,
encodePtr *encoders, sdlTypePtr *types, char **in)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
