programli
diff --git a/‎parserInternals.c‎
Lines changed: 6 additions & 14 deletions b/‎parserInternals.c‎
Lines changed: 6 additions & 14 deletions
diff --git a/‎python/tests/input_callback.py‎
Lines changed: 1 addition & 0 deletions b/‎python/tests/input_callback.py‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎xmlIO.c‎
Lines changed: 22 additions & 2 deletions b/‎xmlIO.c‎
Lines changed: 22 additions & 2 deletions
@@ -2122,22 +2122,14 @@ xmlNoNetExternalEntityLoader(const char *URL, const char *ID,
     if (resource != NULL) {
         if ((!xmlStrncasecmp(BAD_CAST resource, BAD_CAST "ftp://", 6)) ||
             (!xmlStrncasecmp(BAD_CAST resource, BAD_CAST "http://", 7))) {
-            int res;
-
+            xmlCtxtErrIO(ctxt, XML_IO_NETWORK_ATTEMPT,
+                         (const char *) resource);
             /*
-             * Forward this error to the generic error handler, not to
-             * the parser context for backward compatibility.
-             * Several downstream test suites rely on this behavior.
+             * Also forward the error directly to the global error
+             * handler, which the XML::LibXML test suite expects.
              */
-            res = __xmlRaiseError(NULL, xmlGenericError,
-                                  xmlGenericErrorContext, NULL, NULL,
-                                  XML_FROM_IO, XML_IO_NETWORK_ATTEMPT,
-                                  XML_ERR_ERROR, NULL, 0,
-                                  (const char *) resource, NULL, NULL, 0, 0,
-                                  "Attempt to load network entity %s",
-                                  resource);
-            if (res < 0)
-                xmlCtxtErrMemory(ctxt);
+            __xmlIOErr(XML_FROM_IO, XML_IO_NETWORK_ATTEMPT,
+                       (const char *) resource);
 	    if (resource != (xmlChar *) URL)
 		xmlFree(resource);
 	    return(NULL);
 
@@ -99,6 +99,7 @@ def my_ctx_error_cb(arg, msg, severity, reserved):
 run_test(desc="Loading entity with custom callback",
         docpath=startURL, catalog=None,
         exp_status="loaded", exp_err=[
+            (  3, 'failed to load "http://example.com/dtds/sample.dtd": Attempt to load network entity\n'),
             ( -1, "Attempt to load network entity http://example.com/dtds/sample.dtd"),
             (  4, "Entity 'sample.entity' not defined\n")
             ])
 
@@ -137,6 +137,10 @@ xmlIOErrMemory(void)
 int
 __xmlIOErr(int domain, int code, const char *extra)
 {
+    xmlStructuredErrorFunc schannel = NULL;
+    xmlGenericErrorFunc channel = NULL;
+    void *data = NULL;
+    const char *fmt, *arg;
     int res;
 
     if (code == 0) {
@@ -297,10 +301,26 @@ __xmlIOErr(int domain, int code, const char *extra)
         else code = XML_IO_UNKNOWN;
     }
 
-    res = __xmlRaiseError(NULL, NULL, NULL, NULL, NULL,
+    if (xmlStructuredError) {
+        schannel = xmlStructuredError;
+        data = xmlStructuredErrorContext;
+    } else {
+        channel = xmlGenericError;
+        data = xmlGenericErrorContext;
+    }
+
+    if (code == XML_IO_NETWORK_ATTEMPT) {
+        fmt = "Attempt to load network entity %s";
+        arg = extra;
+    } else {
+        fmt = "%s";
+        arg = xmlErrString(code);
+    }
+
+    res = __xmlRaiseError(schannel, channel, data, NULL, NULL,
                           domain, code, XML_ERR_ERROR, NULL, 0,
                           extra, NULL, NULL, 0, 0,
-                          "%s", xmlErrString(code));
+                          fmt, arg);
     if (res < 0) {
         xmlIOErrMemory();
         return(XML_ERR_NO_MEMORY);