- Fixed bug #28067 (partially incorrect utf8 to htmlentities mapping). (Derick,

  Benjamin Greiner)

diff --git a/NEWS b/NEWS
index 5cb80fa5a6b70d87f2a59a036d929725fb971c78..9bea7c3244f39fc84b4c593937dd2e77a90193d6 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -95,6 +95,8 @@ PHP 4                                                                      NEWS
 - Fixed bug #28086 (crash inside overload() function). (Tony) 
 - Fixed bug #28074 (FastCGI: stderr should be written in a FCGI stderr stream).
   (chris at ex-parrot dot com)
+- Fixed bug #28067 (partially incorrect utf8 to htmlentities mapping). (Derick,
+  Benjamin Greiner)
 - Fixed bug #27633 (Double \r problem on ftp_get in ASCII mode on Win32). (Ilia)
 - Fixed bug #7782 (Cannot use PATH_INFO fully with php isapi). (Unknown)
 

diff --git a/ext/standard/html.c b/ext/standard/html.c
index 3b958f142155fbf7c1fba57c30e5c92df9d30d5d..c94827f6af7123f1b247dff21f87b84fe365a28e 100644 (file)
--- a/ext/standard/html.c
+++ b/ext/standard/html.c
@@ -27,6 +27,8 @@
  * http://msdn.microsoft.com/workshop/author/dhtml/reference/charsets/charset3.asp
  * http://www.unicode.org/Public/MAPPINGS/OBSOLETE/UNI2SGML.TXT
  *
+ * http://www.w3.org/TR/2002/REC-xhtml1-20020801/dtds.html#h-A2
+ *
  */
 
 #include "php.h"
@@ -109,16 +111,17 @@ static entity_table_t ent_uni_338_402[] = {
        NULL, NULL, NULL, NULL,
        /* 352 */
        "Scaron", "scaron",
-       /* 354 - 375 */
-       NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+       /* 354  */
        NULL, NULL, NULL, NULL, NULL, NULL, NULL,
        NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+       NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
        /* 376 */
        "Yuml",
-       /* 377 - 401 */
+       /* 377  */
        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,
        /* 402 */
        "fnof"
 };
@@ -145,9 +148,9 @@ static entity_table_t ent_uni_greek[] = {
        "sigmaf", "sigma", "tau", "upsilon", "phi", "chi", "psi", "omega",
        /* 970 - 976 are not mapped */
        NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-       "thetasym", "ups1h",
+       "thetasym", "upsih",
        NULL, NULL, NULL,
-       "p1v" 
+       "piv" 
 };
 
 static entity_table_t ent_uni_punct[] = {
@@ -155,7 +158,7 @@ static entity_table_t ent_uni_punct[] = {
        "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",
+       "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",
@@ -189,7 +192,7 @@ static entity_table_t ent_uni_8592_9002[] = {
        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
        /* 8624 (0x21b0) */
-       NULL, NULL, NULL, NULL, "crarr", NULL, NULL, NULL,
+       NULL, NULL, NULL, NULL, NULL, "crarr", NULL, NULL,
        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
        /* 8640 (0x21c0) */
        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
@@ -204,9 +207,9 @@ static entity_table_t ent_uni_8592_9002[] = {
        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
        /* 8704 (0x2200) */
        "forall", "comp", "part", "exist", "nexist", "empty", NULL, "nabla",
-       "isin", "notin", "epsis", NULL, "ni", "bepsi", NULL, "prod",
+       "isin", "notin", "epsis", "ni", "notni", "bepsi", NULL, "prod",
        /* 8720 (0x2210) */
-       "coprod", "sum", "minus", "mnplus", "plusdo", NULL, "setmn", NULL,
+       "coprod", "sum", "minus", "mnplus", "plusdo", NULL, "setmn", "lowast",
        "compfn", NULL, "radic", NULL, NULL, "prop", "infin", "ang90",
        /* 8736 (0x2220) */
        "ang", "angmsd", "angsph", "mid", "nmid", "par", "npar", "and",
@@ -216,7 +219,7 @@ static entity_table_t ent_uni_8592_9002[] = {
        NULL, NULL, NULL, NULL, "sim", "bsim", NULL, NULL,
        /* 8768 (0x2240) */
        "wreath", "nsim", NULL, "sime", "nsime", "cong", NULL, "ncong",
-       "ap", "nap", "ape", NULL, "bcong", "asymp", "bump", "bumpe",
+       "asymp", "nap", "ape", NULL, "bcong", "asymp", "bump", "bumpe",
        /* 8784 (0x2250) */
        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,