moriyoshi Mon Jul 19 13:53:00 2004 EDT Added files: (Branch: PHP_5_0) /php-src/ext/standard/tests/strings bug29119.phpt
Modified files: /php-src/ext/standard html.c /php-src NEWS Log: - MFH (html.c: 1.98, bug29199.phpt: 1.1): Fix bug #29199 (html_entity_decode() misbehaves with UTF-8) http://cvs.php.net/diff.php/php-src/ext/standard/html.c?r1=1.97&r2=1.97.2.1&ty=u Index: php-src/ext/standard/html.c diff -u php-src/ext/standard/html.c:1.97 php-src/ext/standard/html.c:1.97.2.1 --- php-src/ext/standard/html.c:1.97 Tue Jul 13 13:14:49 2004 +++ php-src/ext/standard/html.c Mon Jul 19 13:52:59 2004 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: html.c,v 1.97 2004/07/13 17:14:49 wez Exp $ */ +/* $Id: html.c,v 1.97.2.1 2004/07/19 17:52:59 moriyoshi Exp $ */ /* * HTML entity resources: @@ -157,11 +157,13 @@ "ensp", "emsp", NULL, NULL, NULL, NULL, NULL, "thinsp", NULL, NULL, "zwnj", "zwj", "lrm", "rlm", NULL, NULL, NULL, "ndash", "mdash", NULL, NULL, NULL, - "lsquo", "rsquo", "sbquo", NULL, "ldquo", "rdquo", "bdquo", + /* 8216 */ + "lsquo", "rsquo", "sbquo", NULL, "ldquo", "rdquo", "bdquo", NULL, "dagger", "Dagger", "bull", NULL, NULL, NULL, "hellip", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, "permil", NULL, - "prime", "Prime", NULL, NULL, NULL, NULL, NULL, "lsaquo", "rsaquo", - NULL, NULL, NULL, "oline", NULL, NULL, NULL, NULL, NULL, + /* 8242 */ + "prime", "Prime", NULL, NULL, NULL, NULL, NULL, "lsaquo", "rsaquo", NULL, + NULL, NULL, "oline", NULL, NULL, NULL, NULL, NULL, "frasl" }; @@ -899,8 +901,7 @@ if (entity_map[j].table[k - entity_map[j].basechar] == NULL) continue; - - + entity[0] = '&'; entity_length = strlen(entity_map[j].table[k - entity_map[j].basechar]); strncpy(&entity[1], entity_map[j].table[k - entity_map[j].basechar], sizeof(entity) - 2); http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.2&r2=1.1760.2.3&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.2 php-src/NEWS:1.1760.2.3 --- php-src/NEWS:1.1760.2.2 Fri Jul 16 19:45:21 2004 +++ php-src/NEWS Mon Jul 19 13:52:59 2004 @@ -1,6 +1,7 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2004, PHP 5.0.1 +- Fixed bug #29119 (html_entity_decode() misbehaves with UTF-8). (Moriyoshi) - Fixed bug #28829 (Thread-unsafety in bcmath elementary values). (Sara) - Fixed bug #28464 (catch() does not catch exceptions by interfaces). (Marcus) - Fixed convert.* filters to consume remaining buckets_in on flush. (Sara) http://cvs.php.net/co.php/php-src/ext/standard/tests/strings/bug29119.phpt?r=1.1&p=1 Index: php-src/ext/standard/tests/strings/bug29119.phpt +++ php-src/ext/standard/tests/strings/bug29119.phpt --TEST-- Bug #29199 (html_entity_decode() misbehaves with UTF-8) --FILE-- <?php var_dump(bin2hex(html_entity_decode('  ‘†′⁄€', ENT_QUOTES, 'UTF-8'))); ?> --EXPECT-- string(42) "e28082e28089e28098e280a0e280b2e28184e282ac" -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php