dmitry          Wed Jul 12 08:59:40 2006 UTC

  Added files:                 (Branch: PHP_5_2)
    /php-src/ext/soap/tests/bugs        bug38067.phpt bug38067.wsdl 

  Modified files:              
    /php-src    NEWS 
    /php-src/ext/soap   php_encoding.c 
  Log:
  Fixed bug #38067 (Parameters are not decoded from utf-8 when using encoding 
option)
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.117&r2=1.2027.2.547.2.118&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.117 php-src/NEWS:1.2027.2.547.2.118
--- php-src/NEWS:1.2027.2.547.2.117     Wed Jul 12 07:54:00 2006
+++ php-src/NEWS        Wed Jul 12 08:59:40 2006
@@ -82,6 +82,8 @@
 
 - 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).
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_encoding.c?r1=1.103.2.21.2.7&r2=1.103.2.21.2.8&diff_format=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.103.2.21.2.7 
php-src/ext/soap/php_encoding.c:1.103.2.21.2.8
--- php-src/ext/soap/php_encoding.c:1.103.2.21.2.7      Tue Jul 11 14:35:50 2006
+++ php-src/ext/soap/php_encoding.c     Wed Jul 12 08:59:40 2006
@@ -17,7 +17,7 @@
   |          Dmitry Stogov <[EMAIL PROTECTED]>                             |
   +----------------------------------------------------------------------+
 */
-/* $Id: php_encoding.c,v 1.103.2.21.2.7 2006/07/11 14:35:50 dmitry Exp $ */
+/* $Id: php_encoding.c,v 1.103.2.21.2.8 2006/07/12 08:59:40 dmitry Exp $ */
 
 #include <time.h>
 
@@ -1346,12 +1346,12 @@
                                                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);

http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug38067.phpt?view=markup&rev=1.1
Index: php-src/ext/soap/tests/bugs/bug38067.phpt
+++ php-src/ext/soap/tests/bugs/bug38067.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug38067.wsdl?view=markup&rev=1.1
Index: php-src/ext/soap/tests/bugs/bug38067.wsdl
+++ php-src/ext/soap/tests/bugs/bug38067.wsdl

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to