jorton Wed May 11 10:58:35 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/standard html.c
Log:
MFH: - Fixed bug #29119 (html_decode_entities handling of U+0152-U+0192 range)
(merge error from 4.3)
MFH: Mark pointers in entity tables as const.
http://cvs.php.net/diff.php/php-src/ext/standard/html.c?r1=1.97.2.9&r2=1.97.2.10&ty=u
Index: php-src/ext/standard/html.c
diff -u php-src/ext/standard/html.c:1.97.2.9
php-src/ext/standard/html.c:1.97.2.10
--- php-src/ext/standard/html.c:1.97.2.9 Sun May 1 15:49:40 2005
+++ php-src/ext/standard/html.c Wed May 11 10:58:34 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: html.c,v 1.97.2.9 2005/05/01 19:49:40 iliaa Exp $ */
+/* $Id: html.c,v 1.97.2.10 2005/05/11 14:58:34 jorton Exp $ */
/*
* HTML entity resources:
@@ -58,7 +58,7 @@
cs_big5hkscs, cs_sjis, cs_eucjp,
cs_koi8r,
cs_cp1251, cs_8859_5, cs_cp866,
cs_macroman
};
-typedef const char *entity_table_t;
+typedef const char *const entity_table_t;
/* codepage 1252 is a Windows extension to iso-8859-1. */
static entity_table_t ent_cp_1252[] = {
@@ -113,11 +113,11 @@
"Scaron", "scaron", NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- /* 376 (0x0178)
+ /* 376 (0x0178) */
"Yuml", NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, */
- /* 400 (0x0192)*/
+ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+ /* 400 (0x0190) */
NULL, NULL, "fnof"
};
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
