diff options
Diffstat (limited to 'ext/xml')
| -rw-r--r-- | ext/xml/compat.c | 40 | ||||
| -rw-r--r-- | ext/xml/config.m4 | 4 | ||||
| -rw-r--r-- | ext/xml/expat_compat.h | 5 |
3 files changed, 26 insertions, 23 deletions
diff --git a/ext/xml/compat.c b/ext/xml/compat.c index 2a3d097ead..41f5d42012 100644 --- a/ext/xml/compat.c +++ b/ext/xml/compat.c @@ -39,7 +39,7 @@ _qualify_namespace(XML_Parser parser, const xmlChar *name, const xmlChar *URI, x if (URI) { /* Use libxml functions otherwise its memory deallocation is screwed up */ *qualified = xmlStrdup(URI); - *qualified = xmlStrncat(*qualified, parser->_ns_seperator, 1); + *qualified = xmlStrncat(*qualified, parser->_ns_separator, 1); *qualified = xmlStrncat(*qualified, name, xmlStrlen(name)); } else { *qualified = xmlStrdup(name); @@ -469,7 +469,7 @@ XML_ParserCreate_MM(const XML_Char *encoding, const XML_Memory_Handling_Suite *m parser = (XML_Parser) emalloc(sizeof(struct _XML_Parser)); memset(parser, 0, sizeof(struct _XML_Parser)); parser->use_namespace = 0; - parser->_ns_seperator = NULL; + parser->_ns_separator = NULL; parser->parser = xmlCreatePushParserCtxt((xmlSAXHandlerPtr) &php_xml_compat_handlers, (void *) parser, NULL, 0, NULL); if (parser->parser == NULL) { @@ -491,7 +491,7 @@ XML_ParserCreate_MM(const XML_Char *encoding, const XML_Memory_Handling_Suite *m if (sep != NULL) { parser->use_namespace = 1; parser->parser->sax2 = 1; - parser->_ns_seperator = xmlStrdup(sep); + parser->_ns_separator = xmlStrdup(sep); } else { /* Reset flag as XML_SAX2_MAGIC is needed for xmlCreatePushParserCtxt so must be set in the handlers */ @@ -707,21 +707,21 @@ static const XML_Char *const error_mapping[] = { (const XML_Char *)"Entity value required", (const XML_Char *)"chunk is not well balanced", (const XML_Char *)"extra content at the end of well balanced chunk", - (const XML_Char *)"XML_ERR_ENTITY_CHAR_ERROR", - (const XML_Char *)"PEReferences forbidden in internal subset", - (const XML_Char *)"Detected an entity reference loop", - (const XML_Char *)"XML_ERR_ENTITY_BOUNDARY", - (const XML_Char *)"Invalid URI", - (const XML_Char *)"Fragment not allowed", - (const XML_Char *)"XML_WAR_CATALOG_PI", - (const XML_Char *)"XML_ERR_NO_DTD", - (const XML_Char *)"conditional section INCLUDE or IGNORE keyword expected", /* 95 */ - (const XML_Char *)"Version in XML Declaration missing", /* 96 */ - (const XML_Char *)"XML_WAR_UNKNOWN_VERSION", /* 97 */ - (const XML_Char *)"XML_WAR_LANG_VALUE", /* 98 */ - (const XML_Char *)"XML_WAR_NS_URI", /* 99 */ - (const XML_Char *)"XML_WAR_NS_URI_RELATIVE", /* 100 */ - (const XML_Char *)"Missing encoding in text declaration" /* 101 */ + (const XML_Char *)"XML_ERR_ENTITY_CHAR_ERROR", + (const XML_Char *)"PEReferences forbidden in internal subset", + (const XML_Char *)"Detected an entity reference loop", + (const XML_Char *)"XML_ERR_ENTITY_BOUNDARY", + (const XML_Char *)"Invalid URI", + (const XML_Char *)"Fragment not allowed", + (const XML_Char *)"XML_WAR_CATALOG_PI", + (const XML_Char *)"XML_ERR_NO_DTD", + (const XML_Char *)"conditional section INCLUDE or IGNORE keyword expected", /* 95 */ + (const XML_Char *)"Version in XML Declaration missing", /* 96 */ + (const XML_Char *)"XML_WAR_UNKNOWN_VERSION", /* 97 */ + (const XML_Char *)"XML_WAR_LANG_VALUE", /* 98 */ + (const XML_Char *)"XML_WAR_NS_URI", /* 99 */ + (const XML_Char *)"XML_WAR_NS_URI_RELATIVE", /* 100 */ + (const XML_Char *)"Missing encoding in text declaration" /* 101 */ }; PHPAPI const XML_Char * @@ -770,8 +770,8 @@ PHPAPI void XML_ParserFree(XML_Parser parser) { if (parser->use_namespace) { - if (parser->_ns_seperator) { - xmlFree(parser->_ns_seperator); + if (parser->_ns_separator) { + xmlFree(parser->_ns_separator); } } if (parser->parser->myDoc) { diff --git a/ext/xml/config.m4 b/ext/xml/config.m4 index 65f22915b9..ebfc0471e0 100644 --- a/ext/xml/config.m4 +++ b/ext/xml/config.m4 @@ -7,11 +7,11 @@ PHP_ARG_ENABLE(xml,whether to enable XML support, if test -z "$PHP_LIBXML_DIR"; then PHP_ARG_WITH(libxml-dir, libxml2 install dir, - [ --with-libxml-dir=DIR XML: libxml2 install prefix], no, no) + [ --with-libxml-dir=DIR XML: libxml2 install prefix], no, no) fi PHP_ARG_WITH(libexpat-dir, libexpat install dir, -[ --with-libexpat-dir=DIR XML: libexpat install prefix (deprecated)], no, no) +[ --with-libexpat-dir=DIR XML: libexpat install prefix (deprecated)], no, no) if test "$PHP_XML" != "no"; then diff --git a/ext/xml/expat_compat.h b/ext/xml/expat_compat.h index e693715813..dab9812122 100644 --- a/ext/xml/expat_compat.h +++ b/ext/xml/expat_compat.h @@ -38,6 +38,9 @@ #include <libxml/tree.h> #include <libxml/hash.h> +/* For compatibility with the misspelled version. */ +#define _ns_seperator _ns_separator + typedef xmlChar XML_Char; typedef void (*XML_StartElementHandler)(void *, const XML_Char *, const XML_Char **); @@ -61,7 +64,7 @@ typedef struct _XML_Memory_Handling_Suite { typedef struct _XML_Parser { int use_namespace; - xmlChar *_ns_seperator; + xmlChar *_ns_separator; void *user; xmlParserCtxtPtr parser; |