fixed bug #129489, propagation of parsing flags in entities. improved the
* parser.c: fixed bug #129489, propagation of parsing flags
in entities.
* parser.c xmlreader.c: improved the comments of parsing options
Daniel
diff --git a/parser.c b/parser.c
index fde9bdf..e6aefea 100644
--- a/parser.c
+++ b/parser.c
@@ -11059,6 +11059,8 @@
oldsax = ctxt->sax;
ctxt->sax = oldctxt->sax;
xmlDetectSAX2(ctxt);
+ ctxt->replaceEntities = oldctxt->replaceEntities;
+ ctxt->options = oldctxt->options;
ctxt->_private = oldctxt->_private;
if (oldctxt->myDoc == NULL) {
@@ -11438,7 +11440,7 @@
/**
* xmlCreateURLParserCtxt:
* @filename: the filename or URL
- * @options: a combination of xmlParserOption(s)
+ * @options: a combination of xmlParserOption
*
* Create a parser context for a file or URL content.
* Automatic support for ZLIB/Compress compressed document is provided
@@ -12324,7 +12326,7 @@
/**
* xmlCtxtUseOptions:
* @ctxt: an XML parser context
- * @options: a combination of xmlParserOption(s)
+ * @options: a combination of xmlParserOption
*
* Applies the options to the parser context
*
@@ -12420,7 +12422,7 @@
* @ctxt: an XML parser context
* @URL: the base URL to use for the document
* @encoding: the document encoding, or NULL
- * @options: a combination of xmlParserOption(s)
+ * @options: a combination of xmlParserOption
* @reuse: keep the context for reuse
*
* Common front-end for the xmlRead functions
@@ -12479,7 +12481,7 @@
* @cur: a pointer to a zero terminated string
* @URL: the base URL to use for the document
* @encoding: the document encoding, or NULL
- * @options: a combination of xmlParserOption(s)
+ * @options: a combination of xmlParserOption
*
* parse an XML in-memory document and build a tree.
*
@@ -12503,7 +12505,7 @@
* xmlReadFile:
* @filename: a file or URL
* @encoding: the document encoding, or NULL
- * @options: a combination of xmlParserOption(s)
+ * @options: a combination of xmlParserOption
*
* parse an XML file from the filesystem or the network.
*
@@ -12526,7 +12528,7 @@
* @size: the size of the array
* @URL: the base URL to use for the document
* @encoding: the document encoding, or NULL
- * @options: a combination of xmlParserOption(s)
+ * @options: a combination of xmlParserOption
*
* parse an XML in-memory document and build a tree.
*
@@ -12548,7 +12550,7 @@
* @fd: an open file descriptor
* @URL: the base URL to use for the document
* @encoding: the document encoding, or NULL
- * @options: a combination of xmlParserOption(s)
+ * @options: a combination of xmlParserOption
*
* parse an XML from a file descriptor and build a tree.
*
@@ -12589,7 +12591,7 @@
* @ioctx: an I/O handler
* @URL: the base URL to use for the document
* @encoding: the document encoding, or NULL
- * @options: a combination of xmlParserOption(s)
+ * @options: a combination of xmlParserOption
*
* parse an XML document from I/O functions and source and build a tree.
*
@@ -12631,7 +12633,7 @@
* @cur: a pointer to a zero terminated string
* @URL: the base URL to use for the document
* @encoding: the document encoding, or NULL
- * @options: a combination of xmlParserOption(s)
+ * @options: a combination of xmlParserOption
*
* parse an XML in-memory document and build a tree.
* This reuses the existing @ctxt parser context
@@ -12664,7 +12666,7 @@
* @ctxt: an XML parser context
* @filename: a file or URL
* @encoding: the document encoding, or NULL
- * @options: a combination of xmlParserOption(s)
+ * @options: a combination of xmlParserOption
*
* parse an XML file from the filesystem or the network.
* This reuses the existing @ctxt parser context
@@ -12699,7 +12701,7 @@
* @size: the size of the array
* @URL: the base URL to use for the document
* @encoding: the document encoding, or NULL
- * @options: a combination of xmlParserOption(s)
+ * @options: a combination of xmlParserOption
*
* parse an XML in-memory document and build a tree.
* This reuses the existing @ctxt parser context
@@ -12741,7 +12743,7 @@
* @fd: an open file descriptor
* @URL: the base URL to use for the document
* @encoding: the document encoding, or NULL
- * @options: a combination of xmlParserOption(s)
+ * @options: a combination of xmlParserOption
*
* parse an XML from a file descriptor and build a tree.
* This reuses the existing @ctxt parser context
@@ -12783,7 +12785,7 @@
* @ioctx: an I/O handler
* @URL: the base URL to use for the document
* @encoding: the document encoding, or NULL
- * @options: a combination of xmlParserOption(s)
+ * @options: a combination of xmlParserOption
*
* parse an XML document from I/O functions and source and build a tree.
* This reuses the existing @ctxt parser context