preparing release 2.6.1, updated and regenerated docs and APIs cleanup and

* configure.in NEWS doc/*: preparing release 2.6.1, updated and
  regenerated docs and APIs
* parser.c: cleanup and last change to fix #123105
Daniel

9 files changed, 120 insertions, 71 deletions

diff --git a/ChangeLog b/ChangeLog
index ea508f64..43975f73 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Oct 29 00:04:26 CET 2003 Daniel Veillard <daniel@veillard.com>
+
+	* configure.in NEWS doc/*: preparing release 2.6.1, updated and
+	  regenerated docs and APIs
+	* parser.c: cleanup and last change to fix #123105
+
 Tue Oct 28 23:02:29 CET 2003 Daniel Veillard <daniel@veillard.com>
 
 	* HTMLparser.c: Fix #124907 by simply backporting the same
diff --git a/NEWS b/NEWS
index 3b57c121..653a6f0c 100644
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,27 @@ to test those   - More testing on RelaxNG
   Schemas
 
 
+2.6.1: Oct 28 2003:
+   - Mostly bugfixes after the big 2.6.0 changes
+   - Unix compilation patches: libxml.m4 (Patrick Welche), warnings cleanup
+    (William Brack)
+   - Windows compilation patches (Joachim Bauch, Stephane Bidoul, Igor
+    Zlatkovic)
+   - xmlWriter bugfix (Alfred Mickautsch)
+   - chvalid.[ch]: couple of fixes from Stephane Bidoul
+   - context reset: error state reset, push parser reset (Graham Benett)
+   - context reuse: generate errors if file is not readable
+   - defaulted attributes for element coming from internal entities
+    (Stephane Bidoul)
+   - Python: tab and spaces mix (William Brack)
+   - Error handler could crash in DTD validation in 2.6.0
+   - xmlReader: do not use the document or element _private field
+   - testSAX.c: avoid a problem with some PIs (Massimo Morara)
+   - general bug fixes: mandatory encoding in text decl, serializing
+    Document Fragment nodes, xmlSearchNs 2.6.0 problem (Kasimier Buchcik),
+    XPath errors not reported,  slow HTML parsing of large documents.
+
+
 2.6.0: Oct 20 2003:
    - Major revision release: should be API and ABI compatible but got a lot
     of change
diff --git a/configure.in b/configure.in
index 24a93abe..2c39cacb 100644
--- a/configure.in
+++ b/configure.in
@@ -6,7 +6,7 @@ AC_CANONICAL_HOST
 
 LIBXML_MAJOR_VERSION=2
 LIBXML_MINOR_VERSION=6
-LIBXML_MICRO_VERSION=0
+LIBXML_MICRO_VERSION=1
 LIBXML_MICRO_VERSION_SUFFIX=
 LIBXML_VERSION=$LIBXML_MAJOR_VERSION.$LIBXML_MINOR_VERSION.$LIBXML_MICRO_VERSION$LIBXML_MICRO_VERSION_SUFFIX
 LIBXML_VERSION_INFO=`expr $LIBXML_MAJOR_VERSION + $LIBXML_MINOR_VERSION`:$LIBXML_MICRO_VERSION:$LIBXML_MINOR_VERSION
diff --git a/doc/libxml2-api.xml b/doc/libxml2-api.xml
index 82f9f0e3..1cb09d80 100644
--- a/doc/libxml2-api.xml
+++ b/doc/libxml2-api.xml
@@ -1191,6 +1191,7 @@
      <exports symbol='xmlCtxtReadIO'/>
      <exports symbol='xmlCtxtReadMemory'/>
      <exports symbol='xmlCtxtReset'/>
+     <exports symbol='xmlCtxtResetPush'/>
      <exports symbol='xmlCtxtUseOptions'/>
      <exports symbol='xmlExternalEntityLoader'/>
      <exports symbol='xmlFreeParserCtxt'/>
@@ -1927,6 +1928,7 @@
      <exports symbol='XML_ERR_LT_IN_ATTRIBUTE'/>
      <exports symbol='XML_ERR_LT_REQUIRED'/>
      <exports symbol='XML_ERR_MISPLACED_CDATA_END'/>
+     <exports symbol='XML_ERR_MISSING_ENCODING'/>
      <exports symbol='XML_ERR_MIXED_NOT_FINISHED'/>
      <exports symbol='XML_ERR_MIXED_NOT_STARTED'/>
      <exports symbol='XML_ERR_NAME_REQUIRED'/>
@@ -1987,6 +1989,7 @@
      <exports symbol='XML_FROM_SCHEMASP'/>
      <exports symbol='XML_FROM_SCHEMASV'/>
      <exports symbol='XML_FROM_TREE'/>
+     <exports symbol='XML_FROM_VALID'/>
      <exports symbol='XML_FROM_XINCLUDE'/>
      <exports symbol='XML_FROM_XPATH'/>
      <exports symbol='XML_FROM_XPOINTER'/>
@@ -3598,6 +3601,7 @@
     <enum name='XML_ERR_LT_IN_ATTRIBUTE' file='xmlerror' value='38' type='xmlParserErrors' info='38'/>
     <enum name='XML_ERR_LT_REQUIRED' file='xmlerror' value='72' type='xmlParserErrors' info='72'/>
     <enum name='XML_ERR_MISPLACED_CDATA_END' file='xmlerror' value='62' type='xmlParserErrors' info='62'/>
+    <enum name='XML_ERR_MISSING_ENCODING' file='xmlerror' value='101' type='xmlParserErrors' info='101'/>
     <enum name='XML_ERR_MIXED_NOT_FINISHED' file='xmlerror' value='53' type='xmlParserErrors' info='53'/>
     <enum name='XML_ERR_MIXED_NOT_STARTED' file='xmlerror' value='52' type='xmlParserErrors' info='52'/>
     <enum name='XML_ERR_NAME_REQUIRED' file='xmlerror' value='68' type='xmlParserErrors' info='68'/>
@@ -3645,7 +3649,7 @@
     <enum name='XML_FROM_C14N' file='xmlerror' value='21' type='xmlErrorDomain' info='The Canonicalization module'/>
     <enum name='XML_FROM_CATALOG' file='xmlerror' value='20' type='xmlErrorDomain' info='The Catalog module'/>
     <enum name='XML_FROM_DATATYPE' file='xmlerror' value='15' type='xmlErrorDomain' info='The W3C XML Schemas Datatype module'/>
-    <enum name='XML_FROM_DTD' file='xmlerror' value='4' type='xmlErrorDomain' info='The XML DTD validation'/>
+    <enum name='XML_FROM_DTD' file='xmlerror' value='4' type='xmlErrorDomain' info='The XML DTD validation with parser contex'/>
     <enum name='XML_FROM_FTP' file='xmlerror' value='9' type='xmlErrorDomain' info='The FTP module'/>
     <enum name='XML_FROM_HTML' file='xmlerror' value='5' type='xmlErrorDomain' info='The HTML parser'/>
     <enum name='XML_FROM_HTTP' file='xmlerror' value='10' type='xmlErrorDomain' info='The FTP module'/>
@@ -3661,10 +3665,11 @@
     <enum name='XML_FROM_SCHEMASP' file='xmlerror' value='16' type='xmlErrorDomain' info='The W3C XML Schemas parser module'/>
     <enum name='XML_FROM_SCHEMASV' file='xmlerror' value='17' type='xmlErrorDomain' info='The W3C XML Schemas validation module'/>
     <enum name='XML_FROM_TREE' file='xmlerror' value='2' type='xmlErrorDomain' info='The tree module'/>
+    <enum name='XML_FROM_VALID' file='xmlerror' value='23' type='xmlErrorDomain' info=' The XML DTD validation with valid context'/>
     <enum name='XML_FROM_XINCLUDE' file='xmlerror' value='11' type='xmlErrorDomain' info='The XInclude processing'/>
     <enum name='XML_FROM_XPATH' file='xmlerror' value='12' type='xmlErrorDomain' info='The XPath module'/>
     <enum name='XML_FROM_XPOINTER' file='xmlerror' value='13' type='xmlErrorDomain' info='The XPointer module'/>
-    <enum name='XML_FROM_XSLT' file='xmlerror' value='22' type='xmlErrorDomain' info=' The XSLT engine from libxslt'/>
+    <enum name='XML_FROM_XSLT' file='xmlerror' value='22' type='xmlErrorDomain' info='The XSLT engine from libxslt'/>
     <enum name='XML_FTP_ACCNT' file='xmlerror' value='2002' type='xmlParserErrors' info='2002'/>
     <enum name='XML_FTP_EPSV_ANSWER' file='xmlerror' value='2001' type='xmlParserErrors' info='2001'/>
     <enum name='XML_FTP_PASV_ANSWER' file='xmlerror' value='2000' type='xmlParserErrors'/>
@@ -6809,7 +6814,7 @@ actually an xmlCharEncoding'/>
       <info>Does a binary search of the range table to determine if char is valid</info>
       <return type='int' info='true if character valid, false otherwise'/>
       <arg name='val' type='unsigned int' info='character to be validated'/>
-      <arg name='rptr' type='xmlChRangeGroupPtr' info='pointer to range to be used to validate'/>
+      <arg name='rptr' type='const xmlChRangeGroupPtr' info='pointer to range to be used to validate'/>
     </function>
     <function name='xmlCharStrdup' file='parser'>
       <info>a strdup for char&apos;s to xmlChar&apos;s</info>
@@ -7113,6 +7118,15 @@ actually an xmlCharEncoding'/>
       <return type='void'/>
       <arg name='ctx' type='void *' info='an XML parser context'/>
     </function>
+    <function name='xmlCtxtResetPush' file='parser'>
+      <info>Reset a push parser context</info>
+      <return type='int' info='0 in case of success and 1 in case of error'/>
+      <arg name='ctxt' type='xmlParserCtxtPtr' info='an XML parser context'/>
+      <arg name='chunk' type='const char *' info='a pointer to an array of chars'/>
+      <arg name='size' type='int' info='number of chars in the array'/>
+      <arg name='filename' type='const char *' info='an optional file name or URI'/>
+      <arg name='encoding' type='const char *' info='the document encoding, or NULL'/>
+    </function>
     <function name='xmlCtxtUseOptions' file='parser'>
       <info>Applies the options to the parser context</info>
       <return type='int' info='0 in case of success, the set of unknown or unimplemented options in case of error.'/>
diff --git a/doc/libxml2.xsa b/doc/libxml2.xsa
index abc669cf..2e408b40 100644
--- a/doc/libxml2.xsa
+++ b/doc/libxml2.xsa
@@ -8,73 +8,27 @@
   </vendor>
   <product id="libxml2">
     <name>libxml2</name>
-    <version>2.6.0</version>
-    <last-release> Oct 20 2003</last-release>
+    <version>2.6.1</version>
+    <last-release> Oct 28 2003</last-release>
     <info-url>http://xmlsoft.org/</info-url>
-    <changes>   - Major revision release: should be API and ABI compatible but got a lot
-    of change
-   - Increased the library modularity, far more options can be stripped out,
-    a --with-minimum configuration will weight around 160KBytes
-   - Use per parser and per document dictionnary, allocate names and small
-    text nodes from the dictionnary
-   - Switch to a SAX2 like parser rewrote most of the XML parser core,
-    provides namespace resolution and defaulted attributes, minimize memory
-    allocations and copies, namespace checking and specific error handling,
-    immutable buffers, make predefined entities static structures, etc...
-   - rewrote all the error handling in the library, all errors can be
-    intercepted at a structured level, with precise information
-  available.
-   - New simpler and more generic XML and HTML parser APIs, allowing to
-    easilly modify the parsing options and reuse parser context for multiple
-    consecutive documents.
-   - Similar new APIs for the xmlReader, for options and reuse, provided new
-    functions to access content as const strings, use them for Python
-  bindings
-   - a  lot of other smaller API improvements: xmlStrPrintf (Aleksey Sanin),
-    Walker i.e. reader on a document tree based on Alfred Mickautsch code,
-    make room in nodes for line numbers, reference counting and future PSVI
-    extensions, generation of character ranges to be checked with faster
-    algorithm (William),  xmlParserMaxDepth (Crutcher Dunnavant), buffer
-    access
-   - New xmlWriter API provided by Alfred Mickautsch
-   - Schemas: base64 support by Anthony Carrico
-   - Parser&lt;-&gt;HTTP integration fix, proper processing of the Mime-Type
-    and charset informations if available.
-   - Relax-NG: bug fixes including the one reported by Martijn Faassen and
-    zeroOrMore, better error reporting.
-   - Python bindings (St&#xE9;phane Bidoul), never use stdout for errors
-  output
-   - Portability: all the headers have macros for export and calling
-    convention definitions (Igor Zlatkovic), VMS update (Craig A. Berry),
-    Windows: threads (Jesse Pelton), Borland compiler (Eric Zurcher,  Igor),
-    Mingw (Igor), typos (Mark Vakoc),  beta version (Stephane Bidoul),
-    warning cleanups on AIX and MIPS compilers (William Brack), BeOS (Marcin
-    'Shard' Konicki)
-   - Documentation fixes and README (William Brack), search fix (William),
-    tutorial updates (John Fleck), namespace docs (Stefan Kost)
-   - Bug fixes: xmlCleanupParser (Dave Beckett), threading uninitialized
-    mutexes, HTML doctype lowercase,  SAX/IO (William), compression detection
-    and restore (William), attribute declaration in DTDs (William), namespace
-    on attribute in HTML output (William), input filename (Rob Richards),
-    namespace DTD validation, xmlReplaceNode (Chris Ryland), I/O callbacks
-    (Markus Keim), CDATA serialization (Shaun McCance), xmlReader (Peter
-    Derr), high codepoint charref like &amp;#x10FFFF;, buffer access in push
-    mode (Justin Fletcher), TLS threads on Windows (Jesse Pelton), XPath bug
-    (William), xmlCleanupParser (Marc Liyanage), CDATA output (William), HTTP
-    error handling.
-   - xmllint options: --dtdvalidfpi for Tobias Reif, --sax1 for compat
-    testing,  --nodict for building without tree dictionnary, --nocdata to
-    replace CDATA by text, --nsclean to remove surperfluous  namespace
-    declarations
-   - added xml2-config --libtool-libs option from Kevin P. Fleming
-   - a lot of profiling and tuning of the code, speedup patch for
-    xmlSearchNs() by Luca Padovani. The xmlReader should do far less
-    allocation and it speed should get closer to SAX. Chris Anderson worked
-    on speeding and cleaning up repetitive checking code.
-   - cleanup of "make tests"
-   - libxml-2.0-uninstalled.pc from Malcolm Tredinnick
-   - deactivated the broken docBook SGML parser code and plugged the XML
-    parser instead.
+    <changes>   - Mostly bugfixes after the big 2.6.0 changes
+   - Unix compilation patches: libxml.m4 (Patrick Welche), warnings cleanup
+    (William Brack)
+   - Windows compilation patches (Joachim Bauch, Stephane Bidoul, Igor
+    Zlatkovic)
+   - xmlWriter bugfix (Alfred Mickautsch)
+   - chvalid.[ch]: couple of fixes from Stephane Bidoul
+   - context reset: error state reset, push parser reset (Graham Benett)
+   - context reuse: generate errors if file is not readable
+   - defaulted attributes for element coming from internal entities
+    (Stephane Bidoul)
+   - Python: tab and spaces mix (William Brack)
+   - Error handler could crash in DTD validation in 2.6.0
+   - xmlReader: do not use the document or element _private field
+   - testSAX.c: avoid a problem with some PIs (Massimo Morara)
+   - general bug fixes: mandatory encoding in text decl, serializing
+    Document Fragment nodes, xmlSearchNs 2.6.0 problem (Kasimier Buchcik),
+    XPath errors not reported,  slow HTML parsing of large documents.
 
 </changes>
   </product>
diff --git a/doc/news.html b/doc/news.html
index ce9367a5..9d791829 100644
--- a/doc/news.html
+++ b/doc/news.html
@@ -12,6 +12,24 @@ for a really accurate description</h3><p>Items not finished and worked on, get i
 to test those</p><ul><li>More testing on RelaxNG</li>
   <li>Finishing up <a href="http://www.w3.org/TR/xmlschema-1/">XML
   Schemas</a></li>
+</ul><h3>2.6.1: Oct 28 2003</h3><ul><li>Mostly bugfixes after the big 2.6.0 changes</li>
+  <li>Unix compilation patches: libxml.m4 (Patrick Welche), warnings cleanup
+    (William Brack)</li>
+  <li>Windows compilation patches (Joachim Bauch, Stephane Bidoul, Igor
+    Zlatkovic)</li>
+  <li>xmlWriter bugfix (Alfred Mickautsch)</li>
+  <li>chvalid.[ch]: couple of fixes from Stephane Bidoul</li>
+  <li>context reset: error state reset, push parser reset (Graham Benett)</li>
+  <li>context reuse: generate errors if file is not readable</li>
+  <li>defaulted attributes for element coming from internal entities
+    (Stephane Bidoul)</li>
+  <li>Python: tab and spaces mix (William Brack)</li>
+  <li>Error handler could crash in DTD validation in 2.6.0</li>
+  <li>xmlReader: do not use the document or element _private field</li>
+  <li>testSAX.c: avoid a problem with some PIs (Massimo Morara)</li>
+  <li>general bug fixes: mandatory encoding in text decl, serializing
+    Document Fragment nodes, xmlSearchNs 2.6.0 problem (Kasimier Buchcik),
+    XPath errors not reported,  slow HTML parsing of large documents.</li>
 </ul><h3>2.6.0: Oct 20 2003</h3><ul><li>Major revision release: should be API and ABI compatible but got a lot
     of change</li>
   <li>Increased the library modularity, far more options can be stripped out,
diff --git a/doc/xml.html b/doc/xml.html
index 07b545fe..d73ea1a7 100644
--- a/doc/xml.html
+++ b/doc/xml.html
@@ -661,6 +661,28 @@ to test those</p>
   Schemas</a></li>
 </ul>
 
+<h3>2.6.1: Oct 28 2003</h3>
+<ul>
+  <li>Mostly bugfixes after the big 2.6.0 changes</li>
+  <li>Unix compilation patches: libxml.m4 (Patrick Welche), warnings cleanup
+    (William Brack)</li>
+  <li>Windows compilation patches (Joachim Bauch, Stephane Bidoul, Igor
+    Zlatkovic)</li>
+  <li>xmlWriter bugfix (Alfred Mickautsch)</li>
+  <li>chvalid.[ch]: couple of fixes from Stephane Bidoul</li>
+  <li>context reset: error state reset, push parser reset (Graham Benett)</li>
+  <li>context reuse: generate errors if file is not readable</li>
+  <li>defaulted attributes for element coming from internal entities
+    (Stephane Bidoul)</li>
+  <li>Python: tab and spaces mix (William Brack)</li>
+  <li>Error handler could crash in DTD validation in 2.6.0</li>
+  <li>xmlReader: do not use the document or element _private field</li>
+  <li>testSAX.c: avoid a problem with some PIs (Massimo Morara)</li>
+  <li>general bug fixes: mandatory encoding in text decl, serializing
+    Document Fragment nodes, xmlSearchNs 2.6.0 problem (Kasimier Buchcik),
+    XPath errors not reported,  slow HTML parsing of large documents.</li>
+</ul>
+
 <h3>2.6.0: Oct 20 2003</h3>
 <ul>
   <li>Major revision release: should be API and ABI compatible but got a lot
diff --git a/parser.c b/parser.c
index 171c6233..ce6272ce 100644
--- a/parser.c
+++ b/parser.c
@@ -10642,6 +10642,11 @@ xmlParseCtxtExternalEntity(xmlParserCtxtPtr ctx, const xmlChar *URL,
     ctxt->vctxt.nodeNr = 0;
     ctxt->vctxt.nodeMax = 0;
     ctxt->vctxt.node = NULL;
+    if (ctxt->dict != NULL) xmlDictFree(ctxt->dict);
+    ctxt->dict = ctx->dict;
+    ctxt->dictNames = ctx->dictNames;
+    ctxt->attsDefault = ctx->attsDefault;
+    ctxt->attsSpecial = ctx->attsSpecial;
 
     xmlParseContent(ctxt);
    
@@ -10680,6 +10685,9 @@ xmlParseCtxtExternalEntity(xmlParserCtxtPtr ctx, const xmlChar *URL,
 	ret = 0;
     }
     ctxt->sax = oldsax;
+    ctxt->dict = NULL;
+    ctxt->attsDefault = NULL;
+    ctxt->attsSpecial = NULL;
     xmlFreeParserCtxt(ctxt);
     newDoc->intSubset = NULL;
     newDoc->extSubset = NULL;
@@ -12129,7 +12137,9 @@ xmlCtxtReset(xmlParserCtxtPtr ctxt)
  * @filename:  an optional file name or URI
  * @encoding:  the document encoding, or NULL
  *
- * Reset a parser context
+ * Reset a push parser context
+ *
+ * Returns 0 in case of success and 1 in case of error
  */
 int
 xmlCtxtResetPush(xmlParserCtxtPtr ctxt, const char *chunk,
@@ -12139,6 +12149,9 @@ xmlCtxtResetPush(xmlParserCtxtPtr ctxt, const char *chunk,
     xmlParserInputBufferPtr buf;
     xmlCharEncoding enc = XML_CHAR_ENCODING_NONE;
 
+    if (ctxt == NULL)
+        return(1);
+
     if ((encoding == NULL) && (chunk != NULL) && (size >= 4))
         enc = xmlDetectCharEncoding((const xmlChar *) chunk, size);
 
diff --git a/python/libxml2class.txt b/python/libxml2class.txt
index 863982c9..c45d8d70 100644
--- a/python/libxml2class.txt
+++ b/python/libxml2class.txt
@@ -850,6 +850,7 @@ Class parserCtxt(parserCtxtCore)
     ctxtReadFile()
     ctxtReadMemory()
     ctxtReset()
+    ctxtResetPush()
     ctxtUseOptions()
     initParserCtxt()
     parseChunk()