preparing 2.7.0 release remove some testing traces remove some warnings
* configure.in, doc/*: preparing 2.7.0 release
* tree.c: remove some testing traces
* parser.c xmlIO.c xmlschemas.c: remove some warnings
Daniel
svn path=/trunk/; revision=3788
diff --git a/ChangeLog b/ChangeLog
index 1f976e8..dd3590a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Aug 30 16:58:40 CEST 2008 Daniel Veillard <daniel@veillard.com>
+
+ * configure.in, doc/*: preparing 2.7.0 release
+ * tree.c: remove some testing traces
+ * parser.c xmlIO.c xmlschemas.c: remove some warnings
+
Sat Aug 30 14:50:16 CEST 2008 Daniel Veillard <daniel@veillard.com>
* include/libxml/tree.h tree.c: make a new kind of buffer where
diff --git a/configure.in b/configure.in
index 0ce7153..65824f3 100644
--- a/configure.in
+++ b/configure.in
@@ -4,8 +4,8 @@
AC_CANONICAL_HOST
LIBXML_MAJOR_VERSION=2
-LIBXML_MINOR_VERSION=6
-LIBXML_MICRO_VERSION=32
+LIBXML_MINOR_VERSION=7
+LIBXML_MICRO_VERSION=0
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/APIchunk13.html b/doc/APIchunk13.html
index b71e8f1..2e8417f 100644
--- a/doc/APIchunk13.html
+++ b/doc/APIchunk13.html
@@ -404,7 +404,8 @@
<a href="html/libxml-xmlreader.html#xmlTextReaderGetRemainder">xmlTextReaderGetRemainder</a><br />
<a href="html/libxml-xmlreader.html#xmlTextReaderStandalone">xmlTextReaderStandalone</a><br />
</dd><dt>difference</dt><dd><a href="html/libxml-xpathInternals.html#xmlXPathDifference">xmlXPathDifference</a><br />
-</dd><dt>different</dt><dd><a href="html/libxml-catalog.html#xmlACatalogAdd">xmlACatalogAdd</a><br />
+</dd><dt>different</dt><dd><a href="html/libxml-tree.html#_xmlBuffer">_xmlBuffer</a><br />
+<a href="html/libxml-catalog.html#xmlACatalogAdd">xmlACatalogAdd</a><br />
<a href="html/libxml-tree.html#xmlBuildQName">xmlBuildQName</a><br />
<a href="html/libxml-catalog.html#xmlCatalogAdd">xmlCatalogAdd</a><br />
<a href="html/libxml-tree.html#xmlNodeGetBase">xmlNodeGetBase</a><br />
diff --git a/doc/APIchunk19.html b/doc/APIchunk19.html
index 30e12a5..eccf3d3 100644
--- a/doc/APIchunk19.html
+++ b/doc/APIchunk19.html
@@ -240,7 +240,8 @@
</dd><dt>mixed-content</dt><dd><a href="html/libxml-parserInternals.html#xmlParseElementMixedContentDecl">xmlParseElementMixedContentDecl</a><br />
</dd><dt>mmap</dt><dd><a href="html/libxml-xmlIO.html#xmlParserInputBufferCreateStatic">xmlParserInputBufferCreateStatic</a><br />
</dd><dt>mod</dt><dd><a href="html/libxml-xpathInternals.html#xmlXPathModValues">xmlXPathModValues</a><br />
-</dd><dt>mode</dt><dd><a href="html/libxml-parser.html#_xmlParserCtxt">_xmlParserCtxt</a><br />
+</dd><dt>mode</dt><dd><a href="html/libxml-tree.html#_xmlBuffer">_xmlBuffer</a><br />
+<a href="html/libxml-parser.html#_xmlParserCtxt">_xmlParserCtxt</a><br />
<a href="html/libxml-DOCBparser.html#docbCreatePushParserCtxt">docbCreatePushParserCtxt</a><br />
<a href="html/libxml-HTMLparser.html#htmlCreatePushParserCtxt">htmlCreatePushParserCtxt</a><br />
<a href="html/libxml-parser.html#xmlCreatePushParserCtxt">xmlCreatePushParserCtxt</a><br />
diff --git a/doc/APIfiles.html b/doc/APIfiles.html
index 4dfc3b7..479d244 100644
--- a/doc/APIfiles.html
+++ b/doc/APIfiles.html
@@ -1287,6 +1287,7 @@
<a href="html/libxml-tree.html#XML_BUFFER_ALLOC_DOUBLEIT">XML_BUFFER_ALLOC_DOUBLEIT</a><br />
<a href="html/libxml-tree.html#XML_BUFFER_ALLOC_EXACT">XML_BUFFER_ALLOC_EXACT</a><br />
<a href="html/libxml-tree.html#XML_BUFFER_ALLOC_IMMUTABLE">XML_BUFFER_ALLOC_IMMUTABLE</a><br />
+<a href="html/libxml-tree.html#XML_BUFFER_ALLOC_IO">XML_BUFFER_ALLOC_IO</a><br />
<a href="html/libxml-tree.html#XML_CDATA_SECTION_NODE">XML_CDATA_SECTION_NODE</a><br />
<a href="html/libxml-tree.html#XML_COMMENT_NODE">XML_COMMENT_NODE</a><br />
<a href="html/libxml-tree.html#XML_DOCB_DOCUMENT_NODE">XML_DOCB_DOCUMENT_NODE</a><br />
diff --git a/doc/APIsymbols.html b/doc/APIsymbols.html
index ab0c8b6..952abf5 100644
--- a/doc/APIsymbols.html
+++ b/doc/APIsymbols.html
@@ -146,6 +146,7 @@
<a href="html/libxml-tree.html#XML_BUFFER_ALLOC_DOUBLEIT">XML_BUFFER_ALLOC_DOUBLEIT</a><br />
<a href="html/libxml-tree.html#XML_BUFFER_ALLOC_EXACT">XML_BUFFER_ALLOC_EXACT</a><br />
<a href="html/libxml-tree.html#XML_BUFFER_ALLOC_IMMUTABLE">XML_BUFFER_ALLOC_IMMUTABLE</a><br />
+<a href="html/libxml-tree.html#XML_BUFFER_ALLOC_IO">XML_BUFFER_ALLOC_IO</a><br />
<a href="html/libxml-xmlerror.html#XML_C14N_CREATE_CTXT">XML_C14N_CREATE_CTXT</a><br />
<a href="html/libxml-xmlerror.html#XML_C14N_CREATE_STACK">XML_C14N_CREATE_STACK</a><br />
<a href="html/libxml-xmlerror.html#XML_C14N_INVALID_NODE">XML_C14N_INVALID_NODE</a><br />
diff --git a/doc/devhelp/libxml2-tree.html b/doc/devhelp/libxml2-tree.html
index 162c1ed..188d43b 100644
--- a/doc/devhelp/libxml2-tree.html
+++ b/doc/devhelp/libxml2-tree.html
@@ -370,14 +370,16 @@
unsigned int use : The buffer size used
unsigned int size : The buffer size
<a href="libxml2-tree.html#xmlBufferAllocationScheme">xmlBufferAllocationScheme</a> alloc : The realloc method
+ <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * contentIO : in IO mode we may have a different base
} xmlBuffer;
</pre><p/>
</div>
<hr/>
<div class="refsect2" lang="en"><h3><a name="xmlBufferAllocationScheme">Enum </a>xmlBufferAllocationScheme</h3><pre class="programlisting">enum <a href="#xmlBufferAllocationScheme">xmlBufferAllocationScheme</a> {
- <a name="XML_BUFFER_ALLOC_DOUBLEIT">XML_BUFFER_ALLOC_DOUBLEIT</a> = 1
- <a name="XML_BUFFER_ALLOC_EXACT">XML_BUFFER_ALLOC_EXACT</a> = 2
- <a name="XML_BUFFER_ALLOC_IMMUTABLE">XML_BUFFER_ALLOC_IMMUTABLE</a> = 3
+ <a name="XML_BUFFER_ALLOC_DOUBLEIT">XML_BUFFER_ALLOC_DOUBLEIT</a> = 1 /* double each time one need to grow */
+ <a name="XML_BUFFER_ALLOC_EXACT">XML_BUFFER_ALLOC_EXACT</a> = 2 /* grow only to the minimal size */
+ <a name="XML_BUFFER_ALLOC_IMMUTABLE">XML_BUFFER_ALLOC_IMMUTABLE</a> = 3 /* immutable buffer */
+ <a name="XML_BUFFER_ALLOC_IO">XML_BUFFER_ALLOC_IO</a> = 4 /* special allocation scheme used for I/O */
};
</pre><p/>
</div>
diff --git a/doc/devhelp/libxml2.devhelp b/doc/devhelp/libxml2.devhelp
index fcb510a..1288b18 100644
--- a/doc/devhelp/libxml2.devhelp
+++ b/doc/devhelp/libxml2.devhelp
@@ -339,6 +339,7 @@
<function name="XML_BUFFER_ALLOC_DOUBLEIT" link="libxml2-tree.html#XML_BUFFER_ALLOC_DOUBLEIT"/>
<function name="XML_BUFFER_ALLOC_EXACT" link="libxml2-tree.html#XML_BUFFER_ALLOC_EXACT"/>
<function name="XML_BUFFER_ALLOC_IMMUTABLE" link="libxml2-tree.html#XML_BUFFER_ALLOC_IMMUTABLE"/>
+ <function name="XML_BUFFER_ALLOC_IO" link="libxml2-tree.html#XML_BUFFER_ALLOC_IO"/>
<function name="XML_C14N_CREATE_CTXT" link="libxml2-xmlerror.html#XML_C14N_CREATE_CTXT"/>
<function name="XML_C14N_CREATE_STACK" link="libxml2-xmlerror.html#XML_C14N_CREATE_STACK"/>
<function name="XML_C14N_INVALID_NODE" link="libxml2-xmlerror.html#XML_C14N_INVALID_NODE"/>
diff --git a/doc/html/libxml-tree.html b/doc/html/libxml-tree.html
index 9e85690..ab57566 100644
--- a/doc/html/libxml-tree.html
+++ b/doc/html/libxml-tree.html
@@ -278,10 +278,12 @@
unsigned int use : The buffer size used
unsigned int size : The buffer size
<a href="libxml-tree.html#xmlBufferAllocationScheme">xmlBufferAllocationScheme</a> alloc : The realloc method
+ <a href="libxml-xmlstring.html#xmlChar">xmlChar</a> * contentIO : in IO mode we may have a different base
}</pre><h3>Enum <a name="xmlBufferAllocationScheme" id="xmlBufferAllocationScheme">xmlBufferAllocationScheme</a></h3><pre class="programlisting">Enum xmlBufferAllocationScheme {
- <a name="XML_BUFFER_ALLOC_DOUBLEIT" id="XML_BUFFER_ALLOC_DOUBLEIT">XML_BUFFER_ALLOC_DOUBLEIT</a> = 1
- <a name="XML_BUFFER_ALLOC_EXACT" id="XML_BUFFER_ALLOC_EXACT">XML_BUFFER_ALLOC_EXACT</a> = 2
- <a name="XML_BUFFER_ALLOC_IMMUTABLE" id="XML_BUFFER_ALLOC_IMMUTABLE">XML_BUFFER_ALLOC_IMMUTABLE</a> = 3
+ <a name="XML_BUFFER_ALLOC_DOUBLEIT" id="XML_BUFFER_ALLOC_DOUBLEIT">XML_BUFFER_ALLOC_DOUBLEIT</a> = 1 : double each time one need to grow
+ <a name="XML_BUFFER_ALLOC_EXACT" id="XML_BUFFER_ALLOC_EXACT">XML_BUFFER_ALLOC_EXACT</a> = 2 : grow only to the minimal size
+ <a name="XML_BUFFER_ALLOC_IMMUTABLE" id="XML_BUFFER_ALLOC_IMMUTABLE">XML_BUFFER_ALLOC_IMMUTABLE</a> = 3 : immutable buffer
+ <a name="XML_BUFFER_ALLOC_IO" id="XML_BUFFER_ALLOC_IO">XML_BUFFER_ALLOC_IO</a> = 4 : special allocation scheme used for I/O
}
</pre><h3><a name="xmlDOMWrapCtxt" id="xmlDOMWrapCtxt">Structure xmlDOMWrapCtxt</a></h3><pre class="programlisting">Structure xmlDOMWrapCtxt<br />struct _xmlDOMWrapCtxt {
void * _private : * The type of this context, just in case
diff --git a/doc/libxml2-api.xml b/doc/libxml2-api.xml
index 14526bb..98dc568 100644
--- a/doc/libxml2-api.xml
+++ b/doc/libxml2-api.xml
@@ -1402,6 +1402,7 @@
<exports symbol='XML_BUFFER_ALLOC_DOUBLEIT' type='enum'/>
<exports symbol='XML_XINCLUDE_END' type='enum'/>
<exports symbol='XML_ATTRIBUTE_NODE' type='enum'/>
+ <exports symbol='XML_ATTRIBUTE_NMTOKENS' type='enum'/>
<exports symbol='XML_ATTRIBUTE_IDREF' type='enum'/>
<exports symbol='XML_ELEMENT_TYPE_ELEMENT' type='enum'/>
<exports symbol='XML_TEXT_NODE' type='enum'/>
@@ -1444,7 +1445,7 @@
<exports symbol='XML_ELEMENT_CONTENT_OR' type='enum'/>
<exports symbol='XML_ATTRIBUTE_NMTOKEN' type='enum'/>
<exports symbol='XML_PI_NODE' type='enum'/>
- <exports symbol='XML_ATTRIBUTE_NMTOKENS' type='enum'/>
+ <exports symbol='XML_BUFFER_ALLOC_IO' type='enum'/>
<exports symbol='XML_ENTITY_NODE' type='enum'/>
<exports symbol='XML_ATTRIBUTE_ENTITY' type='enum'/>
<exports symbol='XML_DOC_WELLFORMED' type='enum'/>
@@ -4598,9 +4599,10 @@
<enum name='XML_ATTRIBUTE_NONE' file='tree' value='1' type='xmlAttributeDefault'/>
<enum name='XML_ATTRIBUTE_NOTATION' file='tree' value='10' type='xmlAttributeType'/>
<enum name='XML_ATTRIBUTE_REQUIRED' file='tree' value='2' type='xmlAttributeDefault'/>
- <enum name='XML_BUFFER_ALLOC_DOUBLEIT' file='tree' value='1' type='xmlBufferAllocationScheme'/>
- <enum name='XML_BUFFER_ALLOC_EXACT' file='tree' value='2' type='xmlBufferAllocationScheme'/>
- <enum name='XML_BUFFER_ALLOC_IMMUTABLE' file='tree' value='3' type='xmlBufferAllocationScheme'/>
+ <enum name='XML_BUFFER_ALLOC_DOUBLEIT' file='tree' value='1' type='xmlBufferAllocationScheme' info='double each time one need to grow'/>
+ <enum name='XML_BUFFER_ALLOC_EXACT' file='tree' value='2' type='xmlBufferAllocationScheme' info='grow only to the minimal size'/>
+ <enum name='XML_BUFFER_ALLOC_IMMUTABLE' file='tree' value='3' type='xmlBufferAllocationScheme' info='immutable buffer'/>
+ <enum name='XML_BUFFER_ALLOC_IO' file='tree' value='4' type='xmlBufferAllocationScheme' info=' special allocation scheme used for I/O'/>
<enum name='XML_C14N_CREATE_CTXT' file='xmlerror' value='1950' type='xmlParserErrors'/>
<enum name='XML_C14N_CREATE_STACK' file='xmlerror' value='1952' type='xmlParserErrors' info='1952'/>
<enum name='XML_C14N_INVALID_NODE' file='xmlerror' value='1953' type='xmlParserErrors' info='1953'/>
@@ -5896,6 +5898,7 @@
<field name='use' type='unsigned int' info=' The buffer size used'/>
<field name='size' type='unsigned int' info=' The buffer size'/>
<field name='alloc' type='xmlBufferAllocationScheme' info=' The realloc method'/>
+ <field name='contentIO' type='xmlChar *' info=' in IO mode we may have a different base'/>
</struct>
<typedef name='xmlBufferAllocationScheme' file='tree' type='enum'/>
<typedef name='xmlBufferPtr' file='tree' type='xmlBuffer *'/>
diff --git a/doc/libxml2-refs.xml b/doc/libxml2-refs.xml
index 170e1b1..3194516 100644
--- a/doc/libxml2-refs.xml
+++ b/doc/libxml2-refs.xml
@@ -140,6 +140,7 @@
<reference name='XML_BUFFER_ALLOC_DOUBLEIT' href='html/libxml-tree.html#XML_BUFFER_ALLOC_DOUBLEIT'/>
<reference name='XML_BUFFER_ALLOC_EXACT' href='html/libxml-tree.html#XML_BUFFER_ALLOC_EXACT'/>
<reference name='XML_BUFFER_ALLOC_IMMUTABLE' href='html/libxml-tree.html#XML_BUFFER_ALLOC_IMMUTABLE'/>
+ <reference name='XML_BUFFER_ALLOC_IO' href='html/libxml-tree.html#XML_BUFFER_ALLOC_IO'/>
<reference name='XML_C14N_CREATE_CTXT' href='html/libxml-xmlerror.html#XML_C14N_CREATE_CTXT'/>
<reference name='XML_C14N_CREATE_STACK' href='html/libxml-xmlerror.html#XML_C14N_CREATE_STACK'/>
<reference name='XML_C14N_INVALID_NODE' href='html/libxml-xmlerror.html#XML_C14N_INVALID_NODE'/>
@@ -3676,6 +3677,7 @@
<ref name='XML_BUFFER_ALLOC_DOUBLEIT'/>
<ref name='XML_BUFFER_ALLOC_EXACT'/>
<ref name='XML_BUFFER_ALLOC_IMMUTABLE'/>
+ <ref name='XML_BUFFER_ALLOC_IO'/>
<ref name='XML_C14N_CREATE_CTXT'/>
<ref name='XML_C14N_CREATE_STACK'/>
<ref name='XML_C14N_INVALID_NODE'/>
@@ -11876,6 +11878,7 @@
<ref name='XML_BUFFER_ALLOC_DOUBLEIT'/>
<ref name='XML_BUFFER_ALLOC_EXACT'/>
<ref name='XML_BUFFER_ALLOC_IMMUTABLE'/>
+ <ref name='XML_BUFFER_ALLOC_IO'/>
<ref name='XML_CDATA_SECTION_NODE'/>
<ref name='XML_COMMENT_NODE'/>
<ref name='XML_DOCB_DOCUMENT_NODE'/>
@@ -21380,6 +21383,7 @@
<ref name='xmlXPathDifference'/>
</word>
<word name='different'>
+ <ref name='_xmlBuffer'/>
<ref name='xmlACatalogAdd'/>
<ref name='xmlBuildQName'/>
<ref name='xmlCatalogAdd'/>
@@ -24878,6 +24882,7 @@
<ref name='xmlXPathModValues'/>
</word>
<word name='mode'>
+ <ref name='_xmlBuffer'/>
<ref name='_xmlParserCtxt'/>
<ref name='docbCreatePushParserCtxt'/>
<ref name='htmlCreatePushParserCtxt'/>
diff --git a/doc/libxml2.xsa b/doc/libxml2.xsa
index 9133b40..f93c298 100644
--- a/doc/libxml2.xsa
+++ b/doc/libxml2.xsa
@@ -8,26 +8,42 @@
</vendor>
<product id="libxml2">
<name>libxml2</name>
- <version>2.6.31</version>
- <last-release> Jan 11 2008</last-release>
+ <version>2.6.32</version>
+ <last-release> Apr 8 2008</last-release>
<info-url>http://xmlsoft.org/</info-url>
- <changes> - Security fix: missing of checks in UTF-8 parsing
- - Bug fixes: regexp bug, dump attribute from XHTML document, fix
- xmlFree(NULL) to not crash in debug mode, Schematron parsing crash
- (Rob Richards), global lock free on Windows (Marc-Antoine Ruel),
- XSD crash due to double free (Rob Richards), indentation fix in
- xmlTextWriterFullEndElement (Felipe Pena), error in attribute type
- parsing if attribute redeclared, avoid crash in hash list scanner if
- deleting elements, column counter bug fix (Christian Schmidt),
- HTML embed element saving fix (Stefan Behnel), avoid -L/usr/lib
- output from xml2-config (Fred Crozat), avoid an xmllint crash
- (Stefan Kost), don't stop HTML parsing on out of range chars.
-
- - Code cleanup: fix open() call third argument, regexp cut'n paste
- copy error, unused variable in __xmlGlobalInitMutexLock (Hannes Eder),
- some make distcheck realted fixes (John Carr)
- - Improvements: HTTP Header: includes port number (William Brack),
- testURI --debug option,
+ <changes> - Documentation: returning heap memory to kernel (Wolfram Sang),
+ trying to clarify xmlCleanupParser() use, xmlXPathContext improvement
+ (Jack Jansen), improve the *Recover* functions documentation,
+ XmlNodeType doc link fix (Martijn Arts)
+ - Bug fixes: internal subset memory leak (Ashwin), avoid problem with
+ paths starting with // (Petr Sumbera), streaming XSD validation callback
+ patches (Ashwin), fix redirection on port other than 80 (William Brack),
+ SAX2 leak (Ashwin), XInclude fragment of own document (Chris Ryan),
+ regexp bug with '.' (Andrew Tosh), flush the writer at the end of the
+ document (Alfred Mickautsch), output I/O bug fix (William Brack),
+ writer CDATA output after a text node (Alex Khesin), UTF-16 encoding
+ detection (William Brack), fix handling of empty CDATA nodes for Safari
+ team, python binding problem with namespace nodes, improve HTML parsing
+ (Arnold Hendriks), regexp automata build bug, memory leak fix (Vasily
+ Chekalkin), XSD test crash, weird system parameter entity parsing problem,
+ allow save to file:///X:/ windows paths, various attribute normalisation
+ problems, externalSubsetSplit fix (Ashwin), attribute redefinition in
+ the DTD (Ashwin), fix in char ref parsing check (Alex Khesin), many
+ out of memory handling fixes (Ashwin), XPath out of memory handling fixes
+ (Alvaro Herrera), various realloc problems (Ashwin), UCS4 encoding
+ conversion buffer size (Christian Fruth), problems with EatName
+ functions on memory errors, BOM handling in external parsed entities
+ (Mark Rowe)
+ - Code cleanup: fix build under VS 2008 (David Wimsey), remove useless
+ mutex in xmlDict (Florent Guilian), Mingw32 compilation fix (Carlo
+ Bramini), Win and MacOS EOL cleanups (Florent Guiliani), iconv need
+ a const detection (Roumen Petrov), simplify xmlSetProp (Julien Charbon),
+ cross compilation fixes for Mingw (Roumen Petrov), SCO Openserver build
+ fix (Florent Guiliani), iconv uses const on Win32 (Rob Richards),
+ duplicate code removal (Ashwin), missing malloc test and error reports
+ (Ashwin), VMS makefile fix (Tycho Hilhorst)
+ - improvements: better plug of schematron in the normal error handling
+ (Tobias Minich)
</changes>
</product>
diff --git a/doc/news.html b/doc/news.html
index 4c89278..a4126c0 100644
--- a/doc/news.html
+++ b/doc/news.html
@@ -12,7 +12,31 @@
<li>Finishing up <a href="http://www.w3.org/TR/xmlschema-1/">XML
Schemas</a></li>
</ul><p>The <a href="ChangeLog.html">change log</a> describes the recents commits
-to the <a href="http://svn.gnome.org/viewcvs/libxml2/trunk/">SVN</a> code base.</p><p>Here is the list of public releases:</p><h3>2.6.32: Apr 8 2008</h3><ul><li>Documentation: returning heap memory to kernel (Wolfram Sang),
+to the <a href="http://svn.gnome.org/viewcvs/libxml2/trunk/">SVN</a> code base.</p><p>Here is the list of public releases:</p><h3>2.7.0: Aug 30 2008</h3><ul><li>Documentation: switch ChangeLog to UTF-8, improve mutithreads and
+ xmlParserCleanup docs</li>
+ <li>Portability fixes: Older Win32 platforms (Rob Richards), MSVC
+ porting fix (Rob Richards), Mac OS X regression tests (Sven Herzberg),
+ non GNUCC builds (Rob Richards), compilation on Haiku (Andreas Färber)
+ </li>
+ <li>Bug fixes: various realloc problems (Ashwin), potential double-free
+ (Ashwin), regexp crash, icrash with invalid whitespace facets (Rob
+ Richards), pattern fix when streaming (William Brack), various XML
+ parsing and validation fixes based on the W3C regression tests, reader
+ tree skipping function fix (Ashwin), Schemas regexps escaping fix
+ (Volker Grabsch), handling of entity push errors (Ashwin), fix a slowdown
+ when encoder cant serialize characters on output</li>
+ <li>Code cleanup: compilation fix without the reader, without the output
+ (Robert Schwebel), python whitespace (Martin), many space/tabs cleanups,
+ serious cleanup of the entity handling code</li>
+ <li>Improvement: switch parser to XML-1.0 5th edition, add parsing flags
+ for old versions, switch URI parsing to RFC 3986,
+ add xmlSchemaValidCtxtGetParserCtxt (Holger Kaelberer),
+ new hashing functions for dictionnaries (based on Stefan Behnel work),
+ improve handling of misplaced html/head/body in HTML parser, better
+ regression test tools and code coverage display, better algorithms
+ to detect various versions of the billion laughts attacks, make
+ arbitrary parser limits avoidable as a parser option</li>
+</ul><h3>2.6.32: Apr 8 2008</h3><ul><li>Documentation: returning heap memory to kernel (Wolfram Sang),
trying to clarify xmlCleanupParser() use, xmlXPathContext improvement
(Jack Jansen), improve the *Recover* functions documentation,
XmlNodeType doc link fix (Martijn Arts)</li>
diff --git a/doc/xml.html b/doc/xml.html
index 4c89fd7..30398d2 100644
--- a/doc/xml.html
+++ b/doc/xml.html
@@ -727,6 +727,33 @@
<p>Here is the list of public releases:</p>
+<h3>2.7.0: Aug 30 2008</h3>
+<ul>
+ <li>Documentation: switch ChangeLog to UTF-8, improve mutithreads and
+ xmlParserCleanup docs</li>
+ <li>Portability fixes: Older Win32 platforms (Rob Richards), MSVC
+ porting fix (Rob Richards), Mac OS X regression tests (Sven Herzberg),
+ non GNUCC builds (Rob Richards), compilation on Haiku (Andreas Färber)
+ </li>
+ <li>Bug fixes: various realloc problems (Ashwin), potential double-free
+ (Ashwin), regexp crash, icrash with invalid whitespace facets (Rob
+ Richards), pattern fix when streaming (William Brack), various XML
+ parsing and validation fixes based on the W3C regression tests, reader
+ tree skipping function fix (Ashwin), Schemas regexps escaping fix
+ (Volker Grabsch), handling of entity push errors (Ashwin), fix a slowdown
+ when encoder cant serialize characters on output</li>
+ <li>Code cleanup: compilation fix without the reader, without the output
+ (Robert Schwebel), python whitespace (Martin), many space/tabs cleanups,
+ serious cleanup of the entity handling code</li>
+ <li>Improvement: switch parser to XML-1.0 5th edition, add parsing flags
+ for old versions, switch URI parsing to RFC 3986,
+ add xmlSchemaValidCtxtGetParserCtxt (Holger Kaelberer),
+ new hashing functions for dictionnaries (based on Stefan Behnel work),
+ improve handling of misplaced html/head/body in HTML parser, better
+ regression test tools and code coverage display, better algorithms
+ to detect various versions of the billion laughts attacks, make
+ arbitrary parser limits avoidable as a parser option</li>
+</ul>
<h3>2.6.32: Apr 8 2008</h3>
<ul>
<li>Documentation: returning heap memory to kernel (Wolfram Sang),
diff --git a/parser.c b/parser.c
index 65af525..42b2852 100644
--- a/parser.c
+++ b/parser.c
@@ -3777,7 +3777,6 @@
mem_error:
xmlErrMemory(ctxt, NULL);
-int_error:
if (buf != NULL)
xmlFree(buf);
if (rep != NULL)
diff --git a/python/setup.py b/python/setup.py
index b54da49..723a4c9 100755
--- a/python/setup.py
+++ b/python/setup.py
@@ -226,7 +226,7 @@
setup (name = "libxml2-python",
# On *nix, the version number is created from setup.py.in
# On windows, it is set by configure.js
- version = "2.6.32",
+ version = "2.7.0",
description = descr,
author = "Daniel Veillard",
author_email = "veillard@redhat.com",
diff --git a/testapi.c b/testapi.c
index befcb3d..037f7e4 100644
--- a/testapi.c
+++ b/testapi.c
@@ -1028,11 +1028,12 @@
static void des_xmlAttributeType(int no ATTRIBUTE_UNUSED, xmlAttributeType val ATTRIBUTE_UNUSED, int nr ATTRIBUTE_UNUSED) {
}
-#define gen_nb_xmlBufferAllocationScheme 3
+#define gen_nb_xmlBufferAllocationScheme 4
static xmlBufferAllocationScheme gen_xmlBufferAllocationScheme(int no, int nr ATTRIBUTE_UNUSED) {
if (no == 1) return(XML_BUFFER_ALLOC_DOUBLEIT);
if (no == 2) return(XML_BUFFER_ALLOC_EXACT);
if (no == 3) return(XML_BUFFER_ALLOC_IMMUTABLE);
+ if (no == 4) return(XML_BUFFER_ALLOC_IO);
return(0);
}
diff --git a/tree.c b/tree.c
index 466b62d..f26748e 100644
--- a/tree.c
+++ b/tree.c
@@ -6791,9 +6791,6 @@
} else {
buf->content[0] = 0;
}
- if (buf->size > 10000000) {
- xmlTreeErr(XML_ERR_INTERNAL_ERROR, NULL,"Buffer grew too much");
- }
}
/**
@@ -6838,9 +6835,6 @@
memmove(buf->content, &buf->content[len], buf->use);
buf->content[buf->use] = 0;
}
- if (buf->size > 10000000) {
- xmlTreeErr(XML_ERR_INTERNAL_ERROR, NULL,"Buffer grew too much");
- }
return(len);
}
@@ -6895,9 +6889,6 @@
buf->content = newbuf;
}
buf->size = size;
- if (buf->size > 10000000) {
- xmlTreeErr(XML_ERR_INTERNAL_ERROR, NULL,"Buffer grew too much");
- }
return(buf->size - buf->use);
}
@@ -7053,9 +7044,6 @@
buf->content = rebuf;
}
buf->size = newSize;
- if (buf->size > 10000000) {
- xmlTreeErr(XML_ERR_INTERNAL_ERROR, NULL,"Buffer grew too much");
- }
return 1;
}
diff --git a/xmlIO.c b/xmlIO.c
index 34448e0..aa97c44 100644
--- a/xmlIO.c
+++ b/xmlIO.c
@@ -3382,7 +3382,6 @@
if ((nbchars < MINLEN) && (len <= 0))
goto done;
-flush:
if (out->writecallback) {
/*
* second write the stuff to the I/O channel
diff --git a/xmlschemas.c b/xmlschemas.c
index 03c0b02..c90b171 100644
--- a/xmlschemas.c
+++ b/xmlschemas.c
@@ -13306,7 +13306,6 @@
return (0);
}
-#endif
static xmlSchemaTypePtr
xmlSchemaQueryBuiltInType(xmlSchemaTypePtr type)
@@ -13319,6 +13318,7 @@
return(type);
return(xmlSchemaQueryBuiltInType(type->subtypes));
}
+#endif
/**
* xmlSchemaGetPrimitiveType:
@@ -14594,6 +14594,7 @@
}
}
+#if 0
/**
* xmlSchemaGetParticleTotalRangeMax:
* @particle: the particle
@@ -14653,6 +14654,7 @@
return (particle->maxOccurs * sum);
}
}
+#endif
/**
* xmlSchemaIsParticleEmptiable:
@@ -16948,6 +16950,7 @@
return (0);
}
+#if 0
/**
* xmlSchemaCheckRCaseNSRecurseCheckCardinality:
* @ctxt: the schema parser context
@@ -17000,6 +17003,7 @@
return (1);
return (0);
}
+#endif
/**
* xmlSchemaCheckRCaseRecurse: