diff --git a/ChangeLog b/ChangeLog index 1f976e85..dd3590aa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Aug 30 16:58:40 CEST 2008 Daniel Veillard + + * 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 * include/libxml/tree.h tree.c: make a new kind of buffer where diff --git a/configure.in b/configure.in index 0ce71531..65824f3a 100644 --- a/configure.in +++ b/configure.in @@ -4,8 +4,8 @@ AM_CONFIG_HEADER(config.h) 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 b71e8f1a..2e8417fe 100644 --- a/doc/APIchunk13.html +++ b/doc/APIchunk13.html @@ -404,7 +404,8 @@ A:link, A:visited, A:active { text-decoration: underline } xmlTextReaderGetRemainder
xmlTextReaderStandalone
difference
xmlXPathDifference
-
different
xmlACatalogAdd
+
different
_xmlBuffer
+xmlACatalogAdd
xmlBuildQName
xmlCatalogAdd
xmlNodeGetBase
diff --git a/doc/APIchunk19.html b/doc/APIchunk19.html index 30e12a56..eccf3d3c 100644 --- a/doc/APIchunk19.html +++ b/doc/APIchunk19.html @@ -240,7 +240,8 @@ A:link, A:visited, A:active { text-decoration: underline }
mixed-content
xmlParseElementMixedContentDecl
mmap
xmlParserInputBufferCreateStatic
mod
xmlXPathModValues
-
mode
_xmlParserCtxt
+
mode
_xmlBuffer
+_xmlParserCtxt
docbCreatePushParserCtxt
htmlCreatePushParserCtxt
xmlCreatePushParserCtxt
diff --git a/doc/APIfiles.html b/doc/APIfiles.html index 4dfc3b73..479d244a 100644 --- a/doc/APIfiles.html +++ b/doc/APIfiles.html @@ -1287,6 +1287,7 @@ A:link, A:visited, A:active { text-decoration: underline } XML_BUFFER_ALLOC_DOUBLEIT
XML_BUFFER_ALLOC_EXACT
XML_BUFFER_ALLOC_IMMUTABLE
+XML_BUFFER_ALLOC_IO
XML_CDATA_SECTION_NODE
XML_COMMENT_NODE
XML_DOCB_DOCUMENT_NODE
diff --git a/doc/APIsymbols.html b/doc/APIsymbols.html index ab0c8b64..952abf56 100644 --- a/doc/APIsymbols.html +++ b/doc/APIsymbols.html @@ -146,6 +146,7 @@ A:link, A:visited, A:active { text-decoration: underline } XML_BUFFER_ALLOC_DOUBLEIT
XML_BUFFER_ALLOC_EXACT
XML_BUFFER_ALLOC_IMMUTABLE
+XML_BUFFER_ALLOC_IO
XML_C14N_CREATE_CTXT
XML_C14N_CREATE_STACK
XML_C14N_INVALID_NODE
diff --git a/doc/devhelp/libxml2-tree.html b/doc/devhelp/libxml2-tree.html index 162c1ed2..188d43bd 100644 --- a/doc/devhelp/libxml2-tree.html +++ b/doc/devhelp/libxml2-tree.html @@ -370,14 +370,16 @@ void xmlFreeNsList (xmlBufferAllocationScheme alloc : The realloc method + xmlChar * contentIO : in IO mode we may have a different base } xmlBuffer;

Enum xmlBufferAllocationScheme

enum xmlBufferAllocationScheme {
-    XML_BUFFER_ALLOC_DOUBLEIT = 1
-    XML_BUFFER_ALLOC_EXACT = 2
-    XML_BUFFER_ALLOC_IMMUTABLE = 3
+    XML_BUFFER_ALLOC_DOUBLEIT = 1 /* double each time one need to grow */
+    XML_BUFFER_ALLOC_EXACT = 2 /* grow only to the minimal size */
+    XML_BUFFER_ALLOC_IMMUTABLE = 3 /* immutable buffer */
+    XML_BUFFER_ALLOC_IO = 4 /*  special allocation scheme used for I/O */
 };

diff --git a/doc/devhelp/libxml2.devhelp b/doc/devhelp/libxml2.devhelp index fcb510a0..1288b18a 100644 --- a/doc/devhelp/libxml2.devhelp +++ b/doc/devhelp/libxml2.devhelp @@ -339,6 +339,7 @@ + diff --git a/doc/html/libxml-tree.html b/doc/html/libxml-tree.html index 9e85690c..ab575669 100644 --- a/doc/html/libxml-tree.html +++ b/doc/html/libxml-tree.html @@ -278,10 +278,12 @@ A:link, A:visited, A:active { text-decoration: underline } unsigned int use : The buffer size used unsigned int size : The buffer size xmlBufferAllocationScheme alloc : The realloc method + xmlChar * contentIO : in IO mode we may have a different base }

Enum xmlBufferAllocationScheme

Enum xmlBufferAllocationScheme {
-    XML_BUFFER_ALLOC_DOUBLEIT = 1
-    XML_BUFFER_ALLOC_EXACT = 2
-    XML_BUFFER_ALLOC_IMMUTABLE = 3
+    XML_BUFFER_ALLOC_DOUBLEIT = 1 : double each time one need to grow
+    XML_BUFFER_ALLOC_EXACT = 2 : grow only to the minimal size
+    XML_BUFFER_ALLOC_IMMUTABLE = 3 : immutable buffer
+    XML_BUFFER_ALLOC_IO = 4 : special allocation scheme used for I/O
 }

Structure xmlDOMWrapCtxt

Structure xmlDOMWrapCtxt
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 14526bb8..98dc5687 100644
--- a/doc/libxml2-api.xml
+++ b/doc/libxml2-api.xml
@@ -1402,6 +1402,7 @@
      
      
      
+     
      
      
      
@@ -1444,7 +1445,7 @@
      
      
      
-     
+     
      
      
      
@@ -4598,9 +4599,10 @@
     
     
     
-    
-    
-    
+    
+    
+    
+    
     
     
     
@@ -5896,6 +5898,7 @@ if necessary or NULL'/>
       
       
       
+      
     
     
     
diff --git a/doc/libxml2-refs.xml b/doc/libxml2-refs.xml
index 170e1b19..31945166 100644
--- a/doc/libxml2-refs.xml
+++ b/doc/libxml2-refs.xml
@@ -140,6 +140,7 @@
     
     
     
+    
     
     
     
@@ -3676,6 +3677,7 @@
       
       
       
+      
       
       
       
@@ -11876,6 +11878,7 @@
       
       
       
+      
       
       
       
@@ -21380,6 +21383,7 @@
           
         
         
+          
           
           
           
@@ -24878,6 +24882,7 @@
           
         
         
+          
           
           
           
diff --git a/doc/libxml2.xsa b/doc/libxml2.xsa
index 9133b406..f93c2986 100644
--- a/doc/libxml2.xsa
+++ b/doc/libxml2.xsa
@@ -8,26 +8,42 @@
   
   
     libxml2
-    2.6.31
-     Jan 11 2008
+    2.6.32
+     Apr 8 2008
     http://xmlsoft.org/
-       - 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, 
+       - 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)
 
 
   
diff --git a/doc/news.html b/doc/news.html
index 4c89278d..a4126c0c 100644
--- a/doc/news.html
+++ b/doc/news.html
@@ -12,7 +12,31 @@ to help those
The change log describes the recents commits
-to the SVN code base.
Here is the list of public releases:
2.6.32: Apr 8 2008
  • Documentation: returning heap memory to kernel (Wolfram Sang),
+to the SVN code base.
    Here is the list of public releases:
    2.7.0: Aug 30 2008
    • Documentation: switch ChangeLog to UTF-8, improve mutithreads and
+      xmlParserCleanup docs
      • 
+  
    • 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)
+      
      • 
+  
    • 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
      • 
+  
    • 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
      • 
+  
    • 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
      • 
+
    2.6.32: Apr 8 2008
    • 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)
      • 
diff --git a/doc/xml.html b/doc/xml.html
index 4c89fd74..30398d26 100644
--- a/doc/xml.html
+++ b/doc/xml.html
@@ -727,6 +727,33 @@ to the SVN code base.<
 
 
      Here is the list of public releases:
      
 
+
      2.7.0: Aug 30 2008
      
+
        
+  
      • Documentation: switch ChangeLog to UTF-8, improve mutithreads and
+      xmlParserCleanup docs
        • 
+  
      • 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)
+      
        • 
+  
      • 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
        • 
+  
      • 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
        • 
+  
      • 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
        • 
+
      
 
      2.6.32: Apr 8 2008
      
 
        
   
      • Documentation: returning heap memory to kernel (Wolfram Sang),
diff --git a/parser.c b/parser.c
index 65af5252..42b28528 100644
--- a/parser.c
+++ b/parser.c
@@ -3777,7 +3777,6 @@ xmlParseAttValueComplex(xmlParserCtxtPtr ctxt, int *attlen, int normalize) {
 
 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 b54da493..723a4c90 100755
--- a/python/setup.py
+++ b/python/setup.py
@@ -226,7 +226,7 @@ else:
 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 befcb3dc..037f7e4f 100644
--- a/testapi.c
+++ b/testapi.c
@@ -1028,11 +1028,12 @@ static xmlAttributeType gen_xmlAttributeType(int no, int nr ATTRIBUTE_UNUSED) {
 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 466b62dc..f26748ee 100644
--- a/tree.c
+++ b/tree.c
@@ -6791,9 +6791,6 @@ xmlBufferEmpty(xmlBufferPtr buf) {
     } else {
         buf->content[0] = 0;
     }
-    if (buf->size > 10000000) {
-        xmlTreeErr(XML_ERR_INTERNAL_ERROR, NULL,"Buffer grew too much");
-    }
 }
 
 /**
@@ -6838,9 +6835,6 @@ xmlBufferShrink(xmlBufferPtr buf, unsigned int len) {
 	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 @@ xmlBufferGrow(xmlBufferPtr buf, unsigned int len) {
 	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 @@ xmlBufferResize(xmlBufferPtr buf, unsigned int size)
 	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 34448e0b..aa97c44b 100644
--- a/xmlIO.c
+++ b/xmlIO.c
@@ -3382,7 +3382,6 @@ xmlOutputBufferWriteEscape(xmlOutputBufferPtr out, const xmlChar *str,
 	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 03c0b02d..c90b171f 100644
--- a/xmlschemas.c
+++ b/xmlschemas.c
@@ -13306,7 +13306,6 @@ xmlSchemaIsUserDerivedFromBuiltInType(xmlSchemaTypePtr type, int valType)
 
     return (0);
 }
-#endif
 
 static xmlSchemaTypePtr
 xmlSchemaQueryBuiltInType(xmlSchemaTypePtr type)
@@ -13319,6 +13318,7 @@ xmlSchemaQueryBuiltInType(xmlSchemaTypePtr type)
 	return(type);
     return(xmlSchemaQueryBuiltInType(type->subtypes));
 }
+#endif
 
 /**
  * xmlSchemaGetPrimitiveType:
@@ -14594,6 +14594,7 @@ xmlSchemaGetParticleTotalRangeMin(xmlSchemaParticlePtr particle)
     }
 }
 
+#if 0
 /**
  * xmlSchemaGetParticleTotalRangeMax:
  * @particle: the particle
@@ -14653,6 +14654,7 @@ xmlSchemaGetParticleTotalRangeMax(xmlSchemaParticlePtr particle)
 	return (particle->maxOccurs * sum);
     }
 }
+#endif
 
 /**
  * xmlSchemaIsParticleEmptiable:
@@ -16948,6 +16950,7 @@ xmlSchemaCheckCOSParticleRestrict(xmlSchemaParserCtxtPtr ctxt,
     return (0);
 }
 
+#if 0
 /**
  * xmlSchemaCheckRCaseNSRecurseCheckCardinality:
  * @ctxt:  the schema parser context
@@ -17000,6 +17003,7 @@ xmlSchemaCheckRCaseNSRecurseCheckCardinality(xmlSchemaParserCtxtPtr ctxt,
 	return (1);
     return (0);
 }
+#endif
 
 /**
  * xmlSchemaCheckRCaseRecurse: