Ticket #19940: libxml2.diff

parserInternals.c

@@ -180 +180 @@
         return;
 
     /*
-     * Don't report a well-formedness error if an external entity could
-     * not be found. We assume that inputNr is zero for the document
-     * entity which is somewhat fragile.
+     * Only report a warning if a file could not be found. This should
+     * only be done for external entities, but the external entity loader
+     * of xsltproc can try multiple paths and assumes that ENOENT doesn't
+     * raise an error and aborts parsing.
      */
-    if ((ctxt->inputNr > 0) &&
-        ((code == XML_IO_ENOENT) ||
+    if (((code == XML_IO_ENOENT) ||
          (code == XML_IO_NETWORK_ATTEMPT) ||
          (code == XML_IO_UNKNOWN))) {
         if (ctxt->validate == 0)

python/tests/error.py

@@ -10 +10 @@
 # Memory debug specific
 libxml2.debugMemory(1)
 
-expect='--> I/O --> error : --> failed to load "missing.xml": No such file or directory\n'
+expect='--> I/O --> warning : --> failed to load "missing.xml": No such file or directory\n'
 err=""
 def callback(ctx, str):
      global err

python/tests/input_callback.py

@@ -90 +90 @@
         docpath=startURL, catalog=None,
         exp_status="not loaded", exp_err=[
             (-1, "I/O "),
-            (-1, "error : "),
+            (-1, "warning : "),
             (-1, "failed to load \"py://strings/xml/sample.xml\": No such file or directory\n")
             ])
 
@@ -121 +121 @@
         docpath=startURL, catalog=catURL,
         exp_status="not loaded", exp_err=[
             (-1, "I/O "),
-            (-1, "error : "),
+            (-1, "warning : "),
             (-1, "failed to load \"py://strings/xml/sample.xml\": No such file or directory\n")
             ])
 
@@ -141 +141 @@
         docpath="tst.xml", catalog=None,
         exp_status="not loaded", exp_err=[
             (-1, "I/O "),
-            (-1, "error : "),
+            (-1, "warning : "),
             (-1, "failed to load \"tst.xml\": No such file or directory\n")
             ])
 

python/tests/tstLastError.py

@@ -60 +60 @@
                         domain=libxml2.XML_FROM_IO,
                         code=libxml2.XML_IO_ENOENT,
                         message='failed to load "dummy.xml": No such file or directory\n',
-                        level=libxml2.XML_ERR_FATAL,
+                        level=libxml2.XML_ERR_WARNING,
                         file=None,
                         line=0)
 

result/XInclude/fallback.xml.err

@@ -1 @@
-I/O error : failed to load "test/XInclude/docs/something.xml": No such file or directory
+I/O warning : failed to load "test/XInclude/docs/something.xml": No such file or directory

result/XInclude/fallback2.xml.err

@@ -1 @@
-I/O error : failed to load "test/XInclude/docs/b.xml": No such file or directory
-I/O error : failed to load "test/XInclude/docs/c.xml": No such file or directory
+I/O warning : failed to load "test/XInclude/docs/b.xml": No such file or directory
+I/O warning : failed to load "test/XInclude/docs/c.xml": No such file or directory

result/XInclude/fallback4.xml.err

@@ -1 @@
-I/O error : failed to load "test/XInclude/docs/c.xml": No such file or directory
+I/O warning : failed to load "test/XInclude/docs/c.xml": No such file or directory

result/XInclude/fallback5.xml.err

@@ -1 @@
-I/O error : failed to load "test/XInclude/docs/a01.xml": No such file or directory
-I/O error : failed to load "test/XInclude/docs/a02.xml": No such file or directory
-I/O error : failed to load "test/XInclude/docs/a03.xml": No such file or directory
-I/O error : failed to load "test/XInclude/docs/a04.xml": No such file or directory
-I/O error : failed to load "test/XInclude/docs/a05.xml": No such file or directory
-I/O error : failed to load "test/XInclude/docs/a06.xml": No such file or directory
-I/O error : failed to load "test/XInclude/docs/a07.xml": No such file or directory
-I/O error : failed to load "test/XInclude/docs/a08.xml": No such file or directory
-I/O error : failed to load "test/XInclude/docs/a09.xml": No such file or directory
-I/O error : failed to load "test/XInclude/docs/a10.xml": No such file or directory
-I/O error : failed to load "test/XInclude/docs/a11.xml": No such file or directory
-I/O error : failed to load "test/XInclude/docs/a12.xml": No such file or directory
-I/O error : failed to load "test/XInclude/docs/a13.xml": No such file or directory
-I/O error : failed to load "test/XInclude/docs/a14.xml": No such file or directory
-I/O error : failed to load "test/XInclude/docs/a15.xml": No such file or directory
-I/O error : failed to load "test/XInclude/docs/a16.xml": No such file or directory
+I/O warning : failed to load "test/XInclude/docs/a01.xml": No such file or directory
+I/O warning : failed to load "test/XInclude/docs/a02.xml": No such file or directory
+I/O warning : failed to load "test/XInclude/docs/a03.xml": No such file or directory
+I/O warning : failed to load "test/XInclude/docs/a04.xml": No such file or directory
+I/O warning : failed to load "test/XInclude/docs/a05.xml": No such file or directory
+I/O warning : failed to load "test/XInclude/docs/a06.xml": No such file or directory
+I/O warning : failed to load "test/XInclude/docs/a07.xml": No such file or directory
+I/O warning : failed to load "test/XInclude/docs/a08.xml": No such file or directory
+I/O warning : failed to load "test/XInclude/docs/a09.xml": No such file or directory
+I/O warning : failed to load "test/XInclude/docs/a10.xml": No such file or directory
+I/O warning : failed to load "test/XInclude/docs/a11.xml": No such file or directory
+I/O warning : failed to load "test/XInclude/docs/a12.xml": No such file or directory
+I/O warning : failed to load "test/XInclude/docs/a13.xml": No such file or directory
+I/O warning : failed to load "test/XInclude/docs/a14.xml": No such file or directory
+I/O warning : failed to load "test/XInclude/docs/a15.xml": No such file or directory
+I/O warning : failed to load "test/XInclude/docs/a16.xml": No such file or directory

result/XInclude/fallback6.xml.err

@@ -1 @@
-I/O error : failed to load "test/XInclude/docs/b.xml": No such file or directory
-I/O error : failed to load "test/XInclude/docs/c.xml": No such file or directory
+I/O warning : failed to load "test/XInclude/docs/b.xml": No such file or directory
+I/O warning : failed to load "test/XInclude/docs/c.xml": No such file or directory

result/XInclude/fallback7.xml.err

@@ -1 @@
-I/O error : failed to load "test/XInclude/without-reader/404.xml": No such file or directory
+I/O warning : failed to load "test/XInclude/without-reader/404.xml": No such file or directory

result/XInclude/ns1.xml.err

@@ -1 @@
-I/O error : failed to load "test/XInclude/without-reader/b.xml": No such file or directory
+I/O warning : failed to load "test/XInclude/without-reader/b.xml": No such file or directory

result/schemas/import1_0_0.err

@@ -1 @@
-I/O error : failed to load "test/schemas/import1_0bc.imp": No such file or directory
+I/O warning : failed to load "test/schemas/import1_0bc.imp": No such file or directory
 ./test/schemas/import1_0.xsd:11: element import: Schemas parser warning : Element '{http://www.w3.org/2001/XMLSchema}import': Failed to locate a schema at location 'test/schemas/import1_0bc.imp'. Skipping the import.
 ./test/schemas/import1_0.xsd:16: element import: Schemas parser warning : Element '{http://www.w3.org/2001/XMLSchema}import': Skipping import of schema located at 'test/schemas/import1_0b.imp' for the namespace 'http://BAR', since this namespace was already imported with the schema located at 'test/schemas/import1_0.imp'.
 ./test/schemas/import1_0.xsd:26: element element: Schemas parser error : Element '{http://www.w3.org/2001/XMLSchema}element', attribute 'ref': The QName value '{http://BAR}bar.B' does not resolve to a(n) element declaration.