diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-31 17:22:05 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-31 17:22:05 +0000 |
| commit | c6331f4d59cca0fdae365863dbe4c991211b1931 (patch) | |
| tree | b2f9e901db86f30faa2b51ea0900e375a5b5005d | |
| parent | 529f2aa9cf237f2fbd413282ad5c4389873feb89 (diff) | |
| download | chromium_src-c6331f4d59cca0fdae365863dbe4c991211b1931.zip chromium_src-c6331f4d59cca0fdae365863dbe4c991211b1931.tar.gz chromium_src-c6331f4d59cca0fdae365863dbe4c991211b1931.tar.bz2 | |
Remove libxml hack that is not needed after we rolled in the WebKit fix
from https://bugs.webkit.org/show_bug.cgi?id=30508.
BUG=29333
TEST=see bug
Review URL: http://codereview.chromium.org/3280011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58011 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | third_party/libxml/patches/libxml-disable-autodetect | 38 | ||||
| -rw-r--r-- | third_party/libxml/src/parser.c | 15 |
2 files changed, 0 insertions, 53 deletions
diff --git a/third_party/libxml/patches/libxml-disable-autodetect b/third_party/libxml/patches/libxml-disable-autodetect deleted file mode 100644 index c37d41a..0000000 --- a/third_party/libxml/patches/libxml-disable-autodetect +++ /dev/null @@ -1,38 +0,0 @@ -See comment below inline in the patch. -It'd be nice to fix this properly but that will require upstream WebKit -changes; for now, we can just patch out some code to keep behavior as it -was before. - -diff --git a/third_party/libxml/parser.c b/third_party/libxml/parser.c -index 3ba2a06..4a3cde5 100644 ---- a/third_party/libxml/parser.c -+++ b/third_party/libxml/parser.c -@@ -11545,6 +11545,20 @@ xmldecl_done: - int cur = ctxt->input->cur - ctxt->input->base; - int res; - -+ /* Chromium note: commenting out the following block of code is a gory -+ * hack, meant to partially undo -+ * http://git.gnome.org/browse/libxml2/commit/?id=a6c76a -+ * -+ * WebKit and libxml disagree about who is responsible for the -+ * document encoding. -+ * -+ * This bug: -+ * https://bugs.webkit.org/show_bug.cgi?id=30508 -+ * has links to test cases, libxml bug reports, and mailing list threads -+ * arguing about it; for now, though, we can just undo the change that -+ * caused libxml to regress. -+ */ -+#if 0 - /* - * Specific handling if we autodetected an encoding, we should not - * push more than the first line ... which depend on the encoding -@@ -11580,6 +11594,7 @@ xmldecl_done: - remain = 0; - } - } -+#endif - res =xmlParserInputBufferPush(ctxt->input->buf, size, chunk); - if (res < 0) { - ctxt->errNo = XML_PARSER_EOF; diff --git a/third_party/libxml/src/parser.c b/third_party/libxml/src/parser.c index 4a3cde5..3ba2a06 100644 --- a/third_party/libxml/src/parser.c +++ b/third_party/libxml/src/parser.c @@ -11545,20 +11545,6 @@ xmldecl_done: int cur = ctxt->input->cur - ctxt->input->base; int res; - /* Chromium note: commenting out the following block of code is a gory - * hack, meant to partially undo - * http://git.gnome.org/browse/libxml2/commit/?id=a6c76a - * - * WebKit and libxml disagree about who is responsible for the - * document encoding. - * - * This bug: - * https://bugs.webkit.org/show_bug.cgi?id=30508 - * has links to test cases, libxml bug reports, and mailing list threads - * arguing about it; for now, though, we can just undo the change that - * caused libxml to regress. - */ -#if 0 /* * Specific handling if we autodetected an encoding, we should not * push more than the first line ... which depend on the encoding @@ -11594,7 +11580,6 @@ xmldecl_done: remain = 0; } } -#endif res =xmlParserInputBufferPush(ctxt->input->buf, size, chunk); if (res < 0) { ctxt->errNo = XML_PARSER_EOF; |