diff options
| author | Dmitry Stogov <dmitry@php.net> | 2005-11-28 10:08:34 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2005-11-28 10:08:34 +0000 |
| commit | 13af4c9a09387c314ef3e15e7b54b139ca5c7300 (patch) | |
| tree | e9e7ca1e9a2cbf8d1ec03d1a776f78fc8e776d2a /ext/soap/php_sdl.c | |
| parent | b15e33f85a1291e9fa9dd7908c7c4083a56446f3 (diff) | |
| download | php-git-13af4c9a09387c314ef3e15e7b54b139ca5c7300.tar.gz | |
Fixed bug #35399 (Since fix of bug #35273 SOAP decoding of soapenc:base64binary fails)
Diffstat (limited to 'ext/soap/php_sdl.c')
| -rw-r--r-- | ext/soap/php_sdl.c | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/ext/soap/php_sdl.c b/ext/soap/php_sdl.c index b8bdf74f04..34d34e199e 100644 --- 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) |