diff options
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/xml/CREDITS | 2 | ||||
| -rw-r--r-- | ext/xml/compat.c | 369 | ||||
| -rw-r--r-- | ext/xml/config.m4 | 29 | ||||
| -rw-r--r-- | ext/xml/expat_compat.h | 123 | ||||
| -rw-r--r-- | ext/xml/php_xml.h | 10 | ||||
| -rw-r--r-- | ext/xml/xml.c | 16 |
6 files changed, 511 insertions, 38 deletions
diff --git a/ext/xml/CREDITS b/ext/xml/CREDITS index 9f781a8c9c..b9cbfdd5af 100644 --- a/ext/xml/CREDITS +++ b/ext/xml/CREDITS @@ -1,2 +1,2 @@ XML -Stig Bakken, Thies C. Arntzen +Stig Bakken, Thies C. Arntzen, Sterling Hughes diff --git a/ext/xml/compat.c b/ext/xml/compat.c new file mode 100644 index 0000000000..8176631fa0 --- /dev/null +++ b/ext/xml/compat.c @@ -0,0 +1,369 @@ +/* + +----------------------------------------------------------------------+ + | PHP Version 4 | + +----------------------------------------------------------------------+ + | Copyright (c) 1997-2003 The PHP Group | + +----------------------------------------------------------------------+ + | This source file is subject to version 2.02 of the PHP license, | + | that is bundled with this package in the file LICENSE, and is | + | available at through the world-wide-web at | + | http://www.php.net/license/2_02.txt. | + | If you did not receive a copy of the PHP license and are unable to | + | obtain it through the world-wide-web, please send a note to | + | license@php.net so we can mail you a copy immediately. | + +----------------------------------------------------------------------+ + | Authors: Sterling Hughes <sterling@php.net> | + +----------------------------------------------------------------------+ + */ + +#include "php.h" +#include "expat_compat.h" + +#ifdef LIBXML_EXPAT_COMPAT + +#define IS_NS_DECL(__ns) \ + ((__ns) != NULL && strlen(__ns) == 5 && *(__ns) == 'x' && *((__ns)+1) == 'm' && \ + *((__ns)+2) == 'l' && *((__ns)+3) == 'n' && *((__ns)+4) == 's') + +static void +_find_namespace_decl(XML_Parser parser, const xmlChar *tagname, const xmlChar **attr) +{ + xmlChar **attr_p = (xmlChar **) attr; + xmlChar *name; + xmlChar *value; + xmlChar *partial; + xmlChar *namespace; + + while (attr_p && *attr_p) { + name = attr_p[0]; + value = xmlStrdup(attr_p[1]); + + partial = xmlSplitQName(parser->parser, name, &namespace); + if (IS_NS_DECL(namespace)) { + if (parser->h_start_ns) { + parser->h_start_ns(parser->user, partial, (const XML_Char *) value); + } + xmlHashAddEntry(parser->_ns_map, partial, value); + xmlHashAddEntry(parser->_reverse_ns_map, tagname, xmlStrdup(partial)); + break; + } + + xmlFree(value); + attr_p += 2; + } +} + +static void +_qualify_namespace(XML_Parser parser, const xmlChar *name, xmlChar **qualified) +{ + xmlChar *partial; + xmlChar *namespace; + int len; + + partial = xmlSplitQName(parser->parser, name, &namespace); + if (namespace) { + xmlChar *nsvalue; + + nsvalue = xmlHashLookup(parser->_ns_map, namespace); + if (nsvalue) { + len = strlen(nsvalue) + strlen(partial) + 1; /* colon */ + *qualified = malloc(len+1); + memcpy(*qualified, nsvalue, strlen(nsvalue)); + memcpy(*qualified + strlen(nsvalue), ":", 1); + memcpy(*qualified + strlen(nsvalue) + 1, partial, strlen(partial)); + (*qualified)[len] = '\0'; + } else { + *qualified = xmlStrdup(name); + } + } else { + *qualified = xmlStrdup(name); + } +} + +static void +_start_element_handler(void *user, const xmlChar *name, const xmlChar **attributes) +{ + XML_Parser parser = (XML_Parser) user; + xmlChar *qualified_name = NULL; + + if (parser->namespace) { + _find_namespace_decl(parser, name, attributes); + _qualify_namespace(parser, name, &qualified_name); + } else { + qualified_name = xmlStrdup(name); + } + + parser->h_start_element(parser->user, (const XML_Char *) qualified_name, (const XML_Char **) attributes); + + xmlFree(qualified_name); +} + +static void +_end_element_handler(void *user, const xmlChar *name) +{ + xmlChar *qualified_name; + XML_Parser parser = (XML_Parser) user; + + if (parser->namespace) { + xmlChar *nsname; + + nsname = xmlHashLookup(parser->_reverse_ns_map, name); + if (nsname && parser->h_end_ns) { + parser->h_end_ns(parser->user, nsname); + } + + _qualify_namespace(parser, name, &qualified_name); + } else { + qualified_name = xmlStrdup(name); + } + + parser->h_end_element(parser->user, (const XML_Char *) qualified_name); + + xmlFree(qualified_name); +} + +static void +_cdata_handler(void *user, const xmlChar *cdata, int cdata_len) +{ + XML_Parser parser = (XML_Parser) user; + + parser->h_cdata(parser->user, (const XML_Char *) cdata, cdata_len); +} + +static void +_pi_handler(void *user, const xmlChar *target, const xmlChar *data) +{ + XML_Parser parser = (XML_Parser) user; + + parser->h_pi(parser->user, (const XML_Char *) target, (const XML_Char *) data); +} + +static void +_unparsed_entity_decl_handler(void *user, + const xmlChar *name, + const xmlChar *sys_id, + const xmlChar *pub_id, + const xmlChar *notation) +{ + XML_Parser parser = (XML_Parser) user; + + parser->h_unparsed_entity_decl(parser->user, name, NULL, sys_id, pub_id, notation); +} + +static void +_notation_decl_handler(void *user, const xmlChar *notation, const xmlChar *sys_id, const xmlChar *pub_id) +{ + XML_Parser parser = (XML_Parser) user; + + parser->h_notation_decl(parser->user, notation, NULL, sys_id, pub_id); +} + +static void +_external_entity_ref_handler(void *user, const xmlChar *names, int type, const xmlChar *sys_id, const xmlChar *pub_id, xmlChar *content) +{ + XML_Parser parser = (XML_Parser) user; + + parser->h_external_entity_ref(parser->user, names, NULL, sys_id, pub_id); +} + +static xmlSAXHandler +php_xml_compat_handlers = { + NULL, /* internalSubset */ + NULL, /* isStandalone */ + NULL, /* hasInternalSubset */ + NULL, /* hasExternalSubset */ + NULL, /* resolveEntity */ + NULL, /* getEntity */ + _external_entity_ref_handler, /* entityDecl */ + _notation_decl_handler, + NULL, /* attributeDecl */ + NULL, /* elementDecl */ + _unparsed_entity_decl_handler, /* unparsedEntity */ + NULL, /* setDocumentLocator */ + NULL, /* startDocument */ + NULL, /* endDocument */ + _start_element_handler, + _end_element_handler, + NULL, /* reference */ + _cdata_handler, + NULL, /* ignorableWhitespace */ + _pi_handler, + NULL, /* comment */ + NULL, /* warning */ + NULL, /* error */ + NULL /* fatalError */ +}; + +XML_Parser +XML_ParserCreate(const XML_Char *encoding) +{ + XML_Parser parser; + + parser = (XML_Parser) calloc(1, sizeof(struct _XML_Parser)); + parser->parser = xmlCreatePushParserCtxt((xmlSAXHandlerPtr) &php_xml_compat_handlers, (void *) parser, NULL, 0, NULL); + if (parser->parser == NULL) { + return NULL; + } + parser->parser->encoding = xmlStrdup(encoding); + + return parser; +} + +XML_Parser +XML_ParserCreateNS(const XML_Char *encoding, const XML_Char sep) +{ + XML_Parser parser; + + parser = (XML_Parser) calloc(1, sizeof(struct _XML_Parser)); + parser->parser = xmlCreatePushParserCtxt((xmlSAXHandlerPtr) &php_xml_compat_handlers, (void *) parser, NULL, 0, NULL); + if (parser->parser == NULL) { + return NULL; + } + parser->parser->encoding = xmlStrdup(encoding); + parser->namespace = 1; + parser->_ns_map = xmlHashCreate(10); + parser->_reverse_ns_map = xmlHashCreate(10); + + return parser; +} + +void +XML_SetUserData(XML_Parser parser, void *user) +{ + parser->user = user; +} + +void * +XML_GetUserData(XML_Parser parser) +{ + return parser->user; +} + +void +XML_SetElementHandler(XML_Parser parser, XML_StartElementHandler start, XML_EndElementHandler end) +{ + parser->h_start_element = start; + parser->h_end_element = end; +} + +void +XML_SetCharacterDataHandler(XML_Parser parser, XML_CharacterDataHandler cdata) +{ + parser->h_cdata = cdata; +} + +void +XML_SetProcessingInstructionHandler(XML_Parser parser, XML_ProcessingInstructionHandler pi) +{ + parser->h_pi = pi; +} + +void +XML_SetDefaultHandler(XML_Parser parser, XML_DefaultHandler d) +{ + parser->h_default = d; +} + +void +XML_SetUnparsedEntityDeclHandler(XML_Parser parser, XML_UnparsedEntityDeclHandler unparsed_decl) +{ + parser->h_unparsed_entity_decl = unparsed_decl; +} + +void +XML_SetNotationDeclHandler(XML_Parser parser, XML_NotationDeclHandler notation_decl) +{ + parser->h_notation_decl = notation_decl; +} + +void +XML_SetExternalEntityRefHandler(XML_Parser parser, XML_ExternalEntityRefHandler ext_entity) +{ + parser->h_external_entity_ref = ext_entity; +} + +void +XML_SetStartNamespaceDeclHandler(XML_Parser parser, XML_StartNamespaceDeclHandler start_ns) +{ + parser->h_start_ns = start_ns; +} + +void +XML_SetEndNamespaceDeclHandler(XML_Parser parser, XML_EndNamespaceDeclHandler end_ns) +{ + parser->h_end_ns = end_ns; +} + +int +XML_Parse(XML_Parser parser, const XML_Char *data, int data_len, int is_final) +{ + return !xmlParseChunk(parser->parser, data, data_len, is_final); +} + +int +XML_GetErrorCode(XML_Parser parser) +{ + return parser->parser->errNo; +} + +const XML_Char *error_mapping[] = { + "Unknown Error" +}; + +const XML_Char * +XML_ErrorString(int code) +{ + return error_mapping[code]; +} + +int +XML_GetCurrentLineNumber(XML_Parser parser) +{ + return parser->parser->input->line; +} + +int +XML_GetCurrentColumnNumber(XML_Parser parser) +{ + return parser->parser->input->col; +} + +int +XML_GetCurrentByteIndex(XML_Parser parser) +{ + return parser->parser->input->consumed; +} + +const XML_Char *XML_ExpatVersion(void) +{ + return "1.0"; +} + +static void +_free_ns_name(void *ptr, xmlChar *name) +{ + xmlFree(ptr); +} + +void +XML_ParserFree(XML_Parser parser) +{ + if (parser->namespace) { + xmlHashFree(parser->_ns_map, _free_ns_name); + xmlHashFree(parser->_reverse_ns_map, _free_ns_name); + } + xmlFreeParserCtxt(parser->parser); + free(parser); +} + +#endif /* LIBXML_EXPAT_COMPAT */ + +/** + * Local Variables: + * tab-width: 4 + * c-basic-offset: 4 + * indent-tabs-mode: t + * End: + * vim600: fdm=marker + * vim: ts=4 noet sw=4 + */ diff --git a/ext/xml/config.m4 b/ext/xml/config.m4 index 40dabd3e86..c4c2de4aa6 100644 --- a/ext/xml/config.m4 +++ b/ext/xml/config.m4 @@ -5,31 +5,12 @@ dnl PHP_ARG_ENABLE(xml,whether to enable XML support, [ --disable-xml Disable XML support using bundled expat lib], yes) -PHP_ARG_WITH(expat-dir, external libexpat install dir, -[ --with-expat-dir=DIR XML: external libexpat install dir], no, no) - if test "$PHP_XML" = "yes"; then - AC_DEFINE(HAVE_LIBEXPAT, 1, [ ]) - - if test "$PHP_EXPAT_DIR" = "no" && test "$PHP_BUNDLE_EXPAT" = "no"; then - AC_MSG_ERROR(xml support is enabled, however the expat bundle is disabled and no external expat directory was specified.) - fi - - if test "$PHP_EXPAT_DIR" != "no"; then - for i in $PHP_XML $PHP_EXPAT_DIR; do - if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.$SHLIB_SUFFIX_NAME ; then - EXPAT_DIR=$i - fi - done - - if test -z "$EXPAT_DIR"; then - AC_MSG_ERROR(not found. Please reinstall the expat distribution.) - fi + AC_DEFINE(HAVE_XML, 1, [ ]) - PHP_ADD_INCLUDE($EXPAT_DIR/include) - PHP_ADD_LIBRARY_WITH_PATH(expat, $EXPAT_DIR/lib, XML_SHARED_LIBADD) - PHP_SUBST(XML_SHARED_LIBADD) - fi + if test "$PHP_BUNDLE_EXPAT" = "no" && test "$PHP_BUNDLE_LIBXML" = "no"; then + AC_MSG_ERROR(xml support is enabled, however both xml libraries have been disabled.) + fi - PHP_NEW_EXTENSION(xml, xml.c, $ext_shared) + PHP_NEW_EXTENSION(xml, compat.c xml.c, $ext_shared) fi diff --git a/ext/xml/expat_compat.h b/ext/xml/expat_compat.h new file mode 100644 index 0000000000..1ece0bd608 --- /dev/null +++ b/ext/xml/expat_compat.h @@ -0,0 +1,123 @@ +/* + +----------------------------------------------------------------------+ + | PHP Version 4 | + +----------------------------------------------------------------------+ + | Copyright (c) 1997-2003 The PHP Group | + +----------------------------------------------------------------------+ + | This source file is subject to version 2.02 of the PHP license, | + | that is bundled with this package in the file LICENSE, and is | + | available at through the world-wide-web at | + | http://www.php.net/license/2_02.txt. | + | If you did not receive a copy of the PHP license and are unable to | + | obtain it through the world-wide-web, please send a note to | + | license@php.net so we can mail you a copy immediately. | + +----------------------------------------------------------------------+ + | Authors: Sterling Hughes <sterling@php.net> | + +----------------------------------------------------------------------+ +*/ + +/* $Id$ */ + +#ifndef PHP_EXPAT_COMPAT_H +#define PHP_EXPAT_COMPAT_H + +#if !defined(HAVE_LIBEXPAT) && defined(HAVE_LIBXML) +#define LIBXML_EXPAT_COMPAT 1 + +#include <libxml.h> +#include <libxml/hash.h> +#include <libxml/parser.h> +#include <libxml/parserInternals.h> +#include <libxml/tree.h> + +typedef xmlChar XML_Char; + +typedef void (*XML_StartElementHandler)(void *, const XML_Char *, const XML_Char **); +typedef void (*XML_EndElementHandler)(void *, const XML_Char *); +typedef void (*XML_CharacterDataHandler)(void *, const XML_Char *, int); +typedef void (*XML_ProcessingInstructionHandler)(void *, const XML_Char *, const XML_Char *); +typedef void (*XML_DefaultHandler)(void *, const XML_Char *, int); +typedef void (*XML_UnparsedEntityDeclHandler)(void *, const XML_Char *, const XML_Char *, const XML_Char *, const XML_Char *, const XML_Char *); +typedef void (*XML_NotationDeclHandler)(void *, const XML_Char *, const XML_Char *, const XML_Char *, const XML_Char *); +typedef int (*XML_ExternalEntityRefHandler)(void *, const XML_Char *, const XML_Char *, const XML_Char *, const XML_Char *); +typedef void (*XML_StartNamespaceDeclHandler)(void *, const XML_Char *, const XML_Char *); +typedef void (*XML_EndNamespaceDeclHandler)(void *, const XML_Char *); + +typedef struct _XML_Parser { + int namespace; + + xmlHashTablePtr _ns_map; + xmlHashTablePtr _reverse_ns_map; + + void *user; + xmlParserCtxtPtr parser; + + XML_StartElementHandler h_start_element; + XML_EndElementHandler h_end_element; + XML_CharacterDataHandler h_cdata; + XML_ProcessingInstructionHandler h_pi; + XML_DefaultHandler h_default; + XML_UnparsedEntityDeclHandler h_unparsed_entity_decl; + XML_NotationDeclHandler h_notation_decl; + XML_ExternalEntityRefHandler h_external_entity_ref; + XML_StartNamespaceDeclHandler h_start_ns; + XML_EndNamespaceDeclHandler h_end_ns; +} *XML_Parser; + +XML_Parser XML_ParserCreate(const XML_Char *); +XML_Parser XML_ParserCreateNS(const XML_Char *, const XML_Char); +void XML_SetUserData(XML_Parser, void *); +void *XML_GetUserData(XML_Parser); +void XML_SetElementHandler(XML_Parser, XML_StartElementHandler, XML_EndElementHandler); +void XML_SetCharacterDataHandler(XML_Parser, XML_CharacterDataHandler); +void XML_SetProcessingInstructionHandler(XML_Parser, XML_ProcessingInstructionHandler); +void XML_SetDefaultHandler(XML_Parser, XML_DefaultHandler); +void XML_SetUnparsedEntityDeclHandler(XML_Parser, XML_UnparsedEntityDeclHandler); +void XML_SetNotationDeclHandler(XML_Parser, XML_NotationDeclHandler); +void XML_SetExternalEntityRefHandler(XML_Parser, XML_ExternalEntityRefHandler); +void XML_SetStartNamespaceDeclHandler(XML_Parser, XML_StartNamespaceDeclHandler); +void XML_SetEndNamespaceDeclHandler(XML_Parser, XML_EndNamespaceDeclHandler); +int XML_Parse(XML_Parser, const XML_Char *, int data_len, int is_final); +int XML_GetErrorCode(XML_Parser); +const XML_Char *XML_ErrorString(int); +int XML_GetCurrentLineNumber(XML_Parser); +int XML_GetCurrentColumnNumber(XML_Parser); +int XML_GetCurrentByteIndex(XML_Parser); +const XML_Char *XML_ExpatVersion(void); +void XML_ParserFree(XML_Parser); + +#define XML_ERROR_NONE 0 +#define XML_ERROR_NO_MEMORY 0 +#define XML_ERROR_SYNTAX 0 +#define XML_ERROR_NO_ELEMENTS 0 +#define XML_ERROR_INVALID_TOKEN 0 +#define XML_ERROR_UNCLOSED_TOKEN 0 +#define XML_ERROR_PARTIAL_CHAR 0 +#define XML_ERROR_TAG_MISMATCH 0 +#define XML_ERROR_DUPLICATE_ATTRIBUTE 0 +#define XML_ERROR_JUNK_AFTER_DOC_ELEMENT 0 +#define XML_ERROR_PARAM_ENTITY_REF 0 +#define XML_ERROR_UNDEFINED_ENTITY 0 +#define XML_ERROR_RECURSIVE_ENTITY_REF 0 +#define XML_ERROR_ASYNC_ENTITY 0 +#define XML_ERROR_BAD_CHAR_REF 0 +#define XML_ERROR_BINARY_ENTITY_REF 0 +#define XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF 0 +#define XML_ERROR_MISPLACED_XML_PI 0 +#define XML_ERROR_UNKNOWN_ENCODING 0 +#define XML_ERROR_INCORRECT_ENCODING 0 +#define XML_ERROR_UNCLOSED_CDATA_SECTION 0 +#define XML_ERROR_EXTERNAL_ENTITY_HANDLING 0 + +#else +#include <expat.h> +#endif /* HAVE_LIBEXPAT */ + +#endif /* PHP_EXPAT_COMPAT_H */ + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + */ diff --git a/ext/xml/php_xml.h b/ext/xml/php_xml.h index 7fef7c6070..ca77d3d224 100644 --- a/ext/xml/php_xml.h +++ b/ext/xml/php_xml.h @@ -22,20 +22,16 @@ #ifndef PHP_XML_H #define PHP_XML_H -#ifdef HAVE_LIBEXPAT - +#ifdef HAVE_XML extern zend_module_entry xml_module_entry; #define xml_module_ptr &xml_module_entry - #else - #define xml_module_ptr NULL - #endif -#if defined(PHP_XML_INTERNAL) +#ifdef HAVE_XML -#include <expat.h> +#include "ext/xml/expat_compat.h" #ifdef PHP_WIN32 #define PHP_XML_API __declspec(dllexport) diff --git a/ext/xml/xml.c b/ext/xml/xml.c index 15cae13b7b..04b654fae3 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -28,13 +28,13 @@ #include "php.h" #define PHP_XML_INTERNAL -#include "php_xml.h" #include "zend_variables.h" #include "ext/standard/php_string.h" #include "ext/standard/info.h" -#if HAVE_LIBEXPAT +#if HAVE_XML +#include "php_xml.h" # include "ext/standard/head.h" /* Short-term TODO list: @@ -85,8 +85,8 @@ static int _xml_xmlcharlen(const XML_Char *); static void _xml_add_to_info(xml_parser *parser,char *name); inline static char *_xml_decode_tag(xml_parser *parser, const char *tag); -void _xml_startElementHandler(void *, const char *, const char **); -void _xml_endElementHandler(void *, const char *); +void _xml_startElementHandler(void *, const XML_Char *, const XML_Char **); +void _xml_endElementHandler(void *, const XML_Char *); void _xml_characterDataHandler(void *, const XML_Char *, int); void _xml_processingInstructionHandler(void *, const XML_Char *, const XML_Char *); void _xml_defaultHandler(void *, const XML_Char *, int); @@ -202,6 +202,10 @@ PHP_MINIT_FUNCTION(xml) REGISTER_LONG_CONSTANT("XML_OPTION_TARGET_ENCODING", PHP_XML_OPTION_TARGET_ENCODING, CONST_CS|CONST_PERSISTENT); REGISTER_LONG_CONSTANT("XML_OPTION_SKIP_TAGSTART", PHP_XML_OPTION_SKIP_TAGSTART, CONST_CS|CONST_PERSISTENT); REGISTER_LONG_CONSTANT("XML_OPTION_SKIP_WHITE", PHP_XML_OPTION_SKIP_WHITE, CONST_CS|CONST_PERSISTENT); + +#ifdef LIBXML_EXPAT_COMPAT + xmlMemSetup(_efree, _emalloc, _erealloc, _estrdup); +#endif return SUCCESS; } @@ -615,7 +619,7 @@ static char *_xml_decode_tag(xml_parser *parser, const char *tag) /* }}} */ /* {{{ _xml_startElementHandler() */ -void _xml_startElementHandler(void *userData, const char *name, const char **attributes) +void _xml_startElementHandler(void *userData, const XML_Char *name, const XML_Char **attributes) { xml_parser *parser = (xml_parser *)userData; const char **attrs = attributes; @@ -701,7 +705,7 @@ void _xml_startElementHandler(void *userData, const char *name, const char **att /* }}} */ /* {{{ _xml_endElementHandler() */ -void _xml_endElementHandler(void *userData, const char *name) +void _xml_endElementHandler(void *userData, const XML_Char *name) { xml_parser *parser = (xml_parser *)userData; char *tag_name; |