Fixed bug #35399 (Since fix of bug #35273 SOAP decoding of soapenc:base64binary fails)

diff --git a/NEWS b/NEWS
index eb539417648bb6573978485272c3d889be1981a9..78eaa598d277dcc01bbf8d788addc36c6662974f 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,8 @@ PHP                                                                        NEWS
 ?? ??? 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)

diff --git a/ext/soap/php_sdl.c b/ext/soap/php_sdl.c
index b8bdf74f04c41802b94ae2ab2955749139d1d895..34d34e199e98b6cc535e5ba144d0730dae79ee34 100644 (file)
--- a/ext/soap/php_sdl.c
+++ b/ext/soap/php_sdl.c
@@ -1289,6 +1289,40 @@ static void sdl_deserialize_encoder(encodePtr enc, sdlTypePtr *types, char **in)
        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)