dmitry Thu Jun 14 07:09:31 2007 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/soap/tests/bugs bug41566.phpt
Modified files:
/php-src NEWS
/php-src/ext/soap php_encoding.c
Log:
Fixed bug #41566 (SOAP Server not properly generating href attributes)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.778&r2=1.2027.2.547.2.779&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.778 php-src/NEWS:1.2027.2.547.2.779
--- php-src/NEWS:1.2027.2.547.2.778 Wed Jun 13 17:07:58 2007
+++ php-src/NEWS Thu Jun 14 07:09:30 2007
@@ -45,6 +45,8 @@
other SAPIs disabling options). (Jani)
- Fixed bug #41567 (json_encode() double conversion is inconsistent with
PHP). (Lucas, Ilia)
+- Fixed bug #41566 (SOAP Server not properly generating href attributes).
+ (Dmitry)
- Fixed bug #41561 (Values set with php_admin_* in httpd.conf can be
overwritten
with ini_set()). (Tony, Dmitry)
- Fixed bug #41555 (configure failure: regression caused by fix for #41265).
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_encoding.c?r1=1.103.2.21.2.33&r2=1.103.2.21.2.34&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.33
php-src/ext/soap/php_encoding.c:1.103.2.21.2.34
--- php-src/ext/soap/php_encoding.c:1.103.2.21.2.33 Fri May 4 06:19:34 2007
+++ php-src/ext/soap/php_encoding.c Thu Jun 14 07:09:31 2007
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_encoding.c,v 1.103.2.21.2.33 2007/05/04 06:19:34 dmitry Exp $ */
+/* $Id: php_encoding.c,v 1.103.2.21.2.34 2007/06/14 07:09:31 dmitry Exp $ */
#include <time.h>
@@ -297,6 +297,10 @@
}
if (attr) {
id = (char*)attr->children->content;
+ smart_str_appendc(&prefix, '#');
+ smart_str_appends(&prefix, id);
+ smart_str_0(&prefix);
+ id = prefix.c;
} else {
SOAP_GLOBAL(cur_uniq_ref)++;
smart_str_appendl(&prefix, "#ref", 4);
@@ -310,6 +314,10 @@
attr = get_attribute_ex(attr, "id",
SOAP_1_2_ENC_NAMESPACE);
if (attr) {
id = (char*)attr->children->content;
+ smart_str_appendc(&prefix, '#');
+ smart_str_appends(&prefix, id);
+ smart_str_0(&prefix);
+ id = prefix.c;
} else {
SOAP_GLOBAL(cur_uniq_ref)++;
smart_str_appendl(&prefix, "#ref", 4);
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug41566.phpt?view=markup&rev=1.1
Index: php-src/ext/soap/tests/bugs/bug41566.phpt
+++ php-src/ext/soap/tests/bugs/bug41566.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
