From d03a853bb0370d89552eceee59df1746da4a37f8 Mon Sep 17 00:00:00 2001
From: Mike Hommey <glandium@debian.org>
Date: Sun, 1 Mar 2009 10:53:23 +0100
Subject: Import upstream version 2.7.0

---
 xinclude.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'xinclude.c')

diff --git a/xinclude.c b/xinclude.c
index bb41180..ae449f8 100644
--- a/xinclude.c
+++ b/xinclude.c
@@ -1678,7 +1678,9 @@ loaded:
     /*
      * Do the xml:base fixup if needed
      */
-    if ((doc != NULL) && (URL != NULL) && (xmlStrchr(URL, (xmlChar) '/'))) {
+    if ((doc != NULL) && (URL != NULL) && (xmlStrchr(URL, (xmlChar) '/')) &&
+        (!(ctxt->parseFlags & XML_PARSE_NOBASEFIX)) &&
+	(!(doc->parseFlags & XML_PARSE_NOBASEFIX))) {
 	xmlNodePtr node;
 	xmlChar *base;
 	xmlChar *curBase;
-- 
cgit v1.2.3