diff --git a/configure.in b/configure.in
index f5e62bce..d449b114 100644
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ AC_CANONICAL_HOST
LIBXML_MAJOR_VERSION=2
LIBXML_MINOR_VERSION=9
-LIBXML_MICRO_VERSION=0
+LIBXML_MICRO_VERSION=1
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/APIchunk10.html b/doc/APIchunk10.html
index 4c9f892e..22d5061f 100644
--- a/doc/APIchunk10.html
+++ b/doc/APIchunk10.html
@@ -314,7 +314,8 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlNewRMutex
xmlReallocLoc
xmlXPathObjectCopy
-
allocationhtmlNewParserCtxt
+allocationLIBXML_THREAD_ALLOC_ENABLED
+htmlNewParserCtxt
xmlBufferSetAllocationScheme
xmlGetBufferAllocationScheme
xmlMallocAtomicLoc
diff --git a/doc/APIchunk12.html b/doc/APIchunk12.html
index 05a6b801..113385b1 100644
--- a/doc/APIchunk12.html
+++ b/doc/APIchunk12.html
@@ -657,6 +657,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlXPathDistinct
xmlXPathDistinctSorted
containsXML_SCHEMAS_ATTRGROUP_HAS_REFS
+_xmlEntity
xmlCurrentChar
xmlParseEntityRef
xmlParsePEReference
diff --git a/doc/APIchunk13.html b/doc/APIchunk13.html
index c5d3e6af..b1f069d8 100644
--- a/doc/APIchunk13.html
+++ b/doc/APIchunk13.html
@@ -242,6 +242,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlCheckLanguageID
xmlCreateEntitiesTable
xmlDecodeEntities
+xmlInitializeDict
xmlNodeDump
xmlParserHandleReference
xmlParserInputRead
diff --git a/doc/APIchunk14.html b/doc/APIchunk14.html
index b30962c9..2eac2f6e 100644
--- a/doc/APIchunk14.html
+++ b/doc/APIchunk14.html
@@ -313,6 +313,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlXPathEvalFunc
xmlXPathEvalPredicate
xmlXPathEvaluatePredicateResult
+xmlXPathNodeEval
xmlXPtrBuildNodeList
xmlXPtrEval
evaulationxmlRegFreeExecCtxt
diff --git a/doc/APIchunk16.html b/doc/APIchunk16.html
index 20e90a72..92d38453 100644
--- a/doc/APIchunk16.html
+++ b/doc/APIchunk16.html
@@ -281,6 +281,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlNewNsPropEatName
xmlNewProp
holdsxmlBufferWriteQuotedString
+hooksLIBXML_THREAD_ALLOC_ENABLED
hostxmlNanoFTPProxy
xmlNanoFTPScanProxy
xmlNanoFTPUpdateURL
diff --git a/doc/APIchunk18.html b/doc/APIchunk18.html
index ab40dab5..90249a15 100644
--- a/doc/APIchunk18.html
+++ b/doc/APIchunk18.html
@@ -184,12 +184,6 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlStrndup
xmlUTF8Strndup
xmlUTF8Strsize
-lengthxmlExpGetLanguage
-xmlExpGetStart
-xmlExpNewAtom
-xmlRelaxNGValidatePushCData
-xmlSplitQName3
-xmlValidatePushCData
length-1xmlXPathNodeSetItem
lessxmlExpExpDerive
xmlSaveToFilename
diff --git a/doc/APIchunk2.html b/doc/APIchunk2.html
index 7fba0b5d..1d10f932 100644
--- a/doc/APIchunk2.html
+++ b/doc/APIchunk2.html
@@ -330,6 +330,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlXPathEvalExpression
xmlXPathEvalPredicate
xmlXPathEvaluatePredicateResult
+xmlXPathNodeEval
xmlXPtrEval
xmlXPtrEvalRangePredicate
EvaluatesxmlExpExpDerive
diff --git a/doc/APIchunk21.html b/doc/APIchunk21.html
index 9c030803..c655198f 100644
--- a/doc/APIchunk21.html
+++ b/doc/APIchunk21.html
@@ -135,7 +135,6 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlEncodeEntities
xmlInitParser
xmlInitializeCatalog
-xmlInitializeDict
xmlLoadCatalog
xmlLoadCatalogs
xmlParseAttributeType
diff --git a/doc/APIchunk22.html b/doc/APIchunk22.html
index bf76a9c3..2f200185 100644
--- a/doc/APIchunk22.html
+++ b/doc/APIchunk22.html
@@ -151,6 +151,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlParseAttributeType
xmlValidateElementDecl
xmlXPathContextSetCache
+per-threadLIBXML_THREAD_ALLOC_ENABLED
performancexmlGetBufferAllocationScheme
xmlSetBufferAllocationScheme
performedhtmlNodeStatus
@@ -295,7 +296,6 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlXPathEvaluatePredicateResult
xmlXPtrEvalRangePredicate
preferablyxmlInitializeCatalog
-xmlInitializeDict
xmlLoadCatalog
xmlLoadCatalogs
xmlNewPI
diff --git a/doc/APIchunk23.html b/doc/APIchunk23.html
index 2908b82a..16c7c217 100644
--- a/doc/APIchunk23.html
+++ b/doc/APIchunk23.html
@@ -522,6 +522,7 @@ A:link, A:visited, A:active { text-decoration: underline }
restoredxmlSchemaSAXUnplug
xmlTextReaderSetErrorHandler
xmlTextReaderSetStructuredErrorHandler
+xmlXPathNodeEval
restrictxmlParseExternalID
restrictionXML_SCHEMAS_BLOCK_DEFAULT_RESTRICTION
XML_SCHEMAS_ELEM_BLOCK_RESTRICTION
diff --git a/doc/APIchunk24.html b/doc/APIchunk24.html
index cd45121b..e81f34da 100644
--- a/doc/APIchunk24.html
+++ b/doc/APIchunk24.html
@@ -40,7 +40,6 @@ A:link, A:visited, A:active { text-decoration: underline }
Letter s:
- s390
- XML_CAST_FPTR
- safe
- BAD_CAST
xmlInitializeCatalog
-xmlInitializeDict
xmlLoadCatalog
xmlLoadCatalogs
- safety
- XML_MAX_DICTIONARY_LIMIT
@@ -68,6 +67,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlXPathNextFollowing
xmlXPathNextPreceding
xmlXPathNormalizeFunction
+xmlXPathSetContextNode
- save
- htmlNodeDumpFileFormat
xmlGcMemGet
xmlMemGet
@@ -645,7 +645,6 @@ A:link, A:visited, A:active { text-decoration: underline }
- startup
- setDocumentLocator
setDocumentLocatorSAXFunc
xmlInitializeCatalog
-xmlInitializeDict
xmlLoadCatalog
xmlLoadCatalogs
xmlSAX2SetDocumentLocator
@@ -902,6 +901,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlTextReaderSetParserProp
xmlUnsetNsProp
xmlUnsetProp
+xmlXPathSetContextNode
- successfully
- xmlTextReaderNext
xmlTextReaderNextSibling
xmlTextReaderRead
diff --git a/doc/APIchunk25.html b/doc/APIchunk25.html
index de57ec44..dec65ba5 100644
--- a/doc/APIchunk25.html
+++ b/doc/APIchunk25.html
@@ -173,7 +173,6 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlGetThreadId
xmlInitThreads
xmlInitializeCatalog
-xmlInitializeDict
xmlIsMainThread
xmlLoadCatalog
xmlLoadCatalogs
diff --git a/doc/APIchunk26.html b/doc/APIchunk26.html
index 50e814f8..17666cf5 100644
--- a/doc/APIchunk26.html
+++ b/doc/APIchunk26.html
@@ -298,6 +298,7 @@ A:link, A:visited, A:active { text-decoration: underline }
- void
- XML_CAST_FPTR
xmlSAXParseFileWithData
xmlSAXParseMemoryWithData
+ - volume
- _xmlParserCtxt
A-B
C-C
D-E
diff --git a/doc/APIchunk28.html b/doc/APIchunk28.html
index a009f5ff..c5993f9f 100644
--- a/doc/APIchunk28.html
+++ b/doc/APIchunk28.html
@@ -498,6 +498,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlXPathNewNodeSetList
xmlXPathNewString
xmlXPathNewValueTree
+xmlXPathNodeEval
xmlXPathWrapNodeSet
xmlXPtrEval
xmlXPtrLocationSetAdd
diff --git a/doc/APIchunk4.html b/doc/APIchunk4.html
index cbafa23b..d26883bb 100644
--- a/doc/APIchunk4.html
+++ b/doc/APIchunk4.html
@@ -91,6 +91,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlSplitQName
xmlSplitQName2
LocationxmlXPathEval
+xmlXPathNodeEval
xmlXPtrEval
xmlXPtrEvalRangePredicate
LocationSetxmlXPtrFreeLocationSet
diff --git a/doc/APIchunk5.html b/doc/APIchunk5.html
index e4c9550f..da60d1ae 100644
--- a/doc/APIchunk5.html
+++ b/doc/APIchunk5.html
@@ -149,6 +149,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlSchemaGetBuiltInListSimpleTypeItemType
PathxmlGetNodePath
xmlXPathEval
+xmlXPathNodeEval
xmlXPtrEval
PeoplexmlEncodeEntities
PhoneticExtensionsxmlUCSIsPhoneticExtensions
diff --git a/doc/APIchunk7.html b/doc/APIchunk7.html
index c556bb2e..3f46f99d 100644
--- a/doc/APIchunk7.html
+++ b/doc/APIchunk7.html
@@ -185,6 +185,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlXPathNodeLeadingSorted
xmlXPathNodeTrailing
xmlXPathNodeTrailingSorted
+xmlXPathSetContextNode
xmlXPathTrailing
xmlXPathTrailingSorted
SettingxmlSchemaValidateSetLocator
diff --git a/doc/APIconstructors.html b/doc/APIconstructors.html
index c6c4475f..d5ca488c 100644
--- a/doc/APIconstructors.html
+++ b/doc/APIconstructors.html
@@ -571,6 +571,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlXPathNewNodeSetList
xmlXPathNewString
xmlXPathNewValueTree
+xmlXPathNodeEval
xmlXPathObjectCopy
xmlXPathVariableLookup
xmlXPathVariableLookupFunc
diff --git a/doc/APIfiles.html b/doc/APIfiles.html
index 498f6e41..65e004be 100644
--- a/doc/APIfiles.html
+++ b/doc/APIfiles.html
@@ -2026,6 +2026,7 @@ A:link, A:visited, A:active { text-decoration: underline }
XML_ERR_UNSUPPORTED_ENCODING
XML_ERR_URI_FRAGMENT
XML_ERR_URI_REQUIRED
+XML_ERR_USER_STOP
XML_ERR_VALUE_REQUIRED
XML_ERR_VERSION_MISMATCH
XML_ERR_VERSION_MISSING
@@ -3199,6 +3200,7 @@ A:link, A:visited, A:active { text-decoration: underline }
LIBXML_SCHEMAS_ENABLED
LIBXML_SCHEMATRON_ENABLED
LIBXML_TEST_VERSION
+LIBXML_THREAD_ALLOC_ENABLED
LIBXML_THREAD_ENABLED
LIBXML_TREE_ENABLED
LIBXML_UNICODE_ENABLED
@@ -3396,6 +3398,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlXPathNAN
xmlXPathNINF
xmlXPathNewContext
+xmlXPathNodeEval
xmlXPathNodeSetCreate
xmlXPathNodeSetGetLength
xmlXPathNodeSetIsEmpty
@@ -3408,6 +3411,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlXPathPINF
xmlXPathParserContext
xmlXPathParserContextPtr
+xmlXPathSetContextNode
xmlXPathType
xmlXPathTypePtr
xmlXPathVariable
diff --git a/doc/APIfunctions.html b/doc/APIfunctions.html
index 68eeb140..3c478636 100644
--- a/doc/APIfunctions.html
+++ b/doc/APIfunctions.html
@@ -489,6 +489,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlXPathIsNodeType
xmlXPathNewParserContext
xmlXPathNewString
+xmlXPathNodeEval
xmlXPathNsLookup
xmlXPathRegisterFunc
xmlXPathRegisterFuncNS
@@ -1582,6 +1583,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlXPathNextPreceding
xmlXPathNextPrecedingSibling
xmlXPathNextSelf
+xmlXPathNodeEval
xmlXPathNodeLeading
xmlXPathNodeLeadingSorted
xmlXPathNodeSetAdd
@@ -1592,6 +1594,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlXPathNodeSetDel
xmlXPathNodeTrailing
xmlXPathNodeTrailingSorted
+xmlXPathSetContextNode
xmlXPtrNewCollapsedRange
xmlXPtrNewContext
xmlXPtrNewLocationSetNodes
@@ -2226,6 +2229,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlXPathFunctionLookup
xmlXPathFunctionLookupNS
xmlXPathNewParserContext
+xmlXPathNodeEval
xmlXPathNsLookup
xmlXPathRegisterAllFunctions
xmlXPathRegisterFunc
@@ -2238,6 +2242,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlXPathRegisteredFuncsCleanup
xmlXPathRegisteredNsCleanup
xmlXPathRegisteredVariablesCleanup
+xmlXPathSetContextNode
xmlXPathVariableLookup
xmlXPathVariableLookupNS
xmlXPtrEval
diff --git a/doc/APIsymbols.html b/doc/APIsymbols.html
index fa9f4c85..c2b82e7d 100644
--- a/doc/APIsymbols.html
+++ b/doc/APIsymbols.html
@@ -92,6 +92,7 @@ A:link, A:visited, A:active { text-decoration: underline }
LIBXML_SCHEMAS_ENABLED
LIBXML_SCHEMATRON_ENABLED
LIBXML_TEST_VERSION
+LIBXML_THREAD_ALLOC_ENABLED
LIBXML_THREAD_ENABLED
LIBXML_TREE_ENABLED
LIBXML_UNICODE_ENABLED
@@ -425,6 +426,7 @@ A:link, A:visited, A:active { text-decoration: underline }
XML_ERR_UNSUPPORTED_ENCODING
XML_ERR_URI_FRAGMENT
XML_ERR_URI_REQUIRED
+XML_ERR_USER_STOP
XML_ERR_VALUE_REQUIRED
XML_ERR_VERSION_MISMATCH
XML_ERR_VERSION_MISSING
@@ -3467,6 +3469,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlXPathNextPreceding
xmlXPathNextPrecedingSibling
xmlXPathNextSelf
+xmlXPathNodeEval
xmlXPathNodeLeading
xmlXPathNodeLeadingSorted
xmlXPathNodeSetAdd
@@ -3528,6 +3531,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlXPathRoot
xmlXPathRoundFunction
xmlXPathSetArityError
+xmlXPathSetContextNode
xmlXPathSetError
xmlXPathSetTypeError
xmlXPathStackIsExternal
diff --git a/doc/devhelp/libxml2-dict.html b/doc/devhelp/libxml2-dict.html
index dd42a012..fd5f6b9a 100644
--- a/doc/devhelp/libxml2-dict.html
+++ b/doc/devhelp/libxml2-dict.html
@@ -125,7 +125,7 @@ The content of this structure is not made public by the API.
| dict: | the dictionnary |
| Returns: | the number of elements in the dictionnary or -1 in case of error |
xmlInitializeDict ()
int xmlInitializeDict (void)
-
Do the dictionary mutex initialization. this function is not thread safe, initialization should preferably be done once at startup
+
Do the dictionary mutex initialization. this function is deprecated
| Returns: | 0 if initialization was already done, and 1 if that call led to the initialization |
diff --git a/doc/devhelp/libxml2-xmlerror.html b/doc/devhelp/libxml2-xmlerror.html
index 4ebaa60f..27f78366 100644
--- a/doc/devhelp/libxml2-xmlerror.html
+++ b/doc/devhelp/libxml2-xmlerror.html
@@ -252,6 +252,7 @@ void xmlResetError (XML_ERR_UNKNOWN_VERSION = 108 /* 108 */
XML_ERR_VERSION_MISMATCH = 109 /* 109 */
XML_ERR_NAME_TOO_LONG = 110 /* 110 */
+ XML_ERR_USER_STOP = 111 /* 111 */
XML_NS_ERR_XML_NAMESPACE = 200
XML_NS_ERR_UNDEFINED_NAMESPACE = 201 /* 201 */
XML_NS_ERR_QNAME = 202 /* 202 */
diff --git a/doc/devhelp/libxml2.devhelp b/doc/devhelp/libxml2.devhelp
index 8939af02..282546ab 100644
--- a/doc/devhelp/libxml2.devhelp
+++ b/doc/devhelp/libxml2.devhelp
@@ -615,6 +615,7 @@
+
diff --git a/doc/html/libxml-dict.html b/doc/html/libxml-dict.html
index 81afd152..bdd21f4f 100644
--- a/doc/html/libxml-dict.html
+++ b/doc/html/libxml-dict.html
@@ -54,5 +54,5 @@ The content of this structure is not made public by the API.
| dict: | the dictionnary |
| limit: | the limit in bytes |
| Returns: | the previous limit of the dictionary or 0 |
Function: xmlDictSize
int xmlDictSize (xmlDictPtr dict)
Query the number of elements installed in the hash @dict.
| dict: | the dictionnary |
| Returns: | the number of elements in the dictionnary or -1 in case of error |
Function: xmlInitializeDict
int xmlInitializeDict (void)
-
Do the dictionary mutex initialization. this function is not thread safe, initialization should preferably be done once at startup
+Do the dictionary mutex initialization. this function is deprecated
| Returns: | 0 if initialization was already done, and 1 if that call led to the initialization |
Daniel Veillard