diff options
| author | Raphaël Hertzog <hertzog@debian.org> | 2015-08-25 21:55:55 +0200 |
|---|---|---|
| committer | Raphaël Hertzog <hertzog@debian.org> | 2015-08-25 21:55:55 +0200 |
| commit | 21ee18bdbc9a9d4500e12a1399d51c593b8b31d4 (patch) | |
| tree | 35c498d3ec731bcf7b90ce66bce68ecd54659250 /xinclude.c | |
| parent | de338c1adfa336ddb5177ceb5c63bcd868a0ebc7 (diff) | |
| parent | 7300193becde71a344c8ac0973dc290fa24d800d (diff) | |
| download | libxml2-21ee18bdbc9a9d4500e12a1399d51c593b8b31d4.tar.gz | |
Merge tag 'upstream/2.9.1+dfsg1'
Upstream version 2.9.1+dfsg1
Diffstat (limited to 'xinclude.c')
| -rw-r--r-- | xinclude.c | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -17,7 +17,6 @@ #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> @@ -1208,7 +1207,6 @@ xmlXIncludeCopyXPointer(xmlXIncludeCtxtPtr ctxt, xmlDocPtr target, } break; } -#ifdef LIBXML_XPTR_ENABLED case XPATH_LOCATIONSET: { xmlLocationSetPtr set = (xmlLocationSetPtr) obj->user; if (set == NULL) @@ -1228,6 +1226,7 @@ xmlXIncludeCopyXPointer(xmlXIncludeCtxtPtr ctxt, xmlDocPtr target, } break; } +#ifdef LIBXML_XPTR_ENABLED case XPATH_RANGE: return(xmlXIncludeCopyRange(ctxt, target, source, obj)); #endif @@ -1688,7 +1687,7 @@ loaded: /* * Do the xml:base fixup if needed */ - if ((doc != NULL) && (URL != NULL) && + if ((doc != NULL) && (URL != NULL) && (xmlStrchr(URL, (xmlChar) '/')) && (!(ctxt->parseFlags & XML_PARSE_NOBASEFIX)) && (!(doc->parseFlags & XML_PARSE_NOBASEFIX))) { xmlNodePtr node; |