[xml/sgml-commit] r1221 - in /packages/libxml2: ./ trunk/ trunk/doc/ trunk/doc/devhelp/ trunk/doc/examples/ trunk/include/libxml/ trunk/python/ trunk/python/tests/
glandium at users.alioth.debian.org
glandium at users.alioth.debian.org
Sat Sep 13 07:33:34 UTC 2008
Author: glandium
Date: Sat Sep 13 07:33:34 2008
New Revision: 1221
URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=1221
Log:
r1324 at jigen: mh | 2008-01-19 18:06:56 +0100
New upstream release
Modified:
packages/libxml2/ (props changed)
packages/libxml2/trunk/ (props changed)
packages/libxml2/trunk/ChangeLog
packages/libxml2/trunk/HTMLparser.c
packages/libxml2/trunk/Makefile.am
packages/libxml2/trunk/Makefile.in
packages/libxml2/trunk/NEWS
packages/libxml2/trunk/aclocal.m4
packages/libxml2/trunk/check-relaxng-test-suite.py
packages/libxml2/trunk/check-relaxng-test-suite2.py
packages/libxml2/trunk/check-xsddata-test-suite.py
packages/libxml2/trunk/configure
packages/libxml2/trunk/configure.in
packages/libxml2/trunk/doc/devhelp/libxml2-valid.html
packages/libxml2/trunk/doc/examples/Makefile.am
packages/libxml2/trunk/doc/examples/Makefile.in
packages/libxml2/trunk/doc/libxml2-api.xml
packages/libxml2/trunk/doc/libxml2.xsa
packages/libxml2/trunk/doc/news.html
packages/libxml2/trunk/doc/xml.html
packages/libxml2/trunk/globals.c
packages/libxml2/trunk/hash.c
packages/libxml2/trunk/include/libxml/xmlversion.h
packages/libxml2/trunk/libxml.h
packages/libxml2/trunk/libxml2.spec
packages/libxml2/trunk/ltmain.sh
packages/libxml2/trunk/nanohttp.c
packages/libxml2/trunk/parser.c
packages/libxml2/trunk/parserInternals.c
packages/libxml2/trunk/pattern.c
packages/libxml2/trunk/python/Makefile.am
packages/libxml2/trunk/python/Makefile.in
packages/libxml2/trunk/python/libxml2-py.c
packages/libxml2/trunk/python/setup.py
packages/libxml2/trunk/python/tests/Makefile.am
packages/libxml2/trunk/python/tests/Makefile.in
packages/libxml2/trunk/schematron.c
packages/libxml2/trunk/testURI.c
packages/libxml2/trunk/threads.c
packages/libxml2/trunk/xml2-config.in
packages/libxml2/trunk/xmllint.c
packages/libxml2/trunk/xmlmemory.c
packages/libxml2/trunk/xmlregexp.c
packages/libxml2/trunk/xmlsave.c
packages/libxml2/trunk/xmlwriter.c
Propchange: packages/libxml2/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Sat Sep 13 07:33:34 2008
@@ -1,2 +1,2 @@
85a06573-1206-0410-a182-ce9117885d71:/local/libxml2:296
-a066b643-3b0a-0410-a6ba-ed4cca522822:/local/libxml2:1323
+a066b643-3b0a-0410-a6ba-ed4cca522822:/local/libxml2:1324
Propchange: packages/libxml2/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Sat Sep 13 07:33:34 2008
@@ -1,5 +1,5 @@
43dd4653-54d6-0310-8d79-ce393162d6a7:/packages/libxml2/branches/upstream/2.6.8:66
43dd4653-54d6-0310-8d79-ce393162d6a7:/packages/libxml2/branches/upstream/current:515
43dd4653-54d6-0310-8d79-ce393162d6a7:/packages/libxml2/trunk:597
-a066b643-3b0a-0410-a6ba-ed4cca522822:/local/libxml2/branches/upstream/current:1290
+a066b643-3b0a-0410-a6ba-ed4cca522822:/local/libxml2/branches/upstream/current:1322
a066b643-3b0a-0410-a6ba-ed4cca522822:/local/libxml2/trunk:974
Modified: packages/libxml2/trunk/ChangeLog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxml2/trunk/ChangeLog?rev=1221&op=diff
==============================================================================
--- packages/libxml2/trunk/ChangeLog (original)
+++ packages/libxml2/trunk/ChangeLog Sat Sep 13 07:33:34 2008
@@ -1,3 +1,110 @@
+Fri Jan 11 08:58:49 CET 2008 Daniel Veillard <daniel at veillard.com>
+
+ * parser.c: avoid a warning on 64bits introduced earlier
+ * parserInternals.c: make more checking on the UTF-8 input
+
+Fri Jan 11 15:37:05 CST 2008 Daniel Veillard <daniel at veillard.com>
+
+ * HTMLparser.c: avoid stopping parsing when encountering
+ out of range characters in an HTML file, report and
+ continue processing instead, should fix #472696
+
+Fri Jan 11 15:13:35 CST 2008 Daniel Veillard <daniel at veillard.com>
+
+ * check-relaxng-test-suite2.py check-relaxng-test-suite.py
+ Makefile.am python/tests/Makefile.am python/Makefile.am
+ check-xsddata-test-suite.py: patches from John Carr to
+ start cleaning up 'make diskcheck' problems c.f. #506228
+
+Fri Jan 11 14:48:40 CST 2008 Daniel Veillard <daniel at veillard.com>
+
+ * xmllint.c: apply fix from Stefan Kost to avoid a crash
+ in xmllint, fixes 504284
+
+Fri Jan 11 14:39:03 CST 2008 Daniel Veillard <daniel at veillard.com>
+
+ * xml2-config.in: apply patch from Fred Crozat to avoid
+ outputting -L/usr/lib from xml2-config, fixes #497012
+
+Fri Jan 11 14:18:09 CST 2008 Daniel Veillard <daniel at veillard.com>
+
+ * HTMLparser.c: fix definition for <embed> to avoid error
+ when saving back, patch from Stefan Behnel fixing 495213
+
+Fri Jan 11 14:06:09 CST 2008 Daniel Veillard <daniel at veillard.com>
+
+ * parser.c: applied patch from Christian Schmidt fixing a
+ column counter update problem, fixes #472696
+
+Fri Jan 11 13:22:14 CST 2008 Daniel Veillard <daniel at veillard.com>
+
+ * parser.c: handle a erroneous parsing of attributes in
+ case said attribute has been redeclared in the DTD with a
+ different type
+ * hash.c: fix the hash scanner to not crash if a first element
+ from the hash list is been removed in the callback
+
+Wed Jan 9 10:15:50 CST 2008 Daniel Veillard <daniel at veillard.com>
+
+ * xmlwriter.c: fix indentation in xmlTextWriterFullEndElement,
+ as raised by Felipe Pena, should fix #508156
+
+Tue Dec 6 11:07:42 CET 2007 Rob Richards <rrichards at ctindustries.net>
+
+ * pattern.c: fix crash from double free of name for bug #501760
+
+Fri Nov 23 11:47:48 CET 2007 Daniel Veillard <daniel at veillard.com>
+
+ * threads.c: remove unused variable in __xmlGlobalInitMutexLock
+ reported by Hannes Eder
+
+Mon Nov 19 18:39:26 CET 2007 Daniel Veillard <daniel at veillard.com>
+
+ * xmlregexp.c: remove a cut-and-paste copy error
+
+Fri Nov 16 11:55:36 CET 2007 Rob Richards <rrichards at ctindustries.net>
+
+ * globals.c threads.c include/libxml/threads.h:
+ __xmlGlobalInitMutexDestroy() will free global_init_lock on Win32.
+ Patch from Marc-Antoine Ruel.
+
+Tue Nov 13 21:26:27 CET 2007 Rob Richards <rrichards at ctindustries.net>
+
+ * schematron.c: fix crash/leaks from xmlSchematronParse due to improper
+ schema document ownership for bug #495215
+
+Tue Oct 30 21:24:55 CET 2007 Daniel Veillard <daniel at veillard.com>
+
+ * xmlmemory.c: xmlFree(NULL) should not crash in debug mode
+ should fix #491651
+
+Tue Oct 16 13:58:41 CEST 2007 Daniel Veillard <daniel at veillard.com>
+
+ * testURI.c: add a debug option printing all the fields within
+ the parsed URI structure
+
+Wed Oct 10 10:25:52 CEST 2007 Daniel Veillard <daniel at veillard.com>
+
+ * xmlsave.c: fix to avoid a crash when dumping an attribute from
+ an XHTML document, patch contributed to fix #485298
+
+Tue Aug 28 19:32:28 CEST 2007 Daniel Veillard <daniel at veillard.com>
+
+ * xmlregexp.c: another nasty regexp case fixed.
+ * test/regexp/ranges2 result/regexp/ranges2: added to regression
+ suite
+
+Fri Aug 24 10:58:58 HKT 2007 William Brack <wbrack at mmm.com.hk>
+
+ * nanohttp.c: Enhanced to include port number (if not == 80) on the
+ "Header:" URL (bug #469681).
+ * xmlregexp.c: Fixed a typo causing a warning message.
+
+Thu Aug 23 22:48:20 CEST 2007 Daniel Veillard <daniel at veillard.com>
+
+ * nanohttp.c: fix an open() call with creation without 3rd argument
+ hopefully that interface is never used.
+
Thu Aug 23 17:00:49 CEST 2007 Daniel Veillard <daniel at veillard.com>
* configure.in doc/*: preparing release of 2.6.30
Modified: packages/libxml2/trunk/HTMLparser.c
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxml2/trunk/HTMLparser.c?rev=1221&op=diff
==============================================================================
--- packages/libxml2/trunk/HTMLparser.c (original)
+++ packages/libxml2/trunk/HTMLparser.c Sat Sep 13 07:33:34 2008
@@ -711,7 +711,7 @@
{ "em", 0, 3, 0, 0, 0, 0, 1, "emphasis",
DECL html_inline, NULL, DECL html_attrs, NULL, NULL
},
-{ "embed", 0, 1, 2, 0, 1, 1, 1, "generic embedded object ",
+{ "embed", 0, 1, 0, 0, 1, 1, 1, "generic embedded object ",
EMPTY, NULL, DECL embed_attrs, NULL, NULL
},
{ "fieldset", 0, 0, 0, 0, 0, 0, 0, "form control group ",
@@ -2772,8 +2772,13 @@
cur = CUR_CHAR(l);
while (((cur != '<') || (ctxt->token == '<')) &&
((cur != '&') || (ctxt->token == '&')) &&
- (IS_CHAR(cur))) {
- COPY_BUF(l,buf,nbchar,cur);
+ (cur != 0)) {
+ if (!(IS_CHAR(cur))) {
+ htmlParseErrInt(ctxt, XML_ERR_INVALID_CHAR,
+ "Invalid char in CDATA 0x%X\n", cur);
+ } else {
+ COPY_BUF(l,buf,nbchar,cur);
+ }
if (nbchar >= HTML_PARSER_BIG_BUFFER_SIZE) {
/*
* Ok the segment is to be consumed as chars.
Modified: packages/libxml2/trunk/Makefile.am
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxml2/trunk/Makefile.am?rev=1221&op=diff
==============================================================================
--- packages/libxml2/trunk/Makefile.am (original)
+++ packages/libxml2/trunk/Makefile.am Sat Sep 13 07:33:34 2008
@@ -856,23 +856,23 @@
rm result.$$name ; \
fi ; fi ; done)
-$(srcdir)/dba100000.xml: dbgenattr.pl
+dba100000.xml: dbgenattr.pl
@echo "## generating dba100000.xml"
- @($(PERL) $(top_srcdir)/dbgenattr.pl 100000 > $(srcdir)/dba100000.xml)
-
-Timingtests: xmllint$(EXEEXT) $(srcdir)/dba100000.xml
+ @($(PERL) $(top_srcdir)/dbgenattr.pl 100000 > dba100000.xml)
+
+Timingtests: xmllint$(EXEEXT) dba100000.xml
@echo "## Timing tests to try to detect performance"
@echo "## as well a memory usage breakage when streaming"
@echo "## 1/ using the file interface"
@echo "## 2/ using the memory interface"
@echo "## 3/ repeated DOM parsing"
@echo "## 4/ repeated DOM validation"
- -@($(top_builddir)/xmllint --stream --timing $(srcdir)/dba100000.xml; \
+ -@($(top_builddir)/xmllint --stream --timing dba100000.xml; \
MEM=`cat .memdump | grep "MEMORY ALLOCATED" | awk '{ print $$7}'`;\
if [ "$$MEM" != "" ] ; then echo Using $$MEM bytes ; fi ; \
grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\
exit 0)
- -@($(top_builddir)/xmllint --stream --timing --memory $(srcdir)/dba100000.xml; \
+ -@($(top_builddir)/xmllint --stream --timing --memory dba100000.xml; \
MEM=`cat .memdump | grep "MEMORY ALLOCATED" | awk '{ print $$7}'`;\
if [ "$$MEM" != "" ] ; then echo Using $$MEM bytes ; fi ; \
grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\
@@ -1177,6 +1177,15 @@
- at INSTALL@ -m 0644 $(srcdir)/testHTML.c $(DESTDIR)$(EXAMPLES_DIR)
- at INSTALL@ -m 0644 $(srcdir)/testXPath.c $(DESTDIR)$(EXAMPLES_DIR)
+uninstall-local:
+ rm $(DESTDIR)$(EXAMPLES_DIR)/testXPath.c
+ rm $(DESTDIR)$(EXAMPLES_DIR)/testHTML.c
+ rm $(DESTDIR)$(EXAMPLES_DIR)/testSAX.c
+ rm $(DESTDIR)$(EXAMPLES_DIR)/xmllint.c
+ rm -rf $(DESTDIR)$(EXAMPLES_DIR)
+ rm $(DESTDIR)$(BASE_DIR)/$(DOC_MODULE)/Copyright
+ rm -rf $(DESTDIR)$(BASE_DIR)/$(DOC_MODULE)
+
tst: tst.c
$(CC) $(CFLAGS) -Iinclude -o tst tst.c .libs/libxml2.a -lpthread -lm -lz
Modified: packages/libxml2/trunk/Makefile.in
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxml2/trunk/Makefile.in?rev=1221&op=diff
==============================================================================
--- packages/libxml2/trunk/Makefile.in (original)
+++ packages/libxml2/trunk/Makefile.in Sat Sep 13 07:33:34 2008
@@ -1255,8 +1255,8 @@
uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
uninstall-confexecDATA uninstall-info-am \
- uninstall-libLTLIBRARIES uninstall-m4dataDATA uninstall-man \
- uninstall-pkgconfigDATA
+ uninstall-libLTLIBRARIES uninstall-local uninstall-m4dataDATA \
+ uninstall-man uninstall-pkgconfigDATA
uninstall-info: uninstall-info-recursive
@@ -1283,8 +1283,9 @@
pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
uninstall-binPROGRAMS uninstall-binSCRIPTS \
uninstall-confexecDATA uninstall-info-am \
- uninstall-libLTLIBRARIES uninstall-m4dataDATA uninstall-man \
- uninstall-man1 uninstall-man3 uninstall-pkgconfigDATA
+ uninstall-libLTLIBRARIES uninstall-local uninstall-m4dataDATA \
+ uninstall-man uninstall-man1 uninstall-man3 \
+ uninstall-pkgconfigDATA
# that one forces the rebuild when "make rebuild" is run on doc/
@@ -2004,23 +2005,23 @@
rm result.$$name ; \
fi ; fi ; done)
-$(srcdir)/dba100000.xml: dbgenattr.pl
+dba100000.xml: dbgenattr.pl
@echo "## generating dba100000.xml"
- @($(PERL) $(top_srcdir)/dbgenattr.pl 100000 > $(srcdir)/dba100000.xml)
-
-Timingtests: xmllint$(EXEEXT) $(srcdir)/dba100000.xml
+ @($(PERL) $(top_srcdir)/dbgenattr.pl 100000 > dba100000.xml)
+
+Timingtests: xmllint$(EXEEXT) dba100000.xml
@echo "## Timing tests to try to detect performance"
@echo "## as well a memory usage breakage when streaming"
@echo "## 1/ using the file interface"
@echo "## 2/ using the memory interface"
@echo "## 3/ repeated DOM parsing"
@echo "## 4/ repeated DOM validation"
- -@($(top_builddir)/xmllint --stream --timing $(srcdir)/dba100000.xml; \
+ -@($(top_builddir)/xmllint --stream --timing dba100000.xml; \
MEM=`cat .memdump | grep "MEMORY ALLOCATED" | awk '{ print $$7}'`;\
if [ "$$MEM" != "" ] ; then echo Using $$MEM bytes ; fi ; \
grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\
exit 0)
- -@($(top_builddir)/xmllint --stream --timing --memory $(srcdir)/dba100000.xml; \
+ -@($(top_builddir)/xmllint --stream --timing --memory dba100000.xml; \
MEM=`cat .memdump | grep "MEMORY ALLOCATED" | awk '{ print $$7}'`;\
if [ "$$MEM" != "" ] ; then echo Using $$MEM bytes ; fi ; \
grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\
@@ -2290,6 +2291,15 @@
- at INSTALL@ -m 0644 $(srcdir)/testHTML.c $(DESTDIR)$(EXAMPLES_DIR)
- at INSTALL@ -m 0644 $(srcdir)/testXPath.c $(DESTDIR)$(EXAMPLES_DIR)
+uninstall-local:
+ rm $(DESTDIR)$(EXAMPLES_DIR)/testXPath.c
+ rm $(DESTDIR)$(EXAMPLES_DIR)/testHTML.c
+ rm $(DESTDIR)$(EXAMPLES_DIR)/testSAX.c
+ rm $(DESTDIR)$(EXAMPLES_DIR)/xmllint.c
+ rm -rf $(DESTDIR)$(EXAMPLES_DIR)
+ rm $(DESTDIR)$(BASE_DIR)/$(DOC_MODULE)/Copyright
+ rm -rf $(DESTDIR)$(BASE_DIR)/$(DOC_MODULE)
+
tst: tst.c
$(CC) $(CFLAGS) -Iinclude -o tst tst.c .libs/libxml2.a -lpthread -lm -lz
Modified: packages/libxml2/trunk/NEWS
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxml2/trunk/NEWS?rev=1221&op=diff
==============================================================================
--- packages/libxml2/trunk/NEWS (original)
+++ packages/libxml2/trunk/NEWS Sat Sep 13 07:33:34 2008
@@ -15,6 +15,39 @@
to the SVN at
http://svn.gnome.org/viewcvs/libxml2/trunk/
code base.Here is the list of public releases:
+2.6.31: Jan 11 2008:
+ - 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,
+
+
+2.6.30: Aug 23 2007:
+ - Portability: Solaris crash on error handling, windows path fixes
+ (Roland Schwarz and Rob Richards), mingw build (Roland Schwarz)
+ - Bugfixes: xmlXPathNodeSetSort problem (William Brack), leak when
+ reusing a writer for a new document (Dodji Seketeli), Schemas
+ xsi:nil handling patch (Frank Gross), relative URI build problem
+ (Patrik Fimml), crash in xmlDocFormatDump, invalid char in comment
+ detection bug, fix disparity with xmlSAXUserParseMemory, automata
+ generation for complex regexp counts problems, Schemas IDC import
+ problems (Frank Gross), xpath predicate evailation error handling
+ (William Brack)
+
+
2.6.29: Jun 12 2007:
- Portability: patches from Andreas Stricke for WinCEi,
fix compilation warnings (William Brack), avoid warnings on Apple OS/X
Modified: packages/libxml2/trunk/aclocal.m4
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxml2/trunk/aclocal.m4?rev=1221&op=diff
==============================================================================
--- packages/libxml2/trunk/aclocal.m4 (original)
+++ packages/libxml2/trunk/aclocal.m4 Sat Sep 13 07:33:34 2008
@@ -13,7 +13,7 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-# serial 51 Debian 1.5.24-1 AC_PROG_LIBTOOL
+# serial 51 Debian 1.5.24-2 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
Modified: packages/libxml2/trunk/check-relaxng-test-suite.py
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxml2/trunk/check-relaxng-test-suite.py?rev=1221&op=diff
==============================================================================
--- packages/libxml2/trunk/check-relaxng-test-suite.py (original)
+++ packages/libxml2/trunk/check-relaxng-test-suite.py Sat Sep 13 07:33:34 2008
@@ -16,7 +16,7 @@
#
# the testsuite description
#
-CONF="test/relaxng/OASIS/spectest.xml"
+CONF=os.path.join(os.path.dirname(__file__), "test/relaxng/OASIS/spectest.xml")
LOG="check-relaxng-test-suite.log"
RES="relaxng-test-results.xml"
Modified: packages/libxml2/trunk/check-relaxng-test-suite2.py
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxml2/trunk/check-relaxng-test-suite2.py?rev=1221&op=diff
==============================================================================
--- packages/libxml2/trunk/check-relaxng-test-suite2.py (original)
+++ packages/libxml2/trunk/check-relaxng-test-suite2.py Sat Sep 13 07:33:34 2008
@@ -15,7 +15,7 @@
#
# the testsuite description
#
-CONF="test/relaxng/testsuite.xml"
+CONF=os.path.join(os.path.dirname(__file__), "test/relaxng/testsuite.xml")
LOG="check-relaxng-test-suite2.log"
log = open(LOG, "w")
Modified: packages/libxml2/trunk/check-xsddata-test-suite.py
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxml2/trunk/check-xsddata-test-suite.py?rev=1221&op=diff
==============================================================================
--- packages/libxml2/trunk/check-xsddata-test-suite.py (original)
+++ packages/libxml2/trunk/check-xsddata-test-suite.py Sat Sep 13 07:33:34 2008
@@ -16,7 +16,7 @@
#
# the testsuite description
#
-CONF="test/xsdtest/xsdtestsuite.xml"
+CONF=os.path.join(os.path.dirname(__file__), "test/xsdtest/xsdtestsuite.xml")
LOG="check-xsddata-test-suite.log"
log = open(LOG, "w")
Modified: packages/libxml2/trunk/configure
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxml2/trunk/configure?rev=1221&op=diff
==============================================================================
--- packages/libxml2/trunk/configure (original)
+++ packages/libxml2/trunk/configure Sat Sep 13 07:33:34 2008
@@ -2194,7 +2194,7 @@
LIBXML_MAJOR_VERSION=2
LIBXML_MINOR_VERSION=6
-LIBXML_MICRO_VERSION=30
+LIBXML_MICRO_VERSION=31
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
Modified: packages/libxml2/trunk/configure.in
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxml2/trunk/configure.in?rev=1221&op=diff
==============================================================================
--- packages/libxml2/trunk/configure.in (original)
+++ packages/libxml2/trunk/configure.in Sat Sep 13 07:33:34 2008
@@ -5,7 +5,7 @@
LIBXML_MAJOR_VERSION=2
LIBXML_MINOR_VERSION=6
-LIBXML_MICRO_VERSION=30
+LIBXML_MICRO_VERSION=31
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
Modified: packages/libxml2/trunk/doc/devhelp/libxml2-valid.html
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxml2/trunk/doc/devhelp/libxml2-valid.html?rev=1221&op=diff
==============================================================================
--- packages/libxml2/trunk/doc/devhelp/libxml2-valid.html (original)
+++ packages/libxml2/trunk/doc/devhelp/libxml2-valid.html Sat Sep 13 07:33:34 2008
@@ -101,6 +101,7 @@
<a href="libxml2-tree.html#xmlElementContentPtr">xmlElementContentPtr</a> <a href="#xmlCopyDocElementContent">xmlCopyDocElementContent</a> (<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/> <a href="libxml2-tree.html#xmlElementContentPtr">xmlElementContentPtr</a> cur);
<a href="libxml2-tree.html#xmlIDPtr">xmlIDPtr</a> <a href="#xmlAddID">xmlAddID</a> (<a href="libxml2-valid.html#xmlValidCtxtPtr">xmlValidCtxtPtr</a> ctxt, <br/> <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/> const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value, <br/> <a href="libxml2-tree.html#xmlAttrPtr">xmlAttrPtr</a> attr);
void <a href="#xmlFreeRefTable">xmlFreeRefTable</a> (<a href="libxml2-valid.html#xmlRefTablePtr">xmlRefTablePtr</a> table);
+int <a href="#xmlValidateNamesValue">xmlValidateNamesValue</a> (const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value);
int <a href="#xmlRemoveID">xmlRemoveID</a> (<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/> <a href="libxml2-tree.html#xmlAttrPtr">xmlAttrPtr</a> attr);
void <a href="#xmlFreeElementTable">xmlFreeElementTable</a> (<a href="libxml2-valid.html#xmlElementTablePtr">xmlElementTablePtr</a> table);
void <a href="#xmlFreeIDTable">xmlFreeIDTable</a> (<a href="libxml2-valid.html#xmlIDTablePtr">xmlIDTablePtr</a> table);
@@ -112,7 +113,6 @@
typedef void <a href="#xmlValidityWarningFunc">xmlValidityWarningFunc</a> (void * ctx, <br/> const char * msg, <br/> ... ...);
int <a href="#xmlValidatePopElement">xmlValidatePopElement</a> (<a href="libxml2-valid.html#xmlValidCtxtPtr">xmlValidCtxtPtr</a> ctxt, <br/> <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/> <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> elem, <br/> const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * qname);
void <a href="#xmlFreeEnumeration">xmlFreeEnumeration</a> (<a href="libxml2-tree.html#xmlEnumerationPtr">xmlEnumerationPtr</a> cur);
-int <a href="#xmlValidateNamesValue">xmlValidateNamesValue</a> (const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value);
<a href="libxml2-tree.html#xmlEnumerationPtr">xmlEnumerationPtr</a> <a href="#xmlCopyEnumeration">xmlCopyEnumeration</a> (<a href="libxml2-tree.html#xmlEnumerationPtr">xmlEnumerationPtr</a> cur);
<a href="libxml2-tree.html#xmlAttributePtr">xmlAttributePtr</a> <a href="#xmlGetDtdAttrDesc">xmlGetDtdAttrDesc</a> (<a href="libxml2-tree.html#xmlDtdPtr">xmlDtdPtr</a> dtd, <br/> const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * elem, <br/> const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name);
int <a href="#xmlValidateDtd">xmlValidateDtd</a> (<a href="libxml2-valid.html#xmlValidCtxtPtr">xmlValidCtxtPtr</a> ctxt, <br/> <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/> <a href="libxml2-tree.html#xmlDtdPtr">xmlDtdPtr</a> dtd);
Modified: packages/libxml2/trunk/doc/examples/Makefile.am
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxml2/trunk/doc/examples/Makefile.am?rev=1221&op=diff
==============================================================================
--- packages/libxml2/trunk/doc/examples/Makefile.am (original)
+++ packages/libxml2/trunk/doc/examples/Makefile.am Sat Sep 13 07:33:34 2008
@@ -9,6 +9,7 @@
-@($(srcdir)/index.py)
index.html: examples.xml examples.xsl
+ -@(touch index.html)
-@(xsltproc examples.xsl examples.xml && echo "Rebuilt web page" && xmllint --valid --noout index.html)
install-data-local:
Modified: packages/libxml2/trunk/doc/examples/Makefile.in
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxml2/trunk/doc/examples/Makefile.in?rev=1221&op=diff
==============================================================================
--- packages/libxml2/trunk/doc/examples/Makefile.in (original)
+++ packages/libxml2/trunk/doc/examples/Makefile.in Sat Sep 13 07:33:34 2008
@@ -704,6 +704,7 @@
-@($(srcdir)/index.py)
index.html: examples.xml examples.xsl
+ -@(touch index.html)
-@(xsltproc examples.xsl examples.xml && echo "Rebuilt web page" && xmllint --valid --noout index.html)
install-data-local:
Modified: packages/libxml2/trunk/doc/libxml2-api.xml
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxml2/trunk/doc/libxml2-api.xml?rev=1221&op=diff
==============================================================================
--- packages/libxml2/trunk/doc/libxml2-api.xml (original)
+++ packages/libxml2/trunk/doc/libxml2-api.xml Sat Sep 13 07:33:34 2008
@@ -1211,13 +1211,13 @@
<exports symbol='XML_SCHEMA_TYPE_SIMPLE' type='enum'/>
<exports symbol='XML_SCHEMAS_NCNAME' type='enum'/>
<exports symbol='XML_SCHEMAS_LONG' type='enum'/>
- <exports symbol='XML_SCHEMA_FACET_FRACTIONDIGITS' type='enum'/>
+ <exports symbol='XML_SCHEMA_TYPE_ANY_ATTRIBUTE' type='enum'/>
<exports symbol='XML_SCHEMAS_BOOLEAN' type='enum'/>
<exports symbol='XML_SCHEMAS_ENTITY' type='enum'/>
<exports symbol='XML_SCHEMA_TYPE_GROUP' type='enum'/>
<exports symbol='XML_SCHEMAS_GYEARMONTH' type='enum'/>
<exports symbol='XML_SCHEMAS_BASE64BINARY' type='enum'/>
- <exports symbol='XML_SCHEMA_TYPE_ANY_ATTRIBUTE' type='enum'/>
+ <exports symbol='XML_SCHEMA_FACET_FRACTIONDIGITS' type='enum'/>
<exports symbol='XML_SCHEMA_FACET_WHITESPACE' type='enum'/>
<exports symbol='XML_SCHEMAS_IDREF' type='enum'/>
<exports symbol='XML_SCHEMA_TYPE_ATTRIBUTE' type='enum'/>
@@ -1744,6 +1744,7 @@
<exports symbol='xmlCopyDocElementContent' type='function'/>
<exports symbol='xmlAddID' type='function'/>
<exports symbol='xmlFreeRefTable' type='function'/>
+ <exports symbol='xmlValidateNamesValue' type='function'/>
<exports symbol='xmlRemoveID' type='function'/>
<exports symbol='xmlFreeElementTable' type='function'/>
<exports symbol='xmlFreeIDTable' type='function'/>
@@ -1755,7 +1756,6 @@
<exports symbol='xmlValidityWarningFunc' type='function'/>
<exports symbol='xmlValidatePopElement' type='function'/>
<exports symbol='xmlFreeEnumeration' type='function'/>
- <exports symbol='xmlValidateNamesValue' type='function'/>
<exports symbol='xmlCopyEnumeration' type='function'/>
<exports symbol='xmlGetDtdAttrDesc' type='function'/>
<exports symbol='xmlValidateDtd' type='function'/>
@@ -3452,15 +3452,15 @@
<exports symbol='XPATH_ENCODING_ERROR' type='enum'/>
<exports symbol='XPTR_RESOURCE_ERROR' type='enum'/>
<exports symbol='XPATH_NUMBER' type='enum'/>
- <exports symbol='XPATH_INVALID_CTXT_SIZE' type='enum'/>
+ <exports symbol='XPATH_POINT' type='enum'/>
<exports symbol='XPATH_USERS' type='enum'/>
<exports symbol='XPATH_UNDEF_PREFIX_ERROR' type='enum'/>
<exports symbol='XPATH_UNKNOWN_FUNC_ERROR' type='enum'/>
+ <exports symbol='XPATH_INVALID_CTXT_SIZE' type='enum'/>
<exports symbol='XPATH_RANGE' type='enum'/>
<exports symbol='XPTR_SYNTAX_ERROR' type='enum'/>
<exports symbol='XPATH_LOCATIONSET' type='enum'/>
<exports symbol='XPATH_INVALID_CTXT' type='enum'/>
- <exports symbol='XPATH_POINT' type='enum'/>
<exports symbol='XPATH_INVALID_ARITY' type='enum'/>
<exports symbol='XPATH_STRING' type='enum'/>
<exports symbol='XPATH_INVALID_PREDICATE_ERROR' type='enum'/>
Modified: packages/libxml2/trunk/doc/libxml2.xsa
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxml2/trunk/doc/libxml2.xsa?rev=1221&op=diff
==============================================================================
--- packages/libxml2/trunk/doc/libxml2.xsa (original)
+++ packages/libxml2/trunk/doc/libxml2.xsa Sat Sep 13 07:33:34 2008
@@ -8,32 +8,19 @@
</vendor>
<product id="libxml2">
<name>libxml2</name>
- <version>2.6.29</version>
- <last-release> Jun 12 2007</last-release>
+ <version>2.6.30</version>
+ <last-release> Aug 23 2007</last-release>
<info-url>http://xmlsoft.org/</info-url>
- <changes> - Portability: patches from Andreas Stricke for WinCEi,
- fix compilation warnings (William Brack), avoid warnings on Apple OS/X
- (Wendy Doyle and Mark Rowe), Windows compilation and threading
- improvements (Rob Richards), compilation against old Python versions,
- new GNU tar changes (Ryan Hill)
- - Documentation: xmlURIUnescapeString comment,
- - Bugfixes: xmlBufferAdd problem (Richard Jones), 'make valgrind'
- flag fix (Richard Jones), regexp interpretation of \,
- htmlCreateDocParserCtxt (Jean-Daniel Dupas), configure.in
- typo (Bjorn Reese), entity content failure, xmlListAppend() fix
- (Georges-André Silber), XPath number serialization (William Brack),
- nanohttp gzipped stream fix (William Brack and Alex Cornejo),
- xmlCharEncFirstLine typo (Mark Rowe), uri bug (François Delyon),
- XPath string value of PI nodes (William Brack), XPath node set
- sorting bugs (William Brack), avoid outputting namespace decl
- dups in the writer (Rob Richards), xmlCtxtReset bug, UTF-8 encoding
- error handling, recustion on next in catalogs, fix a Relax-NG crash,
- workaround wrong file: URIs, htmlNodeDumpFormatOutput on attributes,
- invalid character in attribute detection bug, big comments before
- internal subset streaming bug, HTML parsing of attributes with : in
- the name, IDness of name in HTML (Dagfinn I. Mannsåker)
- - Improvement: keep URI query parts in raw form (Richard Jones),
- embed tag support in HTML (Michael Day)
+ <changes> - Portability: Solaris crash on error handling, windows path fixes
+ (Roland Schwarz and Rob Richards), mingw build (Roland Schwarz)
+ - Bugfixes: xmlXPathNodeSetSort problem (William Brack), leak when
+ reusing a writer for a new document (Dodji Seketeli), Schemas
+ xsi:nil handling patch (Frank Gross), relative URI build problem
+ (Patrik Fimml), crash in xmlDocFormatDump, invalid char in comment
+ detection bug, fix disparity with xmlSAXUserParseMemory, automata
+ generation for complex regexp counts problems, Schemas IDC import
+ problems (Frank Gross), xpath predicate evailation error handling
+ (William Brack)
</changes>
</product>
Modified: packages/libxml2/trunk/doc/news.html
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxml2/trunk/doc/news.html?rev=1221&op=diff
==============================================================================
--- packages/libxml2/trunk/doc/news.html (original)
+++ packages/libxml2/trunk/doc/news.html Sat Sep 13 07:33:34 2008
@@ -12,7 +12,24 @@
<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.30: Aug 23 2007</h3><ul><li>Portability: Solaris crash on error handling, windows path fixes
+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.31: Jan 11 2008</h3><ul><li>Security fix: missing of checks in UTF-8 parsing</li>
+ <li>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.
+ </li>
+ <li>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)</li>
+ <li>Improvements: HTTP Header: includes port number (William Brack),
+ testURI --debug option, </li>
+</ul><h3>2.6.30: Aug 23 2007</h3><ul><li>Portability: Solaris crash on error handling, windows path fixes
(Roland Schwarz and Rob Richards), mingw build (Roland Schwarz)</li>
<li>Bugfixes: xmlXPathNodeSetSort problem (William Brack), leak when
reusing a writer for a new document (Dodji Seketeli), Schemas
Modified: packages/libxml2/trunk/doc/xml.html
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxml2/trunk/doc/xml.html?rev=1221&op=diff
==============================================================================
--- packages/libxml2/trunk/doc/xml.html (original)
+++ packages/libxml2/trunk/doc/xml.html Sat Sep 13 07:33:34 2008
@@ -739,6 +739,26 @@
<p>Here is the list of public releases:</p>
+<h3>2.6.31: Jan 11 2008</h3>
+<ul>
+ <li>Security fix: missing of checks in UTF-8 parsing</li>
+ <li>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.
+ </li>
+ <li>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)</li>
+ <li>Improvements: HTTP Header: includes port number (William Brack),
+ testURI --debug option, </li>
+</ul>
<h3>2.6.30: Aug 23 2007</h3>
<ul>
<li>Portability: Solaris crash on error handling, windows path fixes
Modified: packages/libxml2/trunk/globals.c
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxml2/trunk/globals.c?rev=1221&op=diff
==============================================================================
--- packages/libxml2/trunk/globals.c (original)
+++ packages/libxml2/trunk/globals.c Sat Sep 13 07:33:34 2008
@@ -60,6 +60,7 @@
xmlFreeMutex(xmlThrDefMutex);
xmlThrDefMutex = NULL;
}
+ __xmlGlobalInitMutexDestroy();
}
/************************************************************************
Modified: packages/libxml2/trunk/hash.c
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxml2/trunk/hash.c?rev=1221&op=diff
==============================================================================
--- packages/libxml2/trunk/hash.c (original)
+++ packages/libxml2/trunk/hash.c Sat Sep 13 07:33:34 2008
@@ -828,7 +828,7 @@
*/
void
xmlHashScanFull(xmlHashTablePtr table, xmlHashScannerFull f, void *data) {
- int i;
+ int i, nb;
xmlHashEntryPtr iter;
xmlHashEntryPtr next;
@@ -844,10 +844,21 @@
iter = &(table->table[i]);
while (iter) {
next = iter->next;
+ nb = table->nbElems;
if ((f != NULL) && (iter->payload != NULL))
f(iter->payload, data, iter->name,
iter->name2, iter->name3);
- iter = next;
+ if (nb != table->nbElems) {
+ /* table was modified by the callback, be careful */
+ if (iter == &(table->table[i])) {
+ if (table->table[i].valid == 0)
+ iter = NULL;
+ if (table->table[i].next != next)
+ iter = &(table->table[i]);
+ } else
+ iter = next;
+ } else
+ iter = next;
}
}
}
Modified: packages/libxml2/trunk/include/libxml/xmlversion.h
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxml2/trunk/include/libxml/xmlversion.h?rev=1221&op=diff
==============================================================================
--- packages/libxml2/trunk/include/libxml/xmlversion.h (original)
+++ packages/libxml2/trunk/include/libxml/xmlversion.h Sat Sep 13 07:33:34 2008
@@ -29,21 +29,21 @@
*
* the version string like "1.2.3"
*/
-#define LIBXML_DOTTED_VERSION "2.6.30"
+#define LIBXML_DOTTED_VERSION "2.6.31"
/**
* LIBXML_VERSION:
*
* the version number: 1.2.3 value is 10203
*/
-#define LIBXML_VERSION 20630
+#define LIBXML_VERSION 20631
/**
* LIBXML_VERSION_STRING:
*
* the version number string, 1.2.3 value is "10203"
*/
-#define LIBXML_VERSION_STRING "20630"
+#define LIBXML_VERSION_STRING "20631"
/**
* LIBXML_VERSION_EXTRA:
@@ -58,7 +58,7 @@
* Macro to check that the libxml version in use is compatible with
* the version the software has been compiled against
*/
-#define LIBXML_TEST_VERSION xmlCheckVersion(20630);
+#define LIBXML_TEST_VERSION xmlCheckVersion(20631);
#ifndef VMS
#if 0
Modified: packages/libxml2/trunk/libxml.h
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxml2/trunk/libxml.h?rev=1221&op=diff
==============================================================================
--- packages/libxml2/trunk/libxml.h (original)
+++ packages/libxml2/trunk/libxml.h Sat Sep 13 07:33:34 2008
@@ -80,6 +80,7 @@
*/
void __xmlGlobalInitMutexLock(void);
void __xmlGlobalInitMutexUnlock(void);
+void __xmlGlobalInitMutexDestroy(void);
#ifdef IN_LIBXML
#ifdef __GNUC__
Modified: packages/libxml2/trunk/libxml2.spec
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxml2/trunk/libxml2.spec?rev=1221&op=diff
==============================================================================
--- packages/libxml2/trunk/libxml2.spec (original)
+++ packages/libxml2/trunk/libxml2.spec Sat Sep 13 07:33:34 2008
@@ -1,6 +1,6 @@
Summary: Library providing XML and HTML support
Name: libxml2
-Version: 2.6.30
+Version: 2.6.31
Release: 1
License: MIT
Group: Development/Libraries
@@ -128,6 +128,6 @@
%doc doc/python.html
%changelog
-* Thu Aug 23 2007 Daniel Veillard <veillard at redhat.com>
-- upstream release 2.6.30 see http://xmlsoft.org/news.html
+* Fri Jan 11 2008 Daniel Veillard <veillard at redhat.com>
+- upstream release 2.6.31 see http://xmlsoft.org/news.html
Modified: packages/libxml2/trunk/ltmain.sh
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxml2/trunk/ltmain.sh?rev=1221&op=diff
==============================================================================
--- packages/libxml2/trunk/ltmain.sh (original)
+++ packages/libxml2/trunk/ltmain.sh Sat Sep 13 07:33:34 2008
@@ -43,7 +43,7 @@
PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION="1.5.24 Debian 1.5.24-1"
+VERSION="1.5.24 Debian 1.5.24-2"
TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)"
# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
Modified: packages/libxml2/trunk/nanohttp.c
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxml2/trunk/nanohttp.c?rev=1221&op=diff
==============================================================================
--- packages/libxml2/trunk/nanohttp.c (original)
+++ packages/libxml2/trunk/nanohttp.c Sat Sep 13 07:33:34 2008
@@ -1364,8 +1364,13 @@
if (ctxt->query != NULL)
p += snprintf( p, blen - (p - bp), "?%s", ctxt->query);
- p += snprintf( p, blen - (p - bp), " HTTP/1.0\r\nHost: %s\r\n",
+ if (ctxt->port == 80) {
+ p += snprintf( p, blen - (p - bp), " HTTP/1.0\r\nHost: %s\r\n",
ctxt->hostname);
+ } else {
+ p += snprintf( p, blen - (p - bp), " HTTP/1.0\r\nHost: %s:%d\r\n",
+ ctxt->hostname, ctxt->port);
+ }
#ifdef HAVE_ZLIB_H
p += snprintf(p, blen - (p - bp), "Accept-Encoding: gzip\r\n");
@@ -1585,7 +1590,7 @@
if (!strcmp(filename, "-"))
fd = 0;
else {
- fd = open(filename, O_CREAT | O_WRONLY);
+ fd = open(filename, O_CREAT | O_WRONLY, 0666);
if (fd < 0) {
xmlNanoHTTPClose(ctxt);
return(-1);
Modified: packages/libxml2/trunk/parser.c
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxml2/trunk/parser.c?rev=1221&op=diff
==============================================================================
--- packages/libxml2/trunk/parser.c (original)
+++ packages/libxml2/trunk/parser.c Sat Sep 13 07:33:34 2008
@@ -957,7 +957,7 @@
* @fullattr: the attribute fullname
* @type: the attribute type
*
- * Register that this attribute is not CDATA
+ * Register this attribute type
*/
static void
xmlAddSpecialAttr(xmlParserCtxtPtr ctxt,
@@ -971,12 +971,54 @@
goto mem_error;
}
+ if (xmlHashLookup2(ctxt->attsSpecial, fullname, fullattr) != NULL)
+ return;
+
xmlHashAddEntry2(ctxt->attsSpecial, fullname, fullattr,
(void *) (long) type);
return;
mem_error:
xmlErrMemory(ctxt, NULL);
+ return;
+}
+
+/**
+ * xmlCleanSpecialAttrCallback:
+ *
+ * Removes CDATA attributes from the special attribute table
+ */
+static void
+xmlCleanSpecialAttrCallback(void *payload, void *data,
+ const xmlChar *fullname, const xmlChar *fullattr,
+ const xmlChar *unused ATTRIBUTE_UNUSED) {
+ xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) data;
+
+ if (((long) payload) == XML_ATTRIBUTE_CDATA) {
+ xmlHashRemoveEntry2(ctxt->attsSpecial, fullname, fullattr, NULL);
+ }
+}
+
+/**
+ * xmlCleanSpecialAttr:
+ * @ctxt: an XML parser context
+ *
+ * Trim the list of attributes defined to remove all those of type
+ * CDATA as they are not special. This call should be done when finishing
+ * to parse the DTD and before starting to parse the document root.
+ */
+static void
+xmlCleanSpecialAttr(xmlParserCtxtPtr ctxt)
+{
+ if (ctxt->attsSpecial == NULL)
+ return;
+
+ xmlHashScanFull(ctxt->attsSpecial, xmlCleanSpecialAttrCallback, ctxt);
+
+ if (xmlHashSize(ctxt->attsSpecial) == 0) {
+ xmlHashFree(ctxt->attsSpecial, NULL);
+ ctxt->attsSpecial = NULL;
+ }
return;
}
@@ -3493,7 +3535,7 @@
in = ctxt->input->cur;
do {
get_more_space:
- while (*in == 0x20) in++;
+ while (*in == 0x20) { in++; ctxt->input->col++; }
if (*in == 0xA) {
do {
ctxt->input->line++; ctxt->input->col = 1;
@@ -5006,7 +5048,7 @@
(def != XML_ATTRIBUTE_REQUIRED)) {
xmlAddDefAttrs(ctxt, elemName, attrName, defaultValue);
}
- if ((ctxt->sax2) && (type != XML_ATTRIBUTE_CDATA)) {
+ if (ctxt->sax2) {
xmlAddSpecialAttr(ctxt, elemName, attrName, type);
}
if (defaultValue != NULL)
@@ -9245,6 +9287,7 @@
ctxt->extSubSystem, ctxt->extSubURI);
ctxt->inSubset = 0;
+ xmlCleanSpecialAttr(ctxt);
ctxt->instate = XML_PARSER_PROLOG;
xmlParseMisc(ctxt);
@@ -10208,6 +10251,7 @@
ctxt->intSubName, ctxt->extSubSystem,
ctxt->extSubURI);
ctxt->inSubset = 0;
+ xmlCleanSpecialAttr(ctxt);
ctxt->instate = XML_PARSER_PROLOG;
#ifdef DEBUG_PUSH
xmlGenericError(xmlGenericErrorContext,
@@ -10435,6 +10479,7 @@
ctxt->sax->externalSubset(ctxt->userData, ctxt->intSubName,
ctxt->extSubSystem, ctxt->extSubURI);
ctxt->inSubset = 0;
+ xmlCleanSpecialAttr(ctxt);
ctxt->instate = XML_PARSER_PROLOG;
ctxt->checkIndex = 0;
#ifdef DEBUG_PUSH
Modified: packages/libxml2/trunk/parserInternals.c
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxml2/trunk/parserInternals.c?rev=1221&op=diff
==============================================================================
--- packages/libxml2/trunk/parserInternals.c (original)
+++ packages/libxml2/trunk/parserInternals.c Sat Sep 13 07:33:34 2008
@@ -693,7 +693,7 @@
if ((*ctxt->input->cur == 0) &&
(ctxt->input->end > ctxt->input->cur)) {
xmlErrEncodingInt(ctxt, XML_ERR_INVALID_CHAR,
- "Char 0x%X out of allowed range\n", val);
+ "Char 0x0 out of allowed range\n", 0);
}
if (*ctxt->input->cur == 0xD) {
if (ctxt->input->cur[1] == 0xA) {
Modified: packages/libxml2/trunk/pattern.c
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxml2/trunk/pattern.c?rev=1221&op=diff
==============================================================================
--- packages/libxml2/trunk/pattern.c (original)
+++ packages/libxml2/trunk/pattern.c Sat Sep 13 07:33:34 2008
@@ -1091,6 +1091,7 @@
}
}
XML_PAT_FREE_STRING(ctxt, prefix);
+ name = NULL;
if (token == NULL) {
if (CUR == '*') {
NEXT;
@@ -1157,6 +1158,7 @@
}
}
XML_PAT_FREE_STRING(ctxt, prefix);
+ name = NULL;
if (token == NULL) {
if (CUR == '*') {
NEXT;
Modified: packages/libxml2/trunk/python/Makefile.am
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxml2/trunk/python/Makefile.am?rev=1221&op=diff
==============================================================================
--- packages/libxml2/trunk/python/Makefile.am (original)
+++ packages/libxml2/trunk/python/Makefile.am Sat Sep 13 07:33:34 2008
@@ -49,6 +49,12 @@
@(for doc in $(DOCS) ; \
do @INSTALL@ -m 0644 $$doc $(DESTDIR)$(DOCS_DIR) ; done)
+uninstall-local:
+ @(for doc in $(DOCS) ; \
+ do rm $(DESTDIR)$(DOCS_DIR)/`basename $$doc` ; done)
+ rm $(DESTDIR)$(pythondir)/drv_libxml2.py
+ rm $(DESTDIR)$(pythondir)/libxml2.py
+
GENERATE = generator.py
API_DESC = $(top_srcdir)/doc/libxml2-api.xml $(srcdir)/libxml2-python-api.xml
GENERATED= libxml2class.py \
Modified: packages/libxml2/trunk/python/Makefile.in
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxml2/trunk/python/Makefile.in?rev=1221&op=diff
==============================================================================
--- packages/libxml2/trunk/python/Makefile.in (original)
+++ packages/libxml2/trunk/python/Makefile.in Sat Sep 13 07:33:34 2008
@@ -660,6 +660,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
+ at WITH_PYTHON_FALSE@uninstall-local:
@WITH_PYTHON_FALSE at install-data-local:
clean: clean-recursive
@@ -710,7 +711,8 @@
ps-am:
-uninstall-am: uninstall-info-am uninstall-pythonLTLIBRARIES
+uninstall-am: uninstall-info-am uninstall-local \
+ uninstall-pythonLTLIBRARIES
uninstall-info: uninstall-info-recursive
@@ -728,7 +730,7 @@
mostlyclean mostlyclean-compile mostlyclean-generic \
mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
tags tags-recursive uninstall uninstall-am uninstall-info-am \
- uninstall-pythonLTLIBRARIES
+ uninstall-local uninstall-pythonLTLIBRARIES
@WITH_PYTHON_TRUE at all-local: libxml2.py
@@ -744,6 +746,12 @@
@WITH_PYTHON_TRUE@ @(for doc in $(DOCS) ; \
@WITH_PYTHON_TRUE@ do @INSTALL@ -m 0644 $$doc $(DESTDIR)$(DOCS_DIR) ; done)
+ at WITH_PYTHON_TRUE@uninstall-local:
+ at WITH_PYTHON_TRUE@ @(for doc in $(DOCS) ; \
+ at WITH_PYTHON_TRUE@ do rm $(DESTDIR)$(DOCS_DIR)/`basename $$doc` ; done)
+ at WITH_PYTHON_TRUE@ rm $(DESTDIR)$(pythondir)/drv_libxml2.py
+ at WITH_PYTHON_TRUE@ rm $(DESTDIR)$(pythondir)/libxml2.py
+
@WITH_PYTHON_TRUE@$(GENERATED): gen_prog
@WITH_PYTHON_TRUE at gen_prog: $(srcdir)/$(GENERATE) $(API_DESC)
Modified: packages/libxml2/trunk/python/libxml2-py.c
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxml2/trunk/python/libxml2-py.c?rev=1221&op=diff
==============================================================================
--- packages/libxml2/trunk/python/libxml2-py.c (original)
+++ packages/libxml2/trunk/python/libxml2-py.c Sat Sep 13 07:33:34 2008
@@ -706,22 +706,6 @@
return(Py_None);
}
-#if defined(LIBXML_UNICODE_ENABLED)
-PyObject *
-libxml_xmlUCSIsLatinExtendedB(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
- PyObject *py_retval;
- int c_retval;
- int code;
-
- if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsLatinExtendedB", &code))
- return(NULL);
-
- c_retval = xmlUCSIsLatinExtendedB(code);
- py_retval = libxml_intWrap((int) c_retval);
- return(py_retval);
-}
-
-#endif /* defined(LIBXML_UNICODE_ENABLED) */
#if defined(LIBXML_UNICODE_ENABLED)
PyObject *
libxml_xmlUCSIsLatinExtendedA(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
@@ -4555,6 +4539,22 @@
return(py_retval);
}
+#if defined(LIBXML_UNICODE_ENABLED)
+PyObject *
+libxml_xmlUCSIsLatinExtendedB(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+ PyObject *py_retval;
+ int c_retval;
+ int code;
+
+ if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsLatinExtendedB", &code))
+ return(NULL);
+
+ c_retval = xmlUCSIsLatinExtendedB(code);
+ py_retval = libxml_intWrap((int) c_retval);
+ return(py_retval);
+}
+
+#endif /* defined(LIBXML_UNICODE_ENABLED) */
#if defined(LIBXML_CATALOG_ENABLED)
PyObject *
libxml_xmlACatalogResolveURI(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
Modified: packages/libxml2/trunk/python/setup.py
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxml2/trunk/python/setup.py?rev=1221&op=diff
==============================================================================
--- packages/libxml2/trunk/python/setup.py (original)
+++ packages/libxml2/trunk/python/setup.py Sat Sep 13 07:33:34 2008
@@ -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.30",
+ version = "2.6.31",
description = descr,
author = "Daniel Veillard",
author_email = "veillard at redhat.com",
Modified: packages/libxml2/trunk/python/tests/Makefile.am
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxml2/trunk/python/tests/Makefile.am?rev=1221&op=diff
==============================================================================
--- packages/libxml2/trunk/python/tests/Makefile.am (original)
+++ packages/libxml2/trunk/python/tests/Makefile.am Sat Sep 13 07:33:34 2008
@@ -77,3 +77,7 @@
-(for test in $(PYTESTS) $(XMLS); \
do @INSTALL@ -m 0644 $(srcdir)/$$test $(DESTDIR)$(EXAMPLE_DIR) ; done)
+uninstall-local:
+ @(for test in $(PYTESTS) $(XMLS) ; \
+ do rm $(DESTDIR)$(EXAMPLE_DIR)/`basename $$test` ; done)
+
Modified: packages/libxml2/trunk/python/tests/Makefile.in
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxml2/trunk/python/tests/Makefile.in?rev=1221&op=diff
==============================================================================
--- packages/libxml2/trunk/python/tests/Makefile.in (original)
+++ packages/libxml2/trunk/python/tests/Makefile.in Sat Sep 13 07:33:34 2008
@@ -466,7 +466,7 @@
ps-am:
-uninstall-am: uninstall-info-am
+uninstall-am: uninstall-info-am uninstall-local
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
distclean distclean-generic distclean-libtool distdir dvi \
@@ -476,7 +476,7 @@
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- uninstall uninstall-am uninstall-info-am
+ uninstall uninstall-am uninstall-info-am uninstall-local
@WITH_PYTHON_TRUE at tests: $(PYTESTS)
@@ -498,6 +498,10 @@
$(mkinstalldirs) $(DESTDIR)$(EXAMPLE_DIR)
-(for test in $(PYTESTS) $(XMLS); \
do @INSTALL@ -m 0644 $(srcdir)/$$test $(DESTDIR)$(EXAMPLE_DIR) ; done)
+
+uninstall-local:
+ @(for test in $(PYTESTS) $(XMLS) ; \
+ do rm $(DESTDIR)$(EXAMPLE_DIR)/`basename $$test` ; done)
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Modified: packages/libxml2/trunk/schematron.c
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxml2/trunk/schematron.c?rev=1221&op=diff
==============================================================================
--- packages/libxml2/trunk/schematron.c (original)
+++ packages/libxml2/trunk/schematron.c Sat Sep 13 07:33:34 2008
@@ -1204,6 +1204,9 @@
}
/* the original document must be kept for reporting */
ret->doc = doc;
+ if (preserve) {
+ ret->preserve = 1;
+ }
preserve = 1;
exit:
Modified: packages/libxml2/trunk/testURI.c
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxml2/trunk/testURI.c?rev=1221&op=diff
==============================================================================
--- packages/libxml2/trunk/testURI.c (original)
+++ packages/libxml2/trunk/testURI.c Sat Sep 13 07:33:34 2008
@@ -18,6 +18,7 @@
static const char *base = NULL;
static int escape = 0;
+static int debug = 0;
static void handleURI(const char *str) {
int ret;
@@ -31,6 +32,19 @@
if (ret != 0)
printf("%s : error %d\n", str, ret);
else {
+ if (debug) {
+ if (uri->scheme) printf("scheme: %s\n", uri->scheme);
+ if (uri->opaque) printf("opaque: %s\n", uri->opaque);
+ if (uri->authority) printf("authority: %s\n", uri->authority);
+ if (uri->server) printf("server: %s\n", uri->server);
+ if (uri->user) printf("user: %s\n", uri->user);
+ if (uri->port != 0) printf("port: %d\n", uri->port);
+ if (uri->path) printf("path: %s\n", uri->path);
+ if (uri->query) printf("query: %s\n", uri->query);
+ if (uri->fragment) printf("fragment: %s\n", uri->fragment);
+ if (uri->query_raw) printf("query_raw: %s\n", uri->query_raw);
+ if (uri->cleanup != 0) printf("cleanup\n");
+ }
xmlNormalizeURIPath(uri->path);
if (escape != 0) {
parsed = xmlSaveUri(uri);
@@ -72,6 +86,11 @@
arg++;
escape++;
}
+ if ((argc > arg) && (argv[arg] != NULL) &&
+ ((!strcmp(argv[arg], "-debug")) || (!strcmp(argv[arg], "--debug")))) {
+ arg++;
+ debug++;
+ }
if (argv[arg] == NULL) {
char str[1024];
Modified: packages/libxml2/trunk/threads.c
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxml2/trunk/threads.c?rev=1221&op=diff
==============================================================================
--- packages/libxml2/trunk/threads.c (original)
+++ packages/libxml2/trunk/threads.c Sat Sep 13 07:33:34 2008
@@ -428,8 +428,6 @@
{
/* Make sure the global init lock is initialized and then lock it. */
#ifdef HAVE_PTHREAD_H
- int err;
-
/* The mutex is statically initialized, so we just lock it. */
pthread_mutex_lock(&global_init_lock);
#elif defined HAVE_WIN32_THREADS
@@ -451,6 +449,7 @@
* section in the global_init_lock then discard the one
* allocated by this thread. */
if (global_init_lock != cs) {
+ DeleteCriticalSection(cs);
free(cs);
}
}
@@ -497,6 +496,24 @@
LeaveCriticalSection(global_init_lock);
#elif defined HAVE_BEOS_THREADS
release_sem(global_init_lock);
+#endif
+}
+
+/**
+ * xmlGlobalInitMutexDestroy
+ *
+ * Makes sure that the global initialization mutex is destroyed before
+ * application termination.
+ */
+void __xmlGlobalInitMutexDestroy(void)
+{
+#if defined HAVE_WIN32_THREADS
+ if (global_init_lock != NULL)
+ {
+ DeleteCriticalSection(global_init_lock);
+ free(global_init_lock);
+ global_init_lock = NULL;
+ }
#endif
}
Modified: packages/libxml2/trunk/xml2-config.in
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxml2/trunk/xml2-config.in?rev=1221&op=diff
==============================================================================
--- packages/libxml2/trunk/xml2-config.in (original)
+++ packages/libxml2/trunk/xml2-config.in Sat Sep 13 07:33:34 2008
@@ -85,7 +85,7 @@
--libs)
if [ "`uname`" = "Linux" ]
then
- if [ "@XML_LIBDIR@" = "-L/usr/lib64" ]
+ if [ "@XML_LIBDIR@" = "-L/usr/lib" -o "@XML_LIBDIR@" = "-L/usr/lib64" ]
then
LIBS="@XML_LIBS@"
else
Modified: packages/libxml2/trunk/xmllint.c
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxml2/trunk/xmllint.c?rev=1221&op=diff
==============================================================================
--- packages/libxml2/trunk/xmllint.c (original)
+++ packages/libxml2/trunk/xmllint.c Sat Sep 13 07:33:34 2008
@@ -257,7 +257,7 @@
const char *lastsegment = URL;
const char *iter = URL;
- if (nbpaths > 0) {
+ if ((nbpaths > 0) && (iter != NULL)) {
while (*iter != 0) {
if (*iter == '/')
lastsegment = iter + 1;
Modified: packages/libxml2/trunk/xmlmemory.c
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxml2/trunk/xmlmemory.c?rev=1221&op=diff
==============================================================================
--- packages/libxml2/trunk/xmlmemory.c (original)
+++ packages/libxml2/trunk/xmlmemory.c Sat Sep 13 07:33:34 2008
@@ -408,6 +408,9 @@
#ifdef DEBUG_MEMORY
size_t size;
#endif
+
+ if (ptr == NULL)
+ return;
if (ptr == (void *) -1) {
xmlGenericError(xmlGenericErrorContext,
Modified: packages/libxml2/trunk/xmlregexp.c
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxml2/trunk/xmlregexp.c?rev=1221&op=diff
==============================================================================
--- packages/libxml2/trunk/xmlregexp.c (original)
+++ packages/libxml2/trunk/xmlregexp.c Sat Sep 13 07:33:34 2008
@@ -1610,10 +1610,9 @@
/* ???? For some reason it seems we never reach that
case, I suppose this got optimized out before when
building the automata */
-
+ copy = xmlRegCopyAtom(ctxt, atom);
if (copy == NULL)
return(-1);
- copy = xmlRegCopyAtom(ctxt, atom);
copy->quant = XML_REGEXP_QUANT_ONCE;
copy->min = 0;
copy->max = 0;
@@ -1711,9 +1710,11 @@
xmlRegStateAddTrans(ctxt, to, atom, to, -1, -1);
break;
case XML_REGEXP_QUANT_RANGE:
+#if DV_test
if (atom->min == 0) {
xmlFAGenerateEpsilonTransition(ctxt, from, to);
}
+#endif
break;
default:
break;
@@ -3211,12 +3212,22 @@
* this is a multiple input sequence
* If there is a counter associated increment it now.
* before potentially saving and rollback
+ * do not increment if the counter is already over the
+ * maximum limit in which case get to next transition
*/
if (trans->counter >= 0) {
- if (exec->counts == NULL) {
+ xmlRegCounterPtr counter;
+
+ if ((exec->counts == NULL) ||
+ (exec->comp == NULL) ||
+ (exec->comp->counters == NULL)) {
exec->status = -1;
goto error;
}
+ counter = &exec->comp->counters[trans->counter];
+ if (exec->counts[trans->counter] >= counter->max)
+ continue; /* for loop on transitions */
+
#ifdef DEBUG_REGEXP_EXEC
printf("Increasing count %d\n", trans->counter);
#endif
@@ -3312,10 +3323,18 @@
xmlFARegExecSave(exec);
}
if (trans->counter >= 0) {
- if (exec->counts == NULL) {
- exec->status = -1;
+ xmlRegCounterPtr counter;
+
+ /* make sure we don't go over the counter maximum value */
+ if ((exec->counts == NULL) ||
+ (exec->comp == NULL) ||
+ (exec->comp->counters == NULL)) {
+ exec->status = -1;
goto error;
}
+ counter = &exec->comp->counters[trans->counter];
+ if (exec->counts[trans->counter] >= counter->max)
+ continue; /* for loop on transitions */
#ifdef DEBUG_REGEXP_EXEC
printf("Increasing count %d\n", trans->counter);
#endif
Modified: packages/libxml2/trunk/xmlsave.c
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxml2/trunk/xmlsave.c?rev=1221&op=diff
==============================================================================
--- packages/libxml2/trunk/xmlsave.c (original)
+++ packages/libxml2/trunk/xmlsave.c Sat Sep 13 07:33:34 2008
@@ -1254,6 +1254,10 @@
}
return;
}
+ if (cur->type == XML_ATTRIBUTE_NODE) {
+ xmlAttrDumpOutput(ctxt, (xmlAttrPtr) cur);
+ return;
+ }
format = ctxt->format;
if (format == 1) {
Modified: packages/libxml2/trunk/xmlwriter.c
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxml2/trunk/xmlwriter.c?rev=1221&op=diff
==============================================================================
--- packages/libxml2/trunk/xmlwriter.c (original)
+++ packages/libxml2/trunk/xmlwriter.c Sat Sep 13 07:33:34 2008
@@ -1256,6 +1256,11 @@
return -1;
}
+ if (writer->indent) {
+ count = xmlOutputBufferWriteString(writer->out, "\n");
+ sum += count;
+ }
+
xmlListPopFront(writer->nodes);
return sum;
}
More information about the debian-xml-sgml-commit
mailing list