scottmac Fri Jan 25 18:10:46 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src NEWS
/php-src/ext/standard html.c
Log:
Fix html_entity_decode when converting numeric html entities, the numeric
values for the extended characters don't correspond to that of windows-1251 and
cp866.
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.87&r2=1.2027.2.547.2.965.2.88&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.87
php-src/NEWS:1.2027.2.547.2.965.2.88
--- php-src/NEWS:1.2027.2.547.2.965.2.87 Thu Jan 24 09:46:59 2008
+++ php-src/NEWS Fri Jan 25 18:10:45 2008
@@ -82,6 +82,8 @@
- Changed exception handling. Now each op_array doesn't contain
ZEND_HANDLE_EXCEPTION opcode in the end. (Dmitry)
+- Fixed html_entity_decode() incorrectly converting numeric html entities
+ to different characters with cp1251 and cp866. (Scott)
- Fixed possible crash in ext/soap because of uninitialized value. (Zdash Urf)
- Fixed bug #43808 (date_create never fails (even when it should)). (Derick)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/html.c?r1=1.111.2.2.2.14.2.5&r2=1.111.2.2.2.14.2.6&diff_format=u
Index: php-src/ext/standard/html.c
diff -u php-src/ext/standard/html.c:1.111.2.2.2.14.2.5
php-src/ext/standard/html.c:1.111.2.2.2.14.2.6
--- php-src/ext/standard/html.c:1.111.2.2.2.14.2.5 Mon Dec 31 07:17:15 2007
+++ php-src/ext/standard/html.c Fri Jan 25 18:10:45 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: html.c,v 1.111.2.2.2.14.2.5 2007/12/31 07:17:15 sebastian Exp $ */
+/* $Id: html.c,v 1.111.2.2.2.14.2.6 2008/01/25 18:10:45 scottmac Exp $ */
/*
* HTML entity resources:
@@ -1034,8 +1034,6 @@
break;
case cs_cp1252:
- case cs_cp1251:
- case cs_cp866:
if (code >
0xff) {
invalid_code = 1;
} else {
@@ -1043,6 +1041,8 @@
}
break;
+ case cs_cp1251:
+ case cs_cp866:
case cs_big5:
case cs_big5hkscs:
case cs_sjis:
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
