moriyoshiTue, 22 Dec 2009 05:50:34 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=292467
Log:
- Fix bug #46478 (htmlentities() uses obsolete mapping table for character
entity references)
Bug: http://bugs.php.net/46478 (Assigned) htmlentities() uses obsolete mapping
table for character entity references
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/standard/html.c
A
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/html_entity_decode_html4.phpt
A
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/htmlentities_html4.phpt
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2009-12-22 03:19:47 UTC (rev 292466)
+++ php/php-src/branches/PHP_5_3/NEWS 2009-12-22 05:50:34 UTC (rev 292467)
@@ -134,6 +134,8 @@
- Fixed bug #49174 (crash when extending PDOStatement and trying to set
queryString property). (Felipe)
- Fixed bug #47848 (importNode doesn't preserve attribute namespaces). (Rob)
+- Fixed bug #46478 (htmlentities() uses obsolete mapping table for character
+ entity references). (Moriyoshi)
- Fixed bug #45599 (strip_tags() truncates rest of string with invalid
attribute). (Ilia, hradtke)
- Fixed bug #45120 (PDOStatement-execute() returns true then false for same
Modified: php/php-src/branches/PHP_5_3/ext/standard/html.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/html.c 2009-12-22 03:19:47 UTC (rev 292466)
+++ php/php-src/branches/PHP_5_3/ext/standard/html.c 2009-12-22 05:50:34 UTC (rev 292467)
@@ -144,7 +144,7 @@
NULL, NULL, NULL, NULL, NULL, NULL, NULL,
thetasym, upsih,
NULL, NULL, NULL,
- piv
+ piv
};
static entity_table_t ent_uni_punct[] = {
@@ -154,7 +154,7 @@
NULL, NULL, NULL, ndash, mdash, NULL, NULL, NULL,
/* 8216 */
lsquo, rsquo, sbquo, NULL, ldquo, rdquo, bdquo, NULL,
- dagger, Dagger, bull, NULL, NULL, NULL, hellip,
+ dagger, Dagger, bull, NULL, NULL, NULL, hellip,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, permil, NULL,
/* 8242 */
prime, Prime, NULL, NULL, NULL, NULL, NULL, lsaquo, rsaquo, NULL,
@@ -194,39 +194,39 @@
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
/* 8656 (0x21d0) */
- lArr, uArr, rArr, dArr, hArr, vArr, NULL, NULL,
- NULL, NULL, lAarr, rAarr, NULL, rarrw, NULL, NULL,
+ lArr, uArr, rArr, dArr, hArr, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
/* 8672 (0x21e0) */
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
/* 8704 (0x2200) */
- forall, comp, part, exist, nexist, empty, NULL, nabla,
- isin, notin, epsis, ni, notni, bepsi, NULL, prod,
+ forall, NULL, part, exist, NULL, empty, NULL, nabla,
+ isin, notin, NULL, ni, NULL, NULL, NULL, prod,
/* 8720 (0x2210) */
- coprod, sum, minus, mnplus, plusdo, NULL, setmn, lowast,
- compfn, NULL, radic, NULL, NULL, prop, infin, ang90,
+ NULL, sum, minus, NULL, NULL, NULL, NULL, lowast,
+ NULL, NULL, radic, NULL, NULL, prop, infin, NULL,
/* 8736 (0x2220) */
- ang, angmsd, angsph, mid, nmid, par, npar, and,
- or, cap, cup, int, NULL, NULL, conint, NULL,
+ ang, NULL, NULL, NULL, NULL, NULL, NULL, and,
+ or, cap, cup, int, NULL, NULL, NULL, NULL,
/* 8752 (0x2230) */
- NULL, NULL, NULL, NULL, there4, becaus, NULL, NULL,
- NULL, NULL, NULL, NULL, sim, bsim, NULL, NULL,
+ NULL, NULL, NULL, NULL, there4, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL, sim, NULL, NULL, NULL,
/* 8768 (0x2240) */
- wreath, nsim, NULL, sime, nsime, cong, NULL, ncong,
- asymp, nap, ape, NULL, bcong, asymp, bump, bumpe,
+ NULL, NULL, NULL, NULL, NULL, cong, NULL, NULL,
+ asymp, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
/* 8784 (0x2250) */
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
/* 8800 (0x2260) */
- ne, equiv, NULL, NULL, le, ge, lE, gE,
- lnE, gnE, Lt, Gt, twixt, NULL, nlt, ngt,
+ ne, equiv, NULL, NULL, le, ge, NULL, NULL,
+ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
/* 8816 (0x2270) */
- nles, nges, lsim, gsim, NULL, NULL, lg, gl,
- NULL, NULL, pr, sc, cupre, sscue, prsim, scsim,
+ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
/* 8832 (0x2280) */
- npr, nsc, sub, sup, nsub, nsup, sube, supe,
+ NULL, NULL, sub, sup, nsub, NULL, sube, supe,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
/* 8848 (0x2290) */
NULL, NULL, NULL, NULL, NULL, oplus, NULL, otimes,
Added: php/php-src/branches/PHP_5_3/ext/standard/tests/strings/html_entity_decode_html4.phpt
===
---
