commit 847332a0da596e84f00acc9d692e0e582b8b12ea
author Daniel Veillard <veillard@src.gnome.org> Sat Oct 18 11:29:40 2003 +0000
committer Daniel Veillard <veillard@src.gnome.org> Sat Oct 18 11:29:40 2003 +0000
tree 62ccf52f5fee0a4425e31cf676ef0b3cc86d9c89
parent fc8dc355dac40605e66a7e8722db5077f03076f3

starting work to fix the HTTP/XML parser integration. Daniel

* nanohttp.c xmlIO.c include/libxml/nanohttp.h: starting work
  to fix the HTTP/XML parser integration.
Daniel

xmlIO.c

diff --git a/xmlIO.c b/xmlIO.c
index 67d9c41..d8508cd 100644
--- a/xmlIO.c
+++ b/xmlIO.c
@@ -2108,6 +2108,7 @@
 xmlParserInputBufferPtr
 xmlParserInputBufferCreateFilename(const char *URI, xmlCharEncoding enc) {
     xmlParserInputBufferPtr ret;
+    int is_http = 0;
     int i = 0;
     void *context = NULL;
 
@@ -2125,8 +2126,11 @@
 	    if ((xmlInputCallbackTable[i].matchcallback != NULL) &&
 		(xmlInputCallbackTable[i].matchcallback(URI) != 0)) {
 		context = xmlInputCallbackTable[i].opencallback(URI);
-		if (context != NULL)
+		if (context != NULL) {
+		    if (xmlInputCallbackTable[i].opencallback == xmlIOHTTPOpen)
+		        is_http = 1;
 		    break;
+		}
 	    }
 	}
     }
@@ -3080,6 +3084,22 @@
 	xmlLoaderErr(ctxt, "failed to load external entity \"%s\"\n",
 	             (const char *) resource);
     }
+    if ((ret->buf != NULL) && (ret->buf->readcallback == xmlIOHTTPRead)) {
+        const char *encoding;
+	const char *redir;
+
+	encoding = xmlNanoHTTPEncoding(ret->buf->context);
+	redir = xmlNanoHTTPRedir(ret->buf->context);
+	if (redir != NULL) {
+	    if (ret->filename != NULL)
+	        xmlFree((xmlChar *) ret->filename);
+	    if (ret->directory != NULL) {
+	        xmlFree((xmlChar *) ret->directory);
+		ret->directory = NULL;
+            }
+	    ret->filename = (char *) xmlStrdup((const xmlChar *)redir);
+	}
+    }
     if ((resource != NULL) && (resource != (xmlChar *) URL))
 	xmlFree(resource);
     return(ret);