Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 653078 | Differences between
and this patch

Collapse All | Expand All

(-)file_not_specified_in_diff (-5 / +8 lines)
Line  Link Here
0
-- /third_party/blink/renderer/core/xml/parser/xml_document_parser.cc
0
++ /third_party/blink/renderer/core/xml/parser/xml_document_parser.cc
Lines 28-33 Link Here
28
28
29
#include <libxml/parser.h>
29
#include <libxml/parser.h>
30
#include <libxml/parserInternals.h>
30
#include <libxml/parserInternals.h>
31
#include <libxml/xmlversion.h>
32
#if defined(LIBXML_CATALOG_ENABLED)
33
#include <libxml/catalog.h>
34
#endif
31
#include <libxslt/xslt.h>
35
#include <libxslt/xslt.h>
32
36
33
#include <memory>
37
#include <memory>
Lines 538-547 Link Here
538
static bool ShouldAllowExternalLoad(const KURL& url) {
542
static bool ShouldAllowExternalLoad(const KURL& url) {
539
  String url_string = url.GetString();
543
  String url_string = url.GetString();
540
544
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
545
  // The most common DTD. There isn't much point in hammering www.w3c.org by
546
  // requesting this URL for every XHTML document.
546
  // requesting this URL for every XHTML document.
547
  if (url_string.StartsWithIgnoringASCIICase("http://www.w3.org/TR/xhtml"))
547
  if (url_string.StartsWithIgnoringASCIICase("http://www.w3.org/TR/xhtml"))
Lines 648-653 Link Here
648
  if (did_init)
648
  if (did_init)
649
    return;
649
    return;
650
650
651
#if defined(LIBXML_CATALOG_ENABLED)
652
  xmlCatalogSetDefaults(XML_CATA_ALLOW_NONE);
653
#endif
651
  xmlInitParser();
654
  xmlInitParser();
652
  xmlRegisterInputCallbacks(MatchFunc, OpenFunc, ReadFunc, CloseFunc);
655
  xmlRegisterInputCallbacks(MatchFunc, OpenFunc, ReadFunc, CloseFunc);
653
  xmlRegisterOutputCallbacks(MatchFunc, OpenFunc, WriteFunc, CloseFunc);
656
  xmlRegisterOutputCallbacks(MatchFunc, OpenFunc, WriteFunc, CloseFunc);

Return to bug 653078