iliaa Thu May 25 22:54:16 2006 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/wddx/tests bug37569.phpt
Modified files:
/php-src NEWS
/php-src/ext/wddx wddx.c
Log:
Fixed bug #37569 (WDDX incorrectly encodes high-ascii characters)
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.547.2.53&r2=1.2027.2.547.2.54&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.53 php-src/NEWS:1.2027.2.547.2.54
--- php-src/NEWS:1.2027.2.547.2.53 Thu May 25 12:41:35 2006
+++ php-src/NEWS Thu May 25 22:54:16 2006
@@ -46,6 +46,7 @@
- Added RFC2397 (data: stream) support. (Marcus)
- Fixed handling of extremely long paths inside tempnam() function. (Ilia)
- Fixed bug #37587 (var without attribute causes segfault). (Marcus)
+- Fixed bug #37569 (WDDX incorrectly encodes high-ascii characters). (Ilia)
- Fixed bug #37565 (Using reflection::export with simplexml causing a crash).
(Marcus)
- Fixed bug #37563 (array_key_exists performance is poor for &$array). (Ilia)
http://cvs.php.net/viewcvs.cgi/php-src/ext/wddx/wddx.c?r1=1.119.2.10.2.1&r2=1.119.2.10.2.2&diff_format=u
Index: php-src/ext/wddx/wddx.c
diff -u php-src/ext/wddx/wddx.c:1.119.2.10.2.1
php-src/ext/wddx/wddx.c:1.119.2.10.2.2
--- php-src/ext/wddx/wddx.c:1.119.2.10.2.1 Thu May 25 09:59:25 2006
+++ php-src/ext/wddx/wddx.c Thu May 25 22:54:16 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: wddx.c,v 1.119.2.10.2.1 2006/05/25 09:59:25 helly Exp $ */
+/* $Id: wddx.c,v 1.119.2.10.2.2 2006/05/25 22:54:16 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -399,9 +399,9 @@
break;
default:
- if (iscntrl((int)*(unsigned char *)p)) {
+ if (iscntrl((int)*(unsigned char *)p)
|| (int)*(unsigned char *)p >= 127) {
FLUSH_BUF();
- sprintf(control_buf, WDDX_CHAR,
*p);
+ sprintf(control_buf, WDDX_CHAR,
(int)*(unsigned char *)p);
php_wddx_add_chunk(packet,
control_buf);
} else
buf[l++] = *p;
http://cvs.php.net/viewcvs.cgi/php-src/ext/wddx/tests/bug37569.phpt?view=markup&rev=1.1
Index: php-src/ext/wddx/tests/bug37569.phpt
+++ php-src/ext/wddx/tests/bug37569.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
