cvs: php-src(PHP_5_2) / NEWS /ext/soap php_encoding.c /ext/soap/tests/bugs bug38004.phpt bug38004.wsdl
| From: | Dmitry Stogov | Date: | Mon, 10 Jul 2006 07:21:41 +0000 |
| Subject: | cvs: php-src(PHP_5_2) / NEWS /ext/soap php_encoding.c /ext/soap/tests/bugs bug38004.phpt bug38004.wsdl | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-39095@lists.php.net to get a copy of this message | ||
dmitry Mon Jul 10 07:21:41 2006 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/soap/tests/bugs bug38004.phpt bug38004.wsdl
Modified files:
/php-src NEWS
/php-src/ext/soap php_encoding.c
Log:
Fixed bug #38004 Parameters in SoapServer are decoded twice
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.111&r2=1.2027.2.547.2.112&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.111 php-src/NEWS:1.2027.2.547.2.112
--- php-src/NEWS:1.2027.2.547.2.111 Mon Jul 10 00:36:47 2006
+++ php-src/NEWS Mon Jul 10 07:21:41 2006
@@ -82,6 +82,7 @@
- Fixed memory leaks in openssl streams context options. (Pierre)
- Fixed handling of extremely long paths inside tempnam() function. (Ilia)
+- Fixed bug #38004 Parameters in SoapServer are decoded twice. (Dmitry)
- Fixed bug #38003 (in classes inherited from MySQLi it's possible to call
private constructors from invalid context). (Tony)
- Fixed bug #37987 (invalid return of file_exists() in safe mode). (Ilia)
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_encoding.c?r1=1.103.2.21.2.3&r2=1.103.2.21.2.4&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.3
php-src/ext/soap/php_encoding.c:1.103.2.21.2.4
--- php-src/ext/soap/php_encoding.c:1.103.2.21.2.3 Thu Jun 15 22:45:30 2006
+++ php-src/ext/soap/php_encoding.c Mon Jul 10 07:21:41 2006
@@ -17,7 +17,7 @@
| Dmitry Stogov <dmitry@zend.com> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_encoding.c,v 1.103.2.21.2.3 2006/06/15 22:45:30 rasmus Exp $ */
+/* $Id: php_encoding.c,v 1.103.2.21.2.4 2006/07/10 07:21:41 dmitry Exp $ */
#include <time.h>
@@ -1353,11 +1353,12 @@
str_val = (*attr)->def;
}
if (str_val) {
+ zval zstr;
xmlNodePtr dummy;
zval *data;
- dummy = xmlNewNode(NULL, "BOGUS");
- xmlNodeSetContent(dummy, str_val);
+ ZVAL_STRING(&zstr, str_val, 0);
+ dummy = master_to_xml(get_conversion(IS_STRING), &zstr, SOAP_LITERAL, NULL);
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/bug38004.phpt?view=markup&rev=1.1
Index: php-src/ext/soap/tests/bugs/bug38004.phpt
+++ php-src/ext/soap/tests/bugs/bug38004.phpt
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug38004.wsdl?view=markup&rev=1.1
Index: php-src/ext/soap/tests/bugs/bug38004.wsdl
+++ php-src/ext/soap/tests/bugs/bug38004.wsdl