diff options
| author | Dmitry Stogov <dmitry@php.net> | 2006-07-12 08:59:40 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2006-07-12 08:59:40 +0000 |
| commit | c48a2e38f419f16118eba9b82cc00fac5a29551d (patch) | |
| tree | fa51d47b85049dd4438e6674c39446132ca9f69d | |
| parent | 3fe315c6522cfcb9a4d5d7322b93668a9639c4c2 (diff) | |
| download | php-git-c48a2e38f419f16118eba9b82cc00fac5a29551d.tar.gz | |
Fixed bug #38067 (Parameters are not decoded from utf-8 when using encoding option)
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | ext/soap/php_encoding.c | 8 | ||||
| -rwxr-xr-x | ext/soap/tests/bugs/bug38067.phpt | 40 | ||||
| -rwxr-xr-x | ext/soap/tests/bugs/bug38067.wsdl | 48 |
4 files changed, 94 insertions, 4 deletions
@@ -82,6 +82,8 @@ PHP NEWS - Fixed memory leaks in openssl streams context options. (Pierre) - Fixed handling of extremely long paths inside tempnam() function. (Ilia) +- Fixed bug #38067 (Parameters are not decoded from utf-8 when using encoding + option). (Dmitry) - Fixed bug #38055 (Wrong interpretation of boolean parameters). (Dmitry) - Fixed bug #38019 (segfault extending mysqli class). (Dmitry) - Fixed bug #38005 (SoapFault faultstring doesn't follow encoding rules). diff --git a/ext/soap/php_encoding.c b/ext/soap/php_encoding.c index c95c1aaeb9..52f784897d 100644 --- a/ext/soap/php_encoding.c +++ b/ext/soap/php_encoding.c @@ -1346,12 +1346,12 @@ static zval *to_zval_object_ex(encodeTypePtr type, xmlNodePtr data, zend_class_e str_val = (*attr)->def; } if (str_val) { - zval zstr; - xmlNodePtr dummy; + xmlNodePtr dummy, text; zval *data; - ZVAL_STRING(&zstr, str_val, 0); - dummy = master_to_xml(get_conversion(IS_STRING), &zstr, SOAP_LITERAL, NULL); + dummy = xmlNewNode(NULL, BAD_CAST("BOGUS")); + text = xmlNewText(BAD_CAST(str_val)); + xmlAddChild(dummy, text); data = master_to_zval((*attr)->encode, dummy); xmlFreeNode(dummy); set_zval_property(ret, (*attr)->name, data TSRMLS_CC); diff --git a/ext/soap/tests/bugs/bug38067.phpt b/ext/soap/tests/bugs/bug38067.phpt new file mode 100755 index 0000000000..9c0cbb4fba --- /dev/null +++ b/ext/soap/tests/bugs/bug38067.phpt @@ -0,0 +1,40 @@ +--TEST-- +Bug #38067 (Parameters are not decoded from utf-8 when using encoding option) +--SKIPIF-- +<?php require_once('skipif.inc'); ?> +--FILE-- +<?php +function Test($param) { + global $g; + $g = $param->str; + return $g; +} + +class TestSoapClient extends SoapClient { + function __construct($wsdl, $opt) { + parent::__construct($wsdl, $opt); + $this->server = new SoapServer($wsdl, $opt); + $this->server->addFunction('Test'); + } + + function __doRequest($request, $location, $action, $version) { + ob_start(); + $this->server->handle($request); + $response = ob_get_contents(); + ob_end_clean(); + return $response; + } +} + +$client = new TestSoapClient(dirname(__FILE__).'/bug38067.wsdl', + array('encoding' => 'ISO-8859-1')); +$str = 'test: Ä'; +$res = $client->Test(array('str'=>$str)); +echo $str."\n"; +echo $res."\n"; +echo $g."\n"; +?> +--EXPECT-- +test: Ä +test: Ä +test: Ä diff --git a/ext/soap/tests/bugs/bug38067.wsdl b/ext/soap/tests/bugs/bug38067.wsdl new file mode 100755 index 0000000000..beb9fc2141 --- /dev/null +++ b/ext/soap/tests/bugs/bug38067.wsdl @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8"?>
+<definitions
+ xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:s="http://www.w3.org/2001/XMLSchema"
+ xmlns:s0="http://test.pl"
+ targetNamespace="http://test.pl"
+ xmlns="http://schemas.xmlsoap.org/wsdl/">
+ <types>
+ <s:schema elementFormDefault="qualified" targetNamespace="http://test.pl">
+ <s:complexType name="Test">
+ <s:attribute use="required" name="str" type="s:string"/>
+ </s:complexType>
+ <s:element type="s0:Test" name="Test"/>
+ <s:element type="s:string" name="Ret"/>
+ </s:schema>
+ </types>
+
+ <message name="TestSoapIn">
+ <part name="parameters" element="s0:Test"/>
+ </message>
+ <message name="TestSoapOut">
+ <part name="parameters" element="s0:Ret"/>
+ </message>
+ <portType name="TestSoap">
+ <operation name="Test">
+ <input message="s0:TestSoapIn"/>
+ <output message="s0:TestSoapOut"/>
+ </operation>
+ </portType>
+ <binding name="TestSoap" type="s0:TestSoap">
+ <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+ <operation name="Test">
+ <soap:operation soapAction="http:/Test/Test" style="document"/>
+ <input>
+ <soap:body use="literal"/>
+ </input>
+ <output>
+ <soap:body use="literal"/>
+ </output>
+ </operation>
+ </binding>
+ <service name="Test">
+ <port name="TestSoapPort" binding="s0:TestSoap">
+ <soap:address location="http://localhost/server.php"/>
+ </port>
+ </service>
+</definitions>
|