Ready for 1.7.0, major changes, nanohttp, cleanup, binary compat with 1.4,
etc... See Changelog, Daniel.
diff --git a/include/libxml/parser.h b/include/libxml/parser.h
index aab3553..06db141 100644
--- a/include/libxml/parser.h
+++ b/include/libxml/parser.h
@@ -105,25 +105,13 @@
struct xmlSAXHandler *sax; /* The SAX handler */
void *userData; /* the document being built */
xmlDocPtr myDoc; /* the document being built */
+ int wellFormed; /* is the document well formed */
int replaceEntities; /* shall we replace entities ? */
const CHAR *version; /* the XML version string */
const CHAR *encoding; /* encoding, if any */
int standalone; /* standalone document */
- int hasExternalSubset; /* reference and external subset */
- int hasPErefs; /* the internal subset has PE refs */
int html; /* are we parsing an HTML document */
- int external; /* are we parsing an external entity */
- int wellFormed; /* is the document well formed */
- int valid; /* is the document valid */
- int validate; /* shall we try to validate ? */
- xmlValidCtxt vctxt; /* The validity context */
-
- xmlParserInputState instate; /* current type of input */
- int token; /* next char look-ahead */
-
- char *directory; /* the data directory */
-
/* Input stream stack */
xmlParserInputPtr input; /* Current input stream */
int inputNr; /* Number of current input streams */
@@ -138,6 +126,21 @@
int record_info; /* Whether node info should be kept */
xmlParserNodeInfoSeq node_seq; /* info about each node parsed */
+
+ int errno; /* error code */
+
+ int hasExternalSubset; /* reference and external subset */
+ int hasPErefs; /* the internal subset has PE refs */
+ int external; /* are we parsing an external entity */
+
+ int valid; /* is the document valid */
+ int validate; /* shall we try to validate ? */
+ xmlValidCtxt vctxt; /* The validity context */
+
+ xmlParserInputState instate; /* current type of input */
+ int token; /* next char look-ahead */
+
+ char *directory; /* the data directory */
} _xmlParserCtxt;
typedef _xmlParserCtxt xmlParserCtxt;
typedef xmlParserCtxt *xmlParserCtxtPtr;
diff --git a/include/libxml/xmlIO.h b/include/libxml/xmlIO.h
index 01bf14c..a99ab23 100644
--- a/include/libxml/xmlIO.h
+++ b/include/libxml/xmlIO.h
@@ -23,6 +23,7 @@
FILE *file; /* Input on file handler */
void* gzfile; /* Input on a compressed stream */
int fd; /* Input on a file descriptor */
+ void *netIO; /* Input from a network stream */
xmlCharEncodingHandlerPtr encoder; /* I18N conversions to UTF-8 */
diff --git a/include/libxml/xmlmemory.h b/include/libxml/xmlmemory.h
index d28b526..78ff392 100644
--- a/include/libxml/xmlmemory.h
+++ b/include/libxml/xmlmemory.h
@@ -8,7 +8,7 @@
#ifndef _DEBUG_MEMORY_ALLOC_
#define _DEBUG_MEMORY_ALLOC_
-#define NO_DEBUG_MEMORY
+/* #define NO_DEBUG_MEMORY */
#ifdef NO_DEBUG_MEMORY
#ifdef HAVE_MALLOC_H