diff options
| author | Aron Xu <aron@debian.org> | 2015-09-21 22:55:55 +0800 |
|---|---|---|
| committer | Aron Xu <aron@debian.org> | 2015-09-21 22:55:55 +0800 |
| commit | e85cf827a804d9abf4cbf48af6394c49331de322 (patch) | |
| tree | aab761b5168447ea51ad1a64c9e1594e48f84b12 /xinclude.c | |
| parent | 4b692ee8530176868e4832e30bdc4ba5bc145948 (diff) | |
| download | libxml2-e85cf827a804d9abf4cbf48af6394c49331de322.tar.gz | |
Revert "Merge tag 'upstream/2.9.1+dfsg1'"
This reverts commit 21ee18bdbc9a9d4500e12a1399d51c593b8b31d4, reversing
changes made to de338c1adfa336ddb5177ceb5c63bcd868a0ebc7.
Diffstat (limited to 'xinclude.c')
| -rw-r--r-- | xinclude.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -17,6 +17,7 @@ #include <libxml/tree.h> #include <libxml/parser.h> #include <libxml/uri.h> +#include <libxml/xpath.h> #include <libxml/xpointer.h> #include <libxml/parserInternals.h> #include <libxml/xmlerror.h> @@ -1207,6 +1208,7 @@ xmlXIncludeCopyXPointer(xmlXIncludeCtxtPtr ctxt, xmlDocPtr target, } break; } +#ifdef LIBXML_XPTR_ENABLED case XPATH_LOCATIONSET: { xmlLocationSetPtr set = (xmlLocationSetPtr) obj->user; if (set == NULL) @@ -1226,7 +1228,6 @@ xmlXIncludeCopyXPointer(xmlXIncludeCtxtPtr ctxt, xmlDocPtr target, } break; } -#ifdef LIBXML_XPTR_ENABLED case XPATH_RANGE: return(xmlXIncludeCopyRange(ctxt, target, source, obj)); #endif @@ -1687,7 +1688,7 @@ loaded: /* * Do the xml:base fixup if needed */ - if ((doc != NULL) && (URL != NULL) && (xmlStrchr(URL, (xmlChar) '/')) && + if ((doc != NULL) && (URL != NULL) && (!(ctxt->parseFlags & XML_PARSE_NOBASEFIX)) && (!(doc->parseFlags & XML_PARSE_NOBASEFIX))) { xmlNodePtr node; |