MFH This entry doesn't exist upstream any more, it also caused all error messages...

diff --git a/NEWS b/NEWS
index f28ad55b5488512182025aefec9bd545bded2687..64c1192cb4884aae228b8c24da6198a8b4a0ba99 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,8 @@ PHP                                                                        NEWS
   correctly with a non truecolour image. Reported by Hamid Ebadi,
   APA Laboratory (Fixes CVE-2008-5498). (Scott)
 - Fixed a segfault when malformed string is passed to json_decode(). (Scott)
+- Fixed bug in xml_error_string() which resulted in messages being
+  off by one. (Scott)
 
 - Fixed bug #47042 (PHP cgi sapi is removing SCRIPT_FILENAME for non apache).
   (Sriram Natarajan)

diff --git a/ext/xml/compat.c b/ext/xml/compat.c
index e6f4d198cf2cc303276436b826ab8c78d7bbd804..0e54fc742a5179942a2c2a2a2e15f7ae31e1e5d4 100644 (file)
--- a/ext/xml/compat.c
+++ b/ext/xml/compat.c
@@ -620,7 +620,6 @@ XML_GetErrorCode(XML_Parser parser)
 
 static const XML_Char *const error_mapping[] = {
        "No error",
-       "Internal error",
        "No memory",
        "Invalid document start",
        "Empty document",