shaba/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2024-12-25 23:21:26 +03:00
Code

anothe XInclude user data propagation patch from Michael Day Daniel

Browse Source 
* xinclude.c: anothe XInclude user data propagation patch from
  Michael Day
Daniel
This commit is contained in:
Daniel Veillard 2006-12-04 09:21:28 +00:00
parent 1032ac4c5c
commit a658582e1a
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Mon Dec 4 10:27:01 CET 2006 Daniel Veillard <daniel@veillard.com>
* xinclude.c: anothe XInclude user data propagation patch from
Michael Day
Thu Nov 23 17:22:03 CET 2006 Daniel Veillard <daniel@veillard.com>
* HTMLparser.c: applied patch from Steven Rainwater to fix

5
xinclude.c
View File

@ -672,6 +672,10 @@ xmlXIncludeRecurseDoc(xmlXIncludeCtxtPtr ctxt, xmlDocPtr doc,
newctxt = xmlXIncludeNewContext(doc);
if (newctxt != NULL) {
/*
* Copy the private user data
*/
newctxt->_private = ctxt->_private;
/*
* Copy the existing document set
*/
@ -1930,6 +1934,7 @@ xmlXIncludeLoadFallback(xmlXIncludeCtxtPtr ctxt, xmlNodePtr fallback, int nr) {
newctxt = xmlXIncludeNewContext(ctxt->doc);
if (newctxt == NULL)
return (-1);
newctxt->_private = ctxt->_private;
newctxt->base = xmlStrdup(ctxt->base); /* Inherit the base from the existing context */
xmlXIncludeSetFlags(newctxt, ctxt->parseFlags);
ret = xmlXIncludeDoProcess(newctxt, ctxt->doc, fallback->children);