Commit a4964b75 authored by Daniel Veillard's avatar Daniel Veillard
Browse files

- HTMLparser.c: fixed loop on invalid char in scripts

- parser.c: update to description of xmlIOParseDTD()
- libxml.m4 xmlversion.h.in: changes contributed by
  Michael Schmeing <m.schmeing@internet-factory.de>
- configure.in: preparing for 2.2.7
- Makefile.am: trying to avoid  config.h and acconfig.h
  being included in the distrib
- rebuilt the docs
- configure.in: released 2.2.7
Daniel
parent 2ffc3591
Tue Oct 31 14:14:13 CET 2000 Daniel Veillard <Daniel.Veillard@w3.org>
* HTMLparser.c: fixed loop on invalid char in scripts
* parser.c: update to description of xmlIOParseDTD()
* libxml.m4 xmlversion.h.in: changes contributed by
Michael Schmeing <m.schmeing@internet-factory.de>
* configure.in: preparing for 2.2.7
* Makefile.am: trying to avoid config.h and acconfig.h
being included in the distrib
* configure.in: released 2.2.7
Mon Oct 30 17:08:10 CET 2000 Daniel Veillard <Daniel.Veillard@w3.org>
* tree.[ch] debugXML.c parserInternals.c xpath.c: Deprecated Pi's
like namespaces for good. Unified xmlNs and xmlNode somewhat.
Mon Oct 30 16:26:49 CET 2000 Daniel Veillard <Daniel.Veillard@w3.org>
* parser.[ch]: added xmlIOParseDTD()
......
......@@ -2329,6 +2329,14 @@ htmlParseScript(htmlParserCtxtPtr ctxt) {
NEXT;
cur = CUR;
}
if (!(IS_CHAR(cur))) {
if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
ctxt->sax->error(ctxt->userData,
"Invalid char in CDATA 0x%X\n", cur);
ctxt->wellFormed = 0;
NEXT;
}
if ((nbchar != 0) && (ctxt->sax != NULL) && (!ctxt->disableSAX)) {
if (ctxt->sax->cdataBlock!= NULL) {
/*
......
......@@ -363,7 +363,7 @@ confexecdir=$(libdir)
confexec_DATA = xmlConf.sh
EXTRA_DIST = xmlConf.sh.in libxml.spec.in libxml.spec libxml.m4 \
example/Makefile.am example/gjobread.c example/gjobs.xml \
$(man_MANS) libxml-2.0.pc.in include/libxml/*.h xmlversion.h.in \
$(man_MANS) libxml-2.0.pc.in xmlversion.h.in \
win32/README.MSDev win32/Makefile.mingw win32/libxml2/libxml2.dsp
pkgconfigdir = $(libdir)/pkgconfig
......
......@@ -6,7 +6,7 @@ AC_CANONICAL_HOST
LIBXML_MAJOR_VERSION=2
LIBXML_MINOR_VERSION=2
LIBXML_MICRO_VERSION=6
LIBXML_MICRO_VERSION=7
LIBXML_VERSION=$LIBXML_MAJOR_VERSION.$LIBXML_MINOR_VERSION.$LIBXML_MICRO_VERSION
LIBXML_VERSION_INFO=`expr $LIBXML_MAJOR_VERSION + $LIBXML_MINOR_VERSION`:$LIBXML_MICRO_VERSION:$LIBXML_MINOR_VERSION
......
......@@ -377,8 +377,10 @@ void xmlDebugDumpNamespace(FILE *output, xmlNsPtr ns, int depth) {
shift[2 * i] = shift[2 * i + 1] = 0;
fprintf(output, shift);
if (ns->type == XML_GLOBAL_NAMESPACE)
fprintf(output, "old ");
if (ns->type != XML_NAMESPACE_DECL) {
fprintf(output, "invalid namespace node %d\n", ns->type);
return;
}
if (ns->href == NULL) {
if (ns->prefix != NULL)
fprintf(output, "incomplete namespace %s href=NULL\n", ns->prefix);
......@@ -571,6 +573,9 @@ void xmlDebugDumpOneNode(FILE *output, xmlNodePtr node, int depth) {
case XML_ENTITY_DECL:
xmlDebugDumpEntityDecl(output, (xmlEntityPtr) node, depth);
return;
case XML_NAMESPACE_DECL:
xmlDebugDumpNamespace(output, (xmlNsPtr) node, depth);
return;
default:
fprintf(output, shift);
fprintf(output, "NODE_%d !!!\n", node->type);
......@@ -911,6 +916,7 @@ static int xmlLsCountNode(xmlNodePtr node) {
case XML_ELEMENT_DECL:
case XML_ATTRIBUTE_DECL:
case XML_ENTITY_DECL:
case XML_NAMESPACE_DECL:
ret = 1;
break;
}
......
......@@ -115,7 +115,7 @@ SIZE="3"
><DIV
CLASS="REFNAMEDIV"
><A
NAME="AEN17550"
NAME="AEN17812"
></A
><H2
>Name</H2
......@@ -123,7 +123,7 @@ NAME="AEN17550"
><DIV
CLASS="REFSYNOPSISDIV"
><A
NAME="AEN17553"
NAME="AEN17815"
></A
><H2
>Synopsis</H2
......@@ -315,7 +315,7 @@ HREF="FILE"
><DIV
CLASS="REFSECT1"
><A
NAME="AEN17600"
NAME="AEN17862"
></A
><H2
>Description</H2
......@@ -325,14 +325,14 @@ NAME="AEN17600"
><DIV
CLASS="REFSECT1"
><A
NAME="AEN17603"
NAME="AEN17865"
></A
><H2
>Details</H2
><DIV
CLASS="REFSECT2"
><A
NAME="AEN17605"
NAME="AEN17867"
></A
><H3
><A
......@@ -414,7 +414,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN17625"
NAME="AEN17887"
></A
><H3
><A
......@@ -514,7 +514,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN17649"
NAME="AEN17911"
></A
><H3
><A
......@@ -614,7 +614,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN17673"
NAME="AEN17935"
></A
><H3
><A
......@@ -714,7 +714,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN17697"
NAME="AEN17959"
></A
><H3
><A
......@@ -814,7 +814,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN17721"
NAME="AEN17983"
></A
><H3
><A
......@@ -914,7 +914,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN17745"
NAME="AEN18007"
></A
><H3
><A
......@@ -996,7 +996,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN17765"
NAME="AEN18027"
></A
><H3
><A
......@@ -1078,7 +1078,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN17785"
NAME="AEN18047"
></A
><H3
><A
......@@ -1160,7 +1160,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN17805"
NAME="AEN18067"
></A
><H3
><A
......@@ -1242,7 +1242,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN17825"
NAME="AEN18087"
></A
><H3
><A
......@@ -1324,7 +1324,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN17845"
NAME="AEN18107"
></A
><H3
><A
......@@ -1397,7 +1397,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN17863"
NAME="AEN18125"
></A
><H3
><A
......@@ -1431,7 +1431,7 @@ CLASS="PROGRAMLISTING"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN17868"
NAME="AEN18130"
></A
><H3
><A
......@@ -1457,7 +1457,7 @@ CLASS="PROGRAMLISTING"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN17873"
NAME="AEN18135"
></A
><H3
><A
......@@ -1593,7 +1593,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN17906"
NAME="AEN18168"
></A
><H3
><A
......
......@@ -115,7 +115,7 @@ SIZE="3"
><DIV
CLASS="REFNAMEDIV"
><A
NAME="AEN17084"
NAME="AEN17346"
></A
><H2
>Name</H2
......@@ -123,7 +123,7 @@ NAME="AEN17084"
><DIV
CLASS="REFSYNOPSISDIV"
><A
NAME="AEN17087"
NAME="AEN17349"
></A
><H2
>Synopsis</H2
......@@ -300,7 +300,7 @@ HREF="gnome-xml-encoding.html#XMLCHARENCODINGHANDLER"
><DIV
CLASS="REFSECT1"
><A
NAME="AEN17129"
NAME="AEN17391"
></A
><H2
>Description</H2
......@@ -310,14 +310,14 @@ NAME="AEN17129"
><DIV
CLASS="REFSECT1"
><A
NAME="AEN17132"
NAME="AEN17394"
></A
><H2
>Details</H2
><DIV
CLASS="REFSECT2"
><A
NAME="AEN17134"
NAME="AEN17396"
></A
><H3
><A
......@@ -368,7 +368,7 @@ CLASS="PROGRAMLISTING"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN17139"
NAME="AEN17401"
></A
><H3
><A
......@@ -495,7 +495,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN17169"
NAME="AEN17431"
></A
><H3
><A
......@@ -622,7 +622,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN17199"
NAME="AEN17461"
></A
><H3
><A
......@@ -656,7 +656,7 @@ CLASS="PROGRAMLISTING"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN17204"
NAME="AEN17466"
></A
><H3
><A
......@@ -682,7 +682,7 @@ CLASS="PROGRAMLISTING"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN17209"
NAME="AEN17471"
></A
><H3
><A
......@@ -713,7 +713,7 @@ in normal processing.</P
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN17215"
NAME="AEN17477"
></A
><H3
><A
......@@ -742,7 +742,7 @@ unregisters all the encoding handlers and the aliases.</P
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN17221"
NAME="AEN17483"
></A
><H3
><A
......@@ -805,7 +805,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN17237"
NAME="AEN17499"
></A
><H3
><A
......@@ -887,7 +887,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN17258"
NAME="AEN17520"
></A
><H3
><A
......@@ -964,7 +964,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN17277"
NAME="AEN17539"
></A
><H3
><A
......@@ -1068,7 +1068,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN17302"
NAME="AEN17564"
></A
><H3
><A
......@@ -1148,7 +1148,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN17322"
NAME="AEN17584"
></A
><H3
><A
......@@ -1223,7 +1223,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN17341"
NAME="AEN17603"
></A
><H3
><A
......@@ -1251,7 +1251,7 @@ CLASS="PROGRAMLISTING"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN17347"
NAME="AEN17609"
></A
><H3
><A
......@@ -1332,7 +1332,7 @@ if not recognized.</TD
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN17367"
NAME="AEN17629"
></A
><H3
><A
......@@ -1415,7 +1415,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN17388"
NAME="AEN17650"
></A
><H3
><A
......@@ -1513,7 +1513,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN17412"
NAME="AEN17674"
></A
><H3
><A
......@@ -1608,7 +1608,7 @@ CLASS="PARAMETER"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN17434"
NAME="AEN17696"
></A
><H3
><A
......@@ -1741,7 +1741,7 @@ the result of transformation can't fit into the encoding we want), or</TD
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN17465"
NAME="AEN17727"
></A
><H3
><A
......@@ -1864,7 +1864,7 @@ the result of transformation can't fit into the encoding we want), or</TD
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN17495"
NAME="AEN17757"
></A
><H3
><A
......@@ -1988,7 +1988,7 @@ the result of transformation can't fit into the encoding we want), or</TD
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN17525"
NAME="AEN17787"
></A
><H3
><A
......
......@@ -115,7 +115,7 @@ SIZE="3"
><DIV
CLASS="REFNAMEDIV"
><A
NAME="AEN6949"
NAME="AEN6992"
></A
><H2
>Name</H2
......@@ -123,7 +123,7 @@ NAME="AEN6949"
><DIV
CLASS="REFSYNOPSISDIV"
><A
NAME="AEN6952"
NAME="AEN6995"
></A
><H2
>Synopsis</H2
......@@ -363,7 +363,7 @@ HREF="gnome-xml-entities.html#XMLCLEANUPPREDEFINEDENTITIES"
><DIV
CLASS="REFSECT1"
><A
NAME="AEN7015"
NAME="AEN7058"
></A
><H2
>Description</H2
......@@ -373,14 +373,14 @@ NAME="AEN7015"
><DIV
CLASS="REFSECT1"
><A
NAME="AEN7018"
NAME="AEN7061"
></A
><H2
>Details</H2
><DIV
CLASS="REFSECT2"
><A
NAME="AEN7020"
NAME="AEN7063"
></A
><H3
><A
......@@ -413,7 +413,7 @@ CLASS="PROGRAMLISTING"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN7025"
NAME="AEN7068"
></A
><H3
><A
......@@ -461,7 +461,7 @@ CLASS="PROGRAMLISTING"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN7030"
NAME="AEN7073"
></A
><H3
><A
......@@ -487,7 +487,7 @@ CLASS="PROGRAMLISTING"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN7035"
NAME="AEN7078"
></A
><H3
><A
......@@ -513,7 +513,7 @@ CLASS="PROGRAMLISTING"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN7040"
NAME="AEN7083"
></A
><H3
><A
......@@ -541,7 +541,7 @@ CLASS="PROGRAMLISTING"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN7046"
NAME="AEN7089"
></A
><H3
><A
......@@ -724,7 +724,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN7091"
NAME="AEN7134"
></A
><H3
><A
......@@ -907,7 +907,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN7136"
NAME="AEN7179"
></A
><H3
><A
......@@ -988,7 +988,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN7157"
NAME="AEN7200"
></A
><H3
><A
......@@ -1092,7 +1092,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN7183"
NAME="AEN7226"
></A
><H3
><A
......@@ -1195,7 +1195,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN7209"
NAME="AEN7252"
></A
><H3
><A
......@@ -1298,7 +1298,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN7235"
NAME="AEN7278"
></A
><H3
><A
......@@ -1407,7 +1407,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN7263"
NAME="AEN7306"
></A
><H3
><A
......@@ -1512,7 +1512,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN7289"
NAME="AEN7332"
></A
><H3
><A
......@@ -1615,7 +1615,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN7315"
NAME="AEN7358"
></A
><H3
><A
......@@ -1676,7 +1676,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN7331"
NAME="AEN7374"
></A
><H3
><A
......@@ -1757,7 +1757,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN7352"
NAME="AEN7395"
></A
><H3