|
Line
Link Here
|
| 0 |
-- /config.tests/xml2/xml2.cpp |
0 |
++ /config.tests/xml2/xml2.cpp |
|
Lines 27-35
Link Here
|
| 27 |
****************************************************************************/ |
27 |
****************************************************************************/ |
| 28 |
|
28 |
|
| 29 |
#include <libxml/xmlversion.h> |
29 |
#include <libxml/xmlversion.h> |
| 30 |
#if defined(LIBXML_CATALOG_ENABLED) |
|
|
| 31 |
#error "libxml catalog enabled" |
| 32 |
#endif |
| 33 |
#if !defined(LIBXML_ICU_ENABLED) |
30 |
#if !defined(LIBXML_ICU_ENABLED) |
| 34 |
#error "libxml icu not enabled" |
31 |
#error "libxml icu not enabled" |
| 35 |
#endif |
32 |
#endif |
| 36 |
-- /src/3rdparty/chromium/third_party/WebKit/Source/core/xml/parser/XMLDocumentParser.cpp |
33 |
++ /src/3rdparty/chromium/third_party/WebKit/Source/core/xml/parser/XMLDocumentParser.cpp |
|
Lines 538-547
Link Here
|
| 538 |
static bool ShouldAllowExternalLoad(const KURL& url) { |
538 |
static bool ShouldAllowExternalLoad(const KURL& url) { |
| 539 |
String url_string = url.GetString(); |
539 |
String url_string = url.GetString(); |
| 540 |
|
540 |
|
| 541 |
// libxml should not be configured with catalogs enabled, so it |
|
|
| 542 |
// should not be asking to load default catalogs. |
| 543 |
CHECK(!IsLibxmlDefaultCatalogFile(url)); |
| 544 |
|
| 545 |
// The most common DTD. There isn't much point in hammering www.w3c.org by |
541 |
// The most common DTD. There isn't much point in hammering www.w3c.org by |
| 546 |
// requesting this URL for every XHTML document. |
542 |
// requesting this URL for every XHTML document. |
| 547 |
if (url_string.StartsWithIgnoringASCIICase("http://www.w3.org/TR/xhtml")) |
543 |
if (url_string.StartsWithIgnoringASCIICase("http://www.w3.org/TR/xhtml")) |
|
Lines 646-651
Link Here
|
| 646 |
if (did_init) |
642 |
if (did_init) |
| 647 |
return; |
643 |
return; |
| 648 |
|
644 |
|
|
|
645 |
xmlCatalogSetDefaults(XML_CATA_ALLOW_NONE); |
| 649 |
xmlInitParser(); |
646 |
xmlInitParser(); |
| 650 |
xmlRegisterInputCallbacks(MatchFunc, OpenFunc, ReadFunc, CloseFunc); |
647 |
xmlRegisterInputCallbacks(MatchFunc, OpenFunc, ReadFunc, CloseFunc); |
| 651 |
xmlRegisterOutputCallbacks(MatchFunc, OpenFunc, WriteFunc, CloseFunc); |
648 |
xmlRegisterOutputCallbacks(MatchFunc, OpenFunc, WriteFunc, CloseFunc); |
