iliaa Sun May 1 15:49:40 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src NEWS
/php-src/ext/standard html.c
Log:
MFH: Fixed bug #32608 (html_entity_decode() converts single quotes even if
ENT_NOQUOTES is given).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.362&r2=1.1760.2.363&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.362 php-src/NEWS:1.1760.2.363
--- php-src/NEWS:1.1760.2.362 Sat Apr 30 00:30:18 2005
+++ php-src/NEWS Sun May 1 15:49:39 2005
@@ -33,6 +33,8 @@
can crash PHP). (Jani)
- Fixed bug #32615 (Segfault in replaceChild() using fragment when
previousSibling is NULL). (Rob)
+- Fixed bug #32608 (html_entity_decode() converts single quotes even if
+ ENT_NOQUOTES is given). (Ilia)
- Fixed bug #32591 (ext/mysql: Unsatisfied symbol: ntohs with HP-UX). (Jani)
- Fixed bug #32589 (Possible crash inside imap_mail_compose, with charsets).
(Ilia)
http://cvs.php.net/diff.php/php-src/ext/standard/html.c?r1=1.97.2.8&r2=1.97.2.9&ty=u
Index: php-src/ext/standard/html.c
diff -u php-src/ext/standard/html.c:1.97.2.8
php-src/ext/standard/html.c:1.97.2.9
--- php-src/ext/standard/html.c:1.97.2.8 Mon Mar 21 03:43:57 2005
+++ php-src/ext/standard/html.c Sun May 1 15:49:40 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: html.c,v 1.97.2.8 2005/03/21 08:43:57 hyanantha Exp $ */
+/* $Id: html.c,v 1.97.2.9 2005/05/01 19:49:40 iliaa Exp $ */
/*
* HTML entity resources:
@@ -117,7 +117,7 @@
"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 (0x0190)*/
+ /* 400 (0x0192)*/
NULL, NULL, "fnof"
};
@@ -988,7 +988,11 @@
if ((code >=
0x80 && code < 0xa0) || code > 0xff) {
invalid_code = 1;
} else {
- *(q++)
= code;
+ if
(code == 39 || !quote_style) {
+
invalid_code = 1;
+ } else {
+
*(q++) = code;
+ }
}
break;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
