commit 29614c7040e9fd01d2d342a96b62c18a11d0b499
author Daniel Veillard <veillard@src.gnome.org> Fri Nov 26 10:47:26 2004 +0000
committer Daniel Veillard <veillard@src.gnome.org> Fri Nov 26 10:47:26 2004 +0000
tree 624d9c05a8f519af975abfd11c41686c8bf418fa
parent 6bb3e86d2c0421d4b3b078ee27cd949865a0cb3f

make sure xmlCtxtReadFile and htmlCtxtReadFile go through the catalog

* HTMLparser.c parser.c: make sure xmlCtxtReadFile and htmlCtxtReadFile
  go through the catalog resolution.
* gentest.py testapi.c: fix a side effect wrning of the change
Daniel

HTMLparser.c

diff --git a/HTMLparser.c b/HTMLparser.c
index 4f84d7c..b87b01f 100644
--- a/HTMLparser.c
+++ b/HTMLparser.c
@@ -6038,7 +6038,7 @@
 
     htmlCtxtReset(ctxt);
 
-    stream = xmlNewInputFromFile(ctxt, filename);
+    stream = xmlLoadExternalEntity(filename, NULL, ctxt);
     if (stream == NULL) {
         return (NULL);
     }