Title: [138422] trunk
- Revision
- 138422
- Author
- d...@gnome.org
- Date
- 2012-12-23 09:28:25 -0800 (Sun, 23 Dec 2012)
Log Message
Add a patch to fix libxml2 2.9.0 regression
https://bugs.webkit.org/show_bug.cgi?id=104494
Reviewed by Martin Robinson.
* gtk/jhbuild.modules:
* gtk/patches/libxml2-2.9.0-dtd.patch: patch from upstream
Unskip tests that were failing in libxml 2.9.0
https://bugs.webkit.org/show_bug.cgi?id=104494
Reviewed by Martin Robinson.
Added a patch from upstream to the jhbuild config to make all but
one of these pass again; the remaining one fails for a different
reason and is being tracked in a different bug.
* platform/gtk/TestExpectations:
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (138421 => 138422)
--- trunk/LayoutTests/ChangeLog 2012-12-23 17:04:55 UTC (rev 138421)
+++ trunk/LayoutTests/ChangeLog 2012-12-23 17:28:25 UTC (rev 138422)
@@ -1,3 +1,16 @@
+2012-12-22 Dan Winship <d...@gnome.org>
+
+ Unskip tests that were failing in libxml 2.9.0
+ https://bugs.webkit.org/show_bug.cgi?id=104494
+
+ Reviewed by Martin Robinson.
+
+ Added a patch from upstream to the jhbuild config to make all but
+ one of these pass again; the remaining one fails for a different
+ reason and is being tracked in a different bug.
+
+ * platform/gtk/TestExpectations:
+
2012-12-23 Christophe Dumez <christophe.du...@intel.com>
[EFL] Unreviewed gardening
Modified: trunk/LayoutTests/platform/gtk/TestExpectations (138421 => 138422)
--- trunk/LayoutTests/platform/gtk/TestExpectations 2012-12-23 17:04:55 UTC (rev 138421)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2012-12-23 17:28:25 UTC (rev 138422)
@@ -1367,21 +1367,7 @@
webkit.org/b/104054 svg/custom/use-href-update-crash.svg [ Failure ]
-webkit.org/b/104493 http/tests/security/xss-DENIED-xml-external-entity.xhtml [ Failure ]
-webkit.org/b/104493 svg/custom/deep-dynamic-updates.svg [ Failure ]
-webkit.org/b/104493 svg/custom/foreignObject-crash-on-hover.xml [ Failure ]
-webkit.org/b/104493 svg/custom/js-update-gradient.svg [ Failure ]
-webkit.org/b/104493 svg/custom/js-update-path-changes.svg [ Failure ]
-webkit.org/b/104493 svg/custom/js-update-path-removal.svg [ Failure ]
-webkit.org/b/104493 svg/custom/js-update-pattern-child.svg [ Failure ]
-webkit.org/b/104493 svg/custom/js-update-pattern.svg [ Failure ]
-webkit.org/b/104493 svg/custom/js-update-polygon-changes.svg [ Failure ]
-webkit.org/b/104493 svg/custom/js-update-polygon-removal.svg [ Failure ]
-webkit.org/b/104493 svg/custom/js-update-stop-linked-gradient.svg [ Failure ]
-webkit.org/b/104493 svg/custom/js-update-stop.svg [ Failure ]
-webkit.org/b/104493 svg/custom/js-update-transform-addition.svg [ Failure ]
-webkit.org/b/104493 svg/custom/js-update-transform-changes.svg [ Failure ]
-webkit.org/b/104493 svg/custom/text-xy-updates-SVGList.xhtml [ Failure ]
+webkit.org/b/104680 http/tests/security/xss-DENIED-xml-external-entity.xhtml [ Failure ]
webkit.org/b/104686 http/tests/xmlhttprequest/redirect-cross-origin-tripmine.html [ Failure ]
Modified: trunk/Tools/ChangeLog (138421 => 138422)
--- trunk/Tools/ChangeLog 2012-12-23 17:04:55 UTC (rev 138421)
+++ trunk/Tools/ChangeLog 2012-12-23 17:28:25 UTC (rev 138422)
@@ -1,3 +1,13 @@
+2012-12-22 Dan Winship <d...@gnome.org>
+
+ Add a patch to fix libxml2 2.9.0 regression
+ https://bugs.webkit.org/show_bug.cgi?id=104494
+
+ Reviewed by Martin Robinson.
+
+ * gtk/jhbuild.modules:
+ * gtk/patches/libxml2-2.9.0-dtd.patch: patch from upstream
+
2012-12-23 Allan Sandfeld Jensen <allan.jen...@digia.com>
Unreviewed update of status to reviewer.
Modified: trunk/Tools/gtk/jhbuild.modules (138421 => 138422)
--- trunk/Tools/gtk/jhbuild.modules 2012-12-23 17:04:55 UTC (rev 138421)
+++ trunk/Tools/gtk/jhbuild.modules 2012-12-23 17:28:25 UTC (rev 138422)
@@ -234,7 +234,9 @@
<branch module="/libxml2/libxml2-2.9.0.tar.gz" version="2.9.0"
repo="xmlsoft.org"
hash="sha256:ad25d91958b7212abdc12b9611cfb4dc4e5cddb6d1e9891532f48aacee422b82"
- md5sum="5b9bebf4f5d2200ae2c4efe8fa6103f7"/>
+ md5sum="5b9bebf4f5d2200ae2c4efe8fa6103f7">
+ <patch file="libxml2-2.9.0-dtd.patch" strip="1"/>
+ </branch>
</autotools>
<autotools id="gstreamer">
Added: trunk/Tools/gtk/patches/libxml2-2.9.0-dtd.patch (0 => 138422)
--- trunk/Tools/gtk/patches/libxml2-2.9.0-dtd.patch (rev 0)
+++ trunk/Tools/gtk/patches/libxml2-2.9.0-dtd.patch 2012-12-23 17:28:25 UTC (rev 138422)
@@ -0,0 +1,27 @@
+From cf8f0424db45c43ecda812b7c238ece5e2398107 Mon Sep 17 00:00:00 2001
+From: Dan Winship <d...@gnome.org>
+Date: Fri, 21 Dec 2012 11:13:31 +0800
+Subject: [PATCH] Fix an error in the progressive DTD parsing code
+
+For https://bugzilla.gnome.org/show_bug.cgi?id=689958
+We were looking for the wrong character in the input stream
+---
+ parser.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/parser.c b/parser.c
+index c7802cf..e719c9f 100644
+--- a/parser.c
++++ b/parser.c
+@@ -12042,7 +12042,7 @@ xmlParseCheckTransition(xmlParserCtxtPtr ctxt, const char *chunk, int size) {
+ }
+ if ((ctxt->progressive == XML_PARSER_DTD) ||
+ (ctxt->instate == XML_PARSER_DTD)) {
+- if (memchr(chunk, ']', size) != NULL)
++ if (memchr(chunk, '>', size) != NULL)
+ return(1);
+ return(0);
+ }
+--
+1.8.0.1
+
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
