This commit was manufactured by cvs2svn to create tagphp_ibase_before_split

'php_ibase_before_split'.

20 files changed, 0 insertions, 3413 deletions

diff --git a/ext/xml/CREDITS b/ext/xml/CREDITS
deleted file mode 100644
index b9cbfdd5af..0000000000
--- a/ext/xml/CREDITS
+++ /dev/null
@@ -1,2 +0,0 @@
-XML
-Stig Bakken, Thies C. Arntzen, Sterling Hughes
diff --git a/ext/xml/compat.c b/ext/xml/compat.c
deleted file mode 100644
index d3133678af..0000000000
--- a/ext/xml/compat.c
+++ /dev/null
@@ -1,699 +0,0 @@
-/*
-   +----------------------------------------------------------------------+
-   | PHP Version 5                                                        |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2004 The PHP Group                                |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.0 of the PHP license,       |
-   | that is bundled with this package in the file LICENSE, and is        |
-   | available through the world-wide-web at the following url:           |
-   | http://www.php.net/license/3_0.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"
-#if defined(HAVE_LIBXML) && defined(HAVE_XML) && !defined(HAVE_LIBEXPAT)
-#include "expat_compat.h"
-
-typedef struct _php_xml_ns {
-	xmlNsPtr nsptr;
-	int ref_count;
-	void *next;
-	void *prev;
-} php_xml_ns;
-
-#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;
-	php_xml_ns *cur_ns_scope = NULL;
-	php_xml_ns *exist_ns_scope;
-	xmlNsPtr nsptr, curnsptr;
-
-	exist_ns_scope = xmlHashLookup(parser->_reverse_ns_map, tagname);
-
-	if (exist_ns_scope) {
-		while (exist_ns_scope->next != NULL)
-			exist_ns_scope = exist_ns_scope->next;
-	}
-
-	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);
-			}
-			if (xmlHashLookup(parser->_ns_map, partial) == NULL) {
-				xmlHashAddEntry(parser->_ns_map, partial, value);
-			} else {
-				xmlFree(value);
-			}
-
-			nsptr = (xmlNsPtr) xmlMalloc(sizeof(xmlNs));
-
-			if (nsptr) {
-				memset(nsptr, 0, sizeof(xmlNs));
-				nsptr->type = XML_LOCAL_NAMESPACE;
-
-				if (value != NULL)
-					nsptr->href = xmlStrdup(value); 
-				if (partial != NULL)
-					nsptr->prefix = xmlStrdup(partial);
-
-				if (cur_ns_scope == NULL) {
-					cur_ns_scope = emalloc(sizeof(php_xml_ns));
-					cur_ns_scope->next = NULL;
-					cur_ns_scope->prev = NULL;
-					cur_ns_scope->nsptr = nsptr;
-					cur_ns_scope->ref_count = 0;
-
-					if (exist_ns_scope) {
-						exist_ns_scope->next = cur_ns_scope;
-						cur_ns_scope->prev = exist_ns_scope;
-					} else {
-						xmlHashAddEntry(parser->_reverse_ns_map, tagname, cur_ns_scope);
-					}
-
-					exist_ns_scope = cur_ns_scope;
-				} else {
-					curnsptr = cur_ns_scope->nsptr;
-					while (curnsptr->next != NULL) {
-						curnsptr = curnsptr->next;
-					}
-					curnsptr->next = nsptr;
-				}
-			}
-
-		} else {
-			xmlFree(value);
-		}
-
-		xmlFree(partial);
-		if (namespace != NULL) {
-			xmlFree(namespace);
-		}
-
-		attr_p += 2;
-	}
-
-	if (exist_ns_scope) {
-		exist_ns_scope->ref_count++;
-	}
-}
-
-static void 
-_qualify_namespace(XML_Parser parser, const xmlChar *name, xmlChar **qualified)
-{
-	xmlChar *partial;
-	xmlChar *namespace;
-		
-	partial = xmlSplitQName(parser->parser, name, &namespace);
-	if (namespace) {
-		xmlChar *nsvalue;
-
-		nsvalue = xmlHashLookup(parser->_ns_map, namespace);
-		if (nsvalue) {
-			/* Use libxml functions otherwise its memory deallocation is screwed up */
-			*qualified = xmlStrdup(nsvalue);
-			*qualified = xmlStrncat(*qualified, parser->_ns_seperator, 1);
-			*qualified = xmlStrncat(*qualified, partial, strlen(partial));
-		} else {
-			*qualified = xmlStrdup(name);
-		}
-		xmlFree(namespace);
-	} else {
-		*qualified = xmlStrdup(name);
-	}
-	
-	xmlFree(partial);
-}
-
-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->h_start_element == NULL) {
-		return;
-	}
-	
-	if (parser->use_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
-_namespace_handler(XML_Parser parser, xmlNsPtr nsptr)
-{
-	if (nsptr != NULL) {
-		_namespace_handler(parser, nsptr->next);
-		parser->h_end_ns(parser->user, nsptr->prefix);
-	}
-}
-
-static void
-_end_element_handler(void *user, const xmlChar *name)
-{
-	xmlChar    *qualified_name;
-	XML_Parser  parser = (XML_Parser) user;
-
-	if (parser->h_end_element == NULL) {
-		return;
-	}
-	
-	if (parser->use_namespace) {
-		_qualify_namespace(parser, name, &qualified_name);
-	} else {
-		qualified_name = xmlStrdup(name);
-	}
-
-	parser->h_end_element(parser->user, (const XML_Char *) qualified_name);
-
-	if (parser->use_namespace) {
-		int			tag_counter;
-		php_xml_ns *cur_ns_scope, *prev_ns_scope;
-		xmlNsPtr nsptr;
-
-		cur_ns_scope = xmlHashLookup(parser->_reverse_ns_map, name);
-		if (cur_ns_scope) {
-			while (cur_ns_scope->next != NULL) {
-				cur_ns_scope = cur_ns_scope->next;
-			}
-			tag_counter = --cur_ns_scope->ref_count;
-			if (tag_counter == 0) {
-				nsptr = cur_ns_scope->nsptr;
-				if (nsptr && parser->h_end_ns) {
-					_namespace_handler(parser, nsptr);
-				}
-				xmlFreeNsList(nsptr);
-				cur_ns_scope->nsptr = NULL;
-				prev_ns_scope = cur_ns_scope->prev;
-				if (prev_ns_scope != NULL) {
-					efree(cur_ns_scope);
-					prev_ns_scope->next = NULL;
-				}
-			}
-		}
-	}
-
-	xmlFree(qualified_name);
-}
-
-static void
-_cdata_handler(void *user, const xmlChar *cdata, int cdata_len)
-{
-	XML_Parser parser = (XML_Parser) user;
-
-	if (parser->h_cdata == NULL) {
-		return;
-	}
-
-	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;
-
-	if (parser->h_pi == NULL) {
-		return;
-	}
-
-	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;
-
-	if (parser->h_unparsed_entity_decl == NULL) {
-		return;
-	}
-
-	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;
-
-	if (parser->h_notation_decl == NULL) {
-		return;
-	}
-
-	parser->h_notation_decl(parser->user, notation, NULL, sys_id, pub_id);
-}
-
-static void
-_build_comment(const xmlChar *data, int data_len, xmlChar **comment, int *comment_len)
-{
-	*comment_len = data_len + 6;
-	
-	*comment = xmlMalloc(*comment_len + 1);
-	memcpy(*comment, "<--", 3);
-	memcpy(*comment + 3, data, data_len);
-	memcpy(*comment + 3 + data_len, "-->", 3);
-
-	(*comment)[*comment_len] = '\0';
-}
-
-static void
-_comment_handler(void *user, const xmlChar *comment)
-{
-	XML_Parser parser = (XML_Parser) user;
-
-	if (parser->h_default) {
-		xmlChar *d_comment;
-		int      d_comment_len;
-
-		_build_comment(comment, xmlStrlen(comment), &d_comment, &d_comment_len);
-		parser->h_default(parser->user, d_comment, d_comment_len);
-	}
-}
-
-static void
-_build_entity(const xmlChar *name, int len, xmlChar **entity, int *entity_len) 
-{
-	*entity_len = len + 2;
-	*entity = xmlMalloc(*entity_len + 1);
-	(*entity)[0] = '&';
-	memcpy(*entity+1, name, len);
-	(*entity)[len+1] = ';';
-	(*entity)[*entity_len] = '\0';
-}
-
-static xmlEntityPtr
-_get_entity(void *user, const xmlChar *name)
-{
-	XML_Parser parser = (XML_Parser) user;
-
-	if (parser->h_default) {
-		xmlChar *entity;
-		int      len;
-		
-		_build_entity(name, xmlStrlen(name), &entity, &len);
-		parser->h_default(parser->user, (const xmlChar *) entity, len);
-	}
-
-	return NULL;
-}
-
-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;
-
-	if (parser->h_external_entity_ref == NULL) {
-		return;
-	}
-
-	parser->h_external_entity_ref(parser, names, "", sys_id, pub_id);
-}
-
-static xmlSAXHandler 
-php_xml_compat_handlers = {
-    NULL, /* internalSubset */
-	NULL, /* isStandalone */
-	NULL, /* hasInternalSubset */
-	NULL, /* hasExternalSubset */
-	NULL, /* resolveEntity */
-	_get_entity, /* 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,
-	_comment_handler, /* comment */
-	NULL, /* warning */
-	NULL, /* error */
-	NULL,  /* fatalError */
-	NULL,  /* getParameterEntity */
-	_cdata_handler, /* cdataBlock */
-	NULL, /* externalSubset */
-	1
-};
-
-PHPAPI XML_Parser 
-XML_ParserCreate(const XML_Char *encoding)
-{
-	return XML_ParserCreate_MM(encoding, NULL, NULL);
-}
-
-PHPAPI XML_Parser
-XML_ParserCreateNS(const XML_Char *encoding, const XML_Char sep)
-{
-	XML_Char tmp[2];
-	tmp[0] = sep;
-	tmp[1] = '\0';
-	return XML_ParserCreate_MM(encoding, NULL, tmp);
-}
-
-PHPAPI XML_Parser
-XML_ParserCreate_MM(const XML_Char *encoding, const XML_Memory_Handling_Suite *memsuite, const XML_Char *sep)
-{
-	XML_Parser parser;
-
-	parser = (XML_Parser) emalloc(sizeof(struct _XML_Parser));
-	memset(parser, 0, sizeof(struct _XML_Parser));
-	parser->use_namespace = 0;
-	parser->_ns_seperator = NULL;
-
-	parser->parser = xmlCreatePushParserCtxt((xmlSAXHandlerPtr) &php_xml_compat_handlers, (void *) parser, NULL, 0, NULL);
-	if (parser->parser == NULL) {
-		efree(parser);
-		return NULL;
-	}
-	if (encoding != NULL) {
-		parser->parser->encoding = xmlStrdup(encoding);
-	} else {
-		parser->parser->charset = XML_CHAR_ENCODING_NONE;
-	}
-	parser->parser->replaceEntities = 1;
-	if (sep != NULL) {
-		parser->use_namespace = 1;
-		parser->_ns_map = xmlHashCreate(10);
-		parser->_reverse_ns_map = xmlHashCreate(10);
-		parser->_ns_seperator = xmlStrdup(sep);
-	}
-	return parser;
-}
-
-PHPAPI void
-XML_SetUserData(XML_Parser parser, void *user)
-{
-	parser->user = user;
-}
-
-PHPAPI void *
-XML_GetUserData(XML_Parser parser)
-{
-	return parser->user;
-}
-
-PHPAPI void
-XML_SetElementHandler(XML_Parser parser, XML_StartElementHandler start, XML_EndElementHandler end)
-{
-	parser->h_start_element = start;
-	parser->h_end_element = end;
-}
-
-PHPAPI void
-XML_SetCharacterDataHandler(XML_Parser parser, XML_CharacterDataHandler cdata)
-{
-	parser->h_cdata = cdata;
-}
-
-PHPAPI void
-XML_SetProcessingInstructionHandler(XML_Parser parser, XML_ProcessingInstructionHandler pi)
-{
-	parser->h_pi = pi;
-}
-
-PHPAPI void
-XML_SetCommentHandler(XML_Parser parser, XML_CommentHandler comment)
-{
-	parser->h_comment = comment;
-}
-
-PHPAPI void 
-XML_SetDefaultHandler(XML_Parser parser, XML_DefaultHandler d)
-{
-	parser->h_default = d;
-}
-
-PHPAPI void
-XML_SetUnparsedEntityDeclHandler(XML_Parser parser, XML_UnparsedEntityDeclHandler unparsed_decl)
-{
-	parser->h_unparsed_entity_decl = unparsed_decl;
-}
-
-PHPAPI void
-XML_SetNotationDeclHandler(XML_Parser parser, XML_NotationDeclHandler notation_decl)
-{
-	parser->h_notation_decl = notation_decl;
-}
-
-PHPAPI void
-XML_SetExternalEntityRefHandler(XML_Parser parser, XML_ExternalEntityRefHandler ext_entity)
-{
-	parser->h_external_entity_ref = ext_entity;
-}
-
-PHPAPI void
-XML_SetStartNamespaceDeclHandler(XML_Parser parser, XML_StartNamespaceDeclHandler start_ns)
-{
-	parser->h_start_ns = start_ns;
-}
-
-PHPAPI void
-XML_SetEndNamespaceDeclHandler(XML_Parser parser, XML_EndNamespaceDeclHandler end_ns)
-{
-	parser->h_end_ns = end_ns;
-}
-
-PHPAPI 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);
-}
-
-PHPAPI int
-XML_GetErrorCode(XML_Parser parser)
-{
-	return parser->parser->errNo;
-}
-
-const XML_Char *error_mapping[] = {
-	"No error",
-	"Internal error",
-	"No memory",
-	"XML_ERR_DOCUMENT_START",
-	"Empty document",
-	"XML_ERR_DOCUMENT_END",
-	"Invalid hexadecimal character reference",
-	"Invalid decimal character reference",
-	"Invalid character reference",
-	"Invalid character",
-	"XML_ERR_CHARREF_AT_EOF",
-	"XML_ERR_CHARREF_IN_PROLOG",
-	"XML_ERR_CHARREF_IN_EPILOG",
-	"XML_ERR_CHARREF_IN_DTD",
-	"XML_ERR_ENTITYREF_AT_EOF",
-	"XML_ERR_ENTITYREF_IN_PROLOG",
-	"XML_ERR_ENTITYREF_IN_EPILOG",
-	"XML_ERR_ENTITYREF_IN_DTD",
-	"XML_ERR_PEREF_AT_EOF",
-	"XML_ERR_PEREF_IN_PROLOG",
-	"XML_ERR_PEREF_IN_EPILOG",
-	"XML_ERR_PEREF_IN_INT_SUBSET",
-	"XML_ERR_ENTITYREF_NO_NAME",
-	"XML_ERR_ENTITYREF_SEMICOL_MISSING",
-	"XML_ERR_PEREF_NO_NAME",
-	"XML_ERR_PEREF_SEMICOL_MISSING",
-	"Undeclared entity error",
-	"Undeclared entity warning",
-	"Unparsed Entity",
-	"XML_ERR_ENTITY_IS_EXTERNAL",
-	"XML_ERR_ENTITY_IS_PARAMETER",
-	"Unknown encoding",
-	"Unsupported encoding",
-	"XML_ERR_STRING_NOT_STARTED",
-	"XML_ERR_STRING_NOT_CLOSED",
-	"Namespace declaration error",
-	"XML_ERR_ENTITY_NOT_STARTED",
-	"XML_ERR_ENTITY_NOT_FINISHED",
-	"XML_ERR_LT_IN_ATTRIBUTE",
-	"XML_ERR_ATTRIBUTE_NOT_STARTED",
-	"XML_ERR_ATTRIBUTE_NOT_FINISHED",
-	"XML_ERR_ATTRIBUTE_WITHOUT_VALUE",
-	"XML_ERR_ATTRIBUTE_REDEFINED",
-	"XML_ERR_LITERAL_NOT_STARTED",
-	"XML_ERR_LITERAL_NOT_FINISHED",
-	/* "XML_ERR_COMMENT_NOT_STARTED", <= eliminated on purpose */
-	"XML_ERR_COMMENT_NOT_FINISHED",
-	"XML_ERR_PI_NOT_STARTED",
-	"XML_ERR_PI_NOT_FINISHED",
-	"XML_ERR_NOTATION_NOT_STARTED",
-	"XML_ERR_NOTATION_NOT_FINISHED",
-	"XML_ERR_ATTLIST_NOT_STARTED",
-	"XML_ERR_ATTLIST_NOT_FINISHED",
-	"XML_ERR_MIXED_NOT_STARTED",
-	"XML_ERR_MIXED_NOT_FINISHED",
-	"XML_ERR_ELEMCONTENT_NOT_STARTED",
-	"XML_ERR_ELEMCONTENT_NOT_FINISHED",
-	"XML_ERR_XMLDECL_NOT_STARTED",
-	"XML_ERR_XMLDECL_NOT_FINISHED",
-	"XML_ERR_CONDSEC_NOT_STARTED",
-	"XML_ERR_CONDSEC_NOT_FINISHED",
-	"XML_ERR_EXT_SUBSET_NOT_FINISHED",
-	"XML_ERR_DOCTYPE_NOT_FINISHED",
-	"XML_ERR_MISPLACED_CDATA_END",
-	"XML_ERR_CDATA_NOT_FINISHED",
-	"XML_ERR_RESERVED_XML_NAME",
-	"XML_ERR_SPACE_REQUIRED",
-	"XML_ERR_SEPARATOR_REQUIRED",
-	"XML_ERR_NMTOKEN_REQUIRED",
-	"XML_ERR_NAME_REQUIRED",
-	"XML_ERR_PCDATA_REQUIRED",
-	"XML_ERR_URI_REQUIRED",
-	"XML_ERR_PUBID_REQUIRED",
-	"XML_ERR_LT_REQUIRED",
-	"XML_ERR_GT_REQUIRED",
-	"XML_ERR_LTSLASH_REQUIRED",
-	"XML_ERR_EQUAL_REQUIRED",
-	"XML_ERR_TAG_NAME_MISMATCH",
-	"XML_ERR_TAG_NOT_FINISHED",
-	"XML_ERR_STANDALONE_VALUE",
-	"XML_ERR_ENCODING_NAME",
-	"XML_ERR_HYPHEN_IN_COMMENT",
-	"Invalid encoding",
-	"XML_ERR_EXT_ENTITY_STANDALONE",
-	"XML_ERR_CONDSEC_INVALID",
-	"XML_ERR_VALUE_REQUIRED",
-	"XML_ERR_NOT_WELL_BALANCED",
-	"XML_ERR_EXTRA_CONTENT",
-    "XML_ERR_ENTITY_CHAR_ERROR",
-    "XML_ERR_ENTITY_PE_INTERNAL",
-    "XML_ERR_ENTITY_LOOP",
-    "XML_ERR_ENTITY_BOUNDARY",
-    "Invalid URI",
-    "XML_ERR_URI_FRAGMENT",
-    "XML_WAR_CATALOG_PI",
-    "XML_ERR_NO_DTD"
-};
-
-PHPAPI const XML_Char *
-XML_ErrorString(int code)
-{
-	if (code < 0 || code >= (int)sizeof(error_mapping)) {
-		return "Unknown";
-	}
-	return error_mapping[code];
-}
-
-PHPAPI int
-XML_GetCurrentLineNumber(XML_Parser parser)
-{
-	return parser->parser->input->line;
-}
-
-PHPAPI int
-XML_GetCurrentColumnNumber(XML_Parser parser)
-{
-	return parser->parser->input->col;
-}
-
-PHPAPI int
-XML_GetCurrentByteIndex(XML_Parser parser)
-{
-	return parser->parser->input->consumed +
-			(parser->parser->input->cur - parser->parser->input->base);
-}
-
-PHPAPI int
-XML_GetCurrentByteCount(XML_Parser parser)
-{
-	/* WARNING: this is identical to ByteIndex; it should probably
-	 * be different */
-	return parser->parser->input->consumed +
-			(parser->parser->input->cur - parser->parser->input->base);
-}
-
-PHPAPI const XML_Char *XML_ExpatVersion(void)
-{
-	return "1.0";
-}
-
-static void
-_free_ns_name(void *ptr, xmlChar *name)
-{
-	xmlFree(ptr);
-}
-
-static void
-_free_ns_pointer(void *ptr, xmlChar *name)
-{
-	php_xml_ns *cur_ns_scope;
-
-	/* Child scopes should already be removed, but in the event 
-	of malformed xml, they may still be resident and need to be cleaned */
-	cur_ns_scope = ((php_xml_ns *) ptr)->next;
-	if (cur_ns_scope != NULL) {
-		_free_ns_pointer(cur_ns_scope, NULL);
-	}
-
-	xmlFreeNsList(((php_xml_ns *) ptr)->nsptr);
-
-	efree(ptr);
-}
-
-PHPAPI void
-XML_ParserFree(XML_Parser parser)
-{
-	if (parser->use_namespace) {
-		xmlHashFree(parser->_ns_map,         _free_ns_name);
-		xmlHashFree(parser->_reverse_ns_map, _free_ns_pointer);
-		if (parser->_ns_seperator) {
-			xmlFree(parser->_ns_seperator);
-		}
-	}
-	xmlFreeParserCtxt(parser->parser);
-	efree(parser);
-}
-
-#endif /* LIBXML_EXPAT_COMPAT */
-#endif
-
-/**
- * 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
deleted file mode 100644
index 72c98ed814..0000000000
--- a/ext/xml/config.m4
+++ /dev/null
@@ -1,51 +0,0 @@
-dnl
-dnl $Id$
-dnl
-
-PHP_ARG_ENABLE(xml,whether to enable XML support,
-[  --disable-xml           Disable XML support.], yes)
-
-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)
-fi
-
-PHP_ARG_WITH(libexpat-dir, libexpat install dir,
-[  --with-libexpat-dir=DIR   XML: libexpat install prefix (deprecated)], no, no)
-
-if test "$PHP_XML" != "no" && test "$PHP_LIBXML" != "no" -o "$PHP_LIBEXPAT_DIR" != "no"; then
-  dnl 
-  dnl Default to libxml2.
-  dnl
-  PHP_SETUP_LIBXML(XML_SHARED_LIBADD, [
-    xml_extra_sources="compat.c"
-  ], [
-    if test "$PHP_LIBEXPAT_DIR" = "no"; then
-      AC_MSG_ERROR([xml2-config not found. Use --with-libxml-dir=<DIR>])
-    fi
-  ])
-  
-  dnl
-  dnl Check for expat only if --with-libexpat-dir is used.
-  dnl
-  if test "$PHP_LIBEXPAT_DIR" != "no"; then
-    for i in $PHP_XML $PHP_LIBEXPAT_DIR; do
-      if test -f "$i/lib/libexpat.a" -o -f "$i/lib/libexpat.$SHLIB_SUFFIX_NAME"; then
-        EXPAT_DIR=$i
-        break
-      fi
-    done
-
-    if test -z "$EXPAT_DIR"; then
-      AC_MSG_ERROR(not found. Please reinstall the expat distribution.)
-    fi
-
-    PHP_ADD_INCLUDE($EXPAT_DIR/include)
-    PHP_ADD_LIBRARY_WITH_PATH(expat, $EXPAT_DIR/lib, XML_SHARED_LIBADD)
-    AC_DEFINE(HAVE_LIBEXPAT, 1, [ ])
-  fi
-
-  PHP_NEW_EXTENSION(xml, xml.c $xml_extra_sources, $ext_shared)
-  PHP_SUBST(XML_SHARED_LIBADD)
-  AC_DEFINE(HAVE_XML, 1, [ ])
-fi
diff --git a/ext/xml/config.w32 b/ext/xml/config.w32
deleted file mode 100644
index 08d25ffe57..0000000000
--- a/ext/xml/config.w32
+++ /dev/null
@@ -1,15 +0,0 @@
-// $Id$
-// vim:ft=javascript
-
-ARG_WITH("xml", "XML support", "yes");
-
-if (PHP_XML == "yes" && PHP_LIBXML == "yes") {
-	EXTENSION("xml", "xml.c compat.c");
-	AC_DEFINE("HAVE_XML", 1, "XML support");
-	if (!PHP_XML_SHARED) {
-		ADD_FLAG("CFLAGS_XML", "/D LIBXML_STATIC ");
-	}
-	ADD_EXTENSION_DEP('xml', 'libxml');
-}
-
-
diff --git a/ext/xml/expat_compat.h b/ext/xml/expat_compat.h
deleted file mode 100644
index 1862bc5907..0000000000
--- a/ext/xml/expat_compat.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
-   +----------------------------------------------------------------------+
-   | PHP Version 5                                                        |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2004 The PHP Group                                |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.0 of the PHP license,       |
-   | that is bundled with this package in the file LICENSE, and is        |
-   | available through the world-wide-web at the following url:           |
-   | http://www.php.net/license/3_0.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 "php_compat.h"
-
-#include <libxml/parser.h>
-#include <libxml/parserInternals.h>
-#include <libxml/tree.h>
-#include <libxml/hash.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_CommentHandler)(void *, 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_Memory_Handling_Suite {
-  void *(*malloc_fcn)(size_t size);
-  void *(*realloc_fcn)(void *ptr, size_t size);
-  void (*free_fcn)(void *ptr);
-} XML_Memory_Handling_Suite;
-
-typedef struct _XML_Parser {
-	int use_namespace;
-
-	xmlHashTablePtr _ns_map;
-	xmlHashTablePtr _reverse_ns_map;
-	xmlChar *_ns_seperator;
-
-	void *user;
-	xmlParserCtxtPtr parser;
-
-	XML_StartElementHandler          h_start_element;
-	XML_EndElementHandler            h_end_element;
-	XML_CharacterDataHandler         h_cdata;
-	XML_ProcessingInstructionHandler h_pi;
-	XML_CommentHandler               h_comment;
-	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;
-
-enum XML_Error {
-	XML_ERROR_NONE,
-	XML_ERROR_NO_MEMORY,
-	XML_ERROR_SYNTAX,
-	XML_ERROR_NO_ELEMENTS,
-	XML_ERROR_INVALID_TOKEN,
-	XML_ERROR_UNCLOSED_TOKEN,
-	XML_ERROR_PARTIAL_CHAR,
-	XML_ERROR_TAG_MISMATCH,
-	XML_ERROR_DUPLICATE_ATTRIBUTE,
-	XML_ERROR_JUNK_AFTER_DOC_ELEMENT,
-	XML_ERROR_PARAM_ENTITY_REF,
-	XML_ERROR_UNDEFINED_ENTITY,
-	XML_ERROR_RECURSIVE_ENTITY_REF,
-	XML_ERROR_ASYNC_ENTITY,
-	XML_ERROR_BAD_CHAR_REF,
-	XML_ERROR_BINARY_ENTITY_REF,
-	XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF,
-	XML_ERROR_MISPLACED_XML_PI,
-	XML_ERROR_UNKNOWN_ENCODING,
-	XML_ERROR_INCORRECT_ENCODING,
-	XML_ERROR_UNCLOSED_CDATA_SECTION,
-	XML_ERROR_EXTERNAL_ENTITY_HANDLING,
-	XML_ERROR_NOT_STANDALONE,
-	XML_ERROR_UNEXPECTED_STATE,
-	XML_ERROR_ENTITY_DECLARED_IN_PE,
-	XML_ERROR_FEATURE_REQUIRES_XML_DTD,
-	XML_ERROR_CANT_CHANGE_FEATURE_ONCE_PARSING
-};
-
-enum XML_Content_Type {
-	XML_CTYPE_EMPTY = 1,
-	XML_CTYPE_ANY,
-	XML_CTYPE_MIXED,
-	XML_CTYPE_NAME,
-	XML_CTYPE_CHOICE,
-	XML_CTYPE_SEQ
-};
-
-PHPAPI XML_Parser XML_ParserCreate(const XML_Char *);
-PHPAPI XML_Parser XML_ParserCreateNS(const XML_Char *, const XML_Char);
-PHPAPI XML_Parser XML_ParserCreate_MM(const XML_Char *, const XML_Memory_Handling_Suite *, const XML_Char *);
-PHPAPI void XML_SetUserData(XML_Parser, void *);
-PHPAPI void *XML_GetUserData(XML_Parser);
-PHPAPI void XML_SetElementHandler(XML_Parser, XML_StartElementHandler, XML_EndElementHandler);
-PHPAPI void XML_SetCharacterDataHandler(XML_Parser, XML_CharacterDataHandler);
-PHPAPI void XML_SetProcessingInstructionHandler(XML_Parser, XML_ProcessingInstructionHandler);
-PHPAPI void XML_SetDefaultHandler(XML_Parser, XML_DefaultHandler);
-PHPAPI void XML_SetUnparsedEntityDeclHandler(XML_Parser, XML_UnparsedEntityDeclHandler);
-PHPAPI void XML_SetNotationDeclHandler(XML_Parser, XML_NotationDeclHandler);
-PHPAPI void XML_SetExternalEntityRefHandler(XML_Parser, XML_ExternalEntityRefHandler);
-PHPAPI void XML_SetStartNamespaceDeclHandler(XML_Parser, XML_StartNamespaceDeclHandler);
-PHPAPI void XML_SetEndNamespaceDeclHandler(XML_Parser, XML_EndNamespaceDeclHandler);
-PHPAPI int  XML_Parse(XML_Parser, const XML_Char *, int data_len, int is_final);
-PHPAPI int  XML_GetErrorCode(XML_Parser);
-PHPAPI const XML_Char *XML_ErrorString(int);
-PHPAPI int  XML_GetCurrentLineNumber(XML_Parser);
-PHPAPI int  XML_GetCurrentColumnNumber(XML_Parser);
-PHPAPI int  XML_GetCurrentByteIndex(XML_Parser);
-PHPAPI int  XML_GetCurrentByteCount(XML_Parser);
-PHPAPI const XML_Char *XML_ExpatVersion(void);
-PHPAPI void XML_ParserFree(XML_Parser);
-
-#elif defined(HAVE_LIBEXPAT)
-#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
deleted file mode 100644
index 1864937b04..0000000000
--- a/ext/xml/php_xml.h
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
-   +----------------------------------------------------------------------+
-   | PHP Version 5                                                        |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2004 The PHP Group                                |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.0 of the PHP license,       |
-   | that is bundled with this package in the file LICENSE, and is        |
-   | available through the world-wide-web at the following url:           |
-   | http://www.php.net/license/3_0.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: Stig Sæther Bakken <ssb@php.net>                            |
-   |          Thies C. Arntzen <thies@thieso.net>                         |
-   |          Sterling Hughes <sterling@php.net>                          |
-   +----------------------------------------------------------------------+
-*/
-
-/* $Id$ */
-
-#ifndef PHP_XML_H
-#define PHP_XML_H
-
-#ifdef HAVE_XML
-extern zend_module_entry xml_module_entry;
-#define xml_module_ptr &xml_module_entry
-#else
-#define xml_module_ptr NULL
-#endif
-
-#ifdef HAVE_XML 
-
-#include "ext/xml/expat_compat.h"
-
-#ifdef PHP_WIN32
-#define PHP_XML_API __declspec(dllexport)
-#else
-#define PHP_XML_API
-#endif
-
-
-#ifdef XML_UNICODE
-#error "UTF-16 Unicode support not implemented!"
-#endif
-
-typedef struct {
-	XML_Char *default_encoding;
-} php_xml_globals;
-
-typedef struct {
-	int index;
-	int case_folding;
-	XML_Parser parser;
-	XML_Char *target_encoding;
-
-	zval *startElementHandler;
-	zval *endElementHandler;
-	zval *characterDataHandler;
-	zval *processingInstructionHandler;
-	zval *defaultHandler;
-	zval *unparsedEntityDeclHandler;
-	zval *notationDeclHandler;
-	zval *externalEntityRefHandler;
-	zval *unknownEncodingHandler;	
-	zval *startNamespaceDeclHandler;
-	zval *endNamespaceDeclHandler;
-
-	zend_function *startElementPtr;
-	zend_function *endElementPtr;
-	zend_function *characterDataPtr;
-	zend_function *processingInstructionPtr;
-	zend_function *defaultPtr;
-	zend_function *unparsedEntityDeclPtr;
-	zend_function *notationDeclPtr;
-	zend_function *externalEntityRefPtr;
-	zend_function *unknownEncodingPtr;
-	zend_function *startNamespaceDeclPtr;
-	zend_function *endNamespaceDeclPtr;
-
-	zval *object;
-
-	zval *data;
-	zval *info;
-	int level;
-	int toffset;
-	int curtag;
-	pval **ctag;
-	char **ltags;
-	int lastwasopen;
-	int skipwhite;
-	
-	XML_Char *baseURI;
-} xml_parser;
-
-
-typedef struct {
-	XML_Char *name;
-	char (*decoding_function)(unsigned short);
-	unsigned short (*encoding_function)(unsigned char);
-} xml_encoding;
-
-
-enum php_xml_option {
-    PHP_XML_OPTION_CASE_FOLDING = 1,
-    PHP_XML_OPTION_TARGET_ENCODING,
-    PHP_XML_OPTION_SKIP_TAGSTART,
-    PHP_XML_OPTION_SKIP_WHITE
-};
-
-/* for xml_parse_into_struct */
-	
-#define XML_MAXLEVEL 255 /* XXX this should be dynamic */
-	
-PHP_FUNCTION(xml_parser_create);
-PHP_FUNCTION(xml_parser_create_ns);
-PHP_FUNCTION(xml_set_object);
-PHP_FUNCTION(xml_set_element_handler);
-PHP_FUNCTION(xml_set_character_data_handler);
-PHP_FUNCTION(xml_set_processing_instruction_handler);
-PHP_FUNCTION(xml_set_default_handler);
-PHP_FUNCTION(xml_set_unparsed_entity_decl_handler);
-PHP_FUNCTION(xml_set_notation_decl_handler);
-PHP_FUNCTION(xml_set_external_entity_ref_handler);
-PHP_FUNCTION(xml_set_start_namespace_decl_handler);
-PHP_FUNCTION(xml_set_end_namespace_decl_handler);
-PHP_FUNCTION(xml_parse);
-PHP_FUNCTION(xml_get_error_code);
-PHP_FUNCTION(xml_error_string);
-PHP_FUNCTION(xml_get_current_line_number);
-PHP_FUNCTION(xml_get_current_column_number);
-PHP_FUNCTION(xml_get_current_byte_index);
-PHP_FUNCTION(xml_parser_free);
-PHP_FUNCTION(xml_parser_set_option);
-PHP_FUNCTION(xml_parser_get_option);
-PHP_FUNCTION(utf8_encode);
-PHP_FUNCTION(utf8_decode);
-PHP_FUNCTION(xml_parse_into_struct);
-
-PHPAPI char *_xml_zval_strdup(zval *val);
-PHPAPI char *xml_utf8_decode(const XML_Char *, int, int *, const XML_Char *);
-
-#endif /* HAVE_LIBEXPAT */
-
-#define phpext_xml_ptr xml_module_ptr
-
-#ifdef ZTS
-#define XML(v) TSRMG(xml_globals_id, php_xml_globals *, v)
-#else
-#define XML(v) (xml_globals.v)
-#endif
-
-#endif /* PHP_XML_H */
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/ext/xml/tests/bug25666.phpt b/ext/xml/tests/bug25666.phpt
deleted file mode 100644
index 5e95b31b17..0000000000
--- a/ext/xml/tests/bug25666.phpt
+++ /dev/null
@@ -1,30 +0,0 @@
---TEST--
-Bug #25666 (XML namespaces broken in libxml-based SAX interface)
---FILE--
-<?php
-function start_elem($parser,$name,$attribs) {
-	var_dump($name);
-}
-function end_elem()
-{
-}
-
-$xml = <<<HERE
-<foo:a xmlns:foo="http://example.com/foo"
-       xmlns:bar="http://example.com/bar"
-	   xmlns:baz="http://example.com/baz">
-  <bar:b />
-  <baz:c />
-</foo>
-HERE;
-
-$parser = xml_parser_create_ns("ISO-8859-1","@");
-xml_set_element_handler($parser,'start_elem','end_elem');
-xml_parser_set_option($parser,XML_OPTION_CASE_FOLDING,0);
-xml_parse($parser, $xml);
-xml_parser_free($parser);
-?>
---EXPECT--
-string(24) "http://example.com/foo@a"
-string(24) "http://example.com/bar@b"
-string(24) "http://example.com/baz@c"
diff --git a/ext/xml/tests/bug26528.phpt b/ext/xml/tests/bug26528.phpt
deleted file mode 100644
index 2fa015a84d..0000000000
--- a/ext/xml/tests/bug26528.phpt
+++ /dev/null
@@ -1,27 +0,0 @@
---TEST--
-Bug #26528 (HTML entities are not being decoded)
---FILE--
-<?php
-	$sample = "<?xml version=\"1.0\"?><test attr=\"angle&lt;bracket\"/>";
-	$parser = xml_parser_create();
-	$res = xml_parse_into_struct($parser,$sample,$vals,$index);
-	xml_parser_free($parser);
-	var_dump($vals);
-?>
---EXPECT--
-array(1) {
-  [0]=>
-  array(4) {
-    ["tag"]=>
-    string(4) "TEST"
-    ["type"]=>
-    string(8) "complete"
-    ["level"]=>
-    int(1)
-    ["attributes"]=>
-    array(1) {
-      ["ATTR"]=>
-      string(13) "angle<bracket"
-    }
-  }
-}
diff --git a/ext/xml/tests/bug26614.phpt b/ext/xml/tests/bug26614.phpt
deleted file mode 100644
index c650c1178b..0000000000
--- a/ext/xml/tests/bug26614.phpt
+++ /dev/null
@@ -1,29 +0,0 @@
---TEST--
-Bug #26614 (CDATA sections skipped on line count)
---FILE--
-<?php
-$xml ='<?xml version="1.0"?>
-<data>
-<![CDATA[
-multi
-line 
-CDATA
-block
-]]>
-</data>';
-
-function startElement($parser, $name, $attrs) {
-    echo "<$name> at line ".xml_get_current_line_number($parser)."\n";
-}
-function endElement($parser, $name) {
-    echo "</$name> at line ".xml_get_current_line_number($parser)."\n";
-}
-
-$xml_parser = xml_parser_create();
-xml_set_element_handler($xml_parser, "startElement", "endElement");
-xml_parse($xml_parser, $xml);
-xml_parser_free($xml_parser);
-?>
---EXPECT--
-<DATA> at line 2
-</DATA> at line 4
diff --git a/ext/xml/tests/inc.ent b/ext/xml/tests/inc.ent
deleted file mode 100644
index 8f86465c2a..0000000000
--- a/ext/xml/tests/inc.ent
+++ /dev/null
@@ -1 +0,0 @@
-<!ENTITY included-entity "This is text included from an entity">
diff --git a/ext/xml/tests/skipif.inc b/ext/xml/tests/skipif.inc
deleted file mode 100644
index 44898f3da6..0000000000
--- a/ext/xml/tests/skipif.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-// DO NOT dl load extension
-//if (!extension_loaded("xml")) {
-//  $dlext = (substr(PHP_OS, 0, 3) == "WIN") ? ".dll" : ".so";
-//  @dl("xml$dlext");
-//}
-if (!extension_loaded("xml")) {
-  die('skip xml extension not available');
-}
-?>
diff --git a/ext/xml/tests/xml001.phpt b/ext/xml/tests/xml001.phpt
deleted file mode 100644
index 6ee908e46d..0000000000
--- a/ext/xml/tests/xml001.phpt
+++ /dev/null
@@ -1,99 +0,0 @@
---TEST--
-XML parser test, function callbacks
---SKIPIF--
-<?php
-require_once("skipif.inc");
-XML_SAX_IMPL == 'libxml' && die('skip this test is not intended for libxml SAX parser');
-?>
---INI--
-magic_quotes_runtime=0
---FILE--
-<?php
-chdir(dirname(__FILE__));
-
-$xml_parser = xml_parser_create();
-xml_parser_set_option($xml_parser, XML_OPTION_CASE_FOLDING, 1);
-xml_set_element_handler($xml_parser, "startElement", "endElement");
-xml_set_character_data_handler($xml_parser, "characterData");
-xml_set_processing_instruction_handler($xml_parser, "PIHandler");
-xml_set_default_handler($xml_parser, "defaultHandler");
-xml_set_external_entity_ref_handler($xml_parser, "externalEntityRefHandler");
-    
-if (!($fp = @fopen("xmltest.xml", "r"))) {
-    die("could not open XML input");
-}
-
-while ($data = fread($fp, 4096)) {
-	if (!xml_parse($xml_parser, $data, feof($fp))) {
-		die(sprintf("XML error: %s at line %d\n",
-		xml_error_string(xml_get_error_code($xml_parser)),
-		xml_get_current_line_number($xml_parser)));
-	}
-}
-print "parse complete\n";
-xml_parser_free($xml_parser);
-
-function startElement($parser, $name, $attribs)
-{
-	print "\{$name";
-	if (sizeof($attribs)) {
-		while (list($k, $v) = each($attribs)) {
-			print " $k=\"$v\"";
-		}
-	}
-	print "}";
-}
-
-function endElement($parser, $name)
-{
-	print "\{/$name}";
-}
-
-function characterData($parser, $data)
-{
-	print "\{CDATA[$data]}";
-}
-
-function PIHandler($parser, $target, $data)
-{
-	print "\{PI[$target,$data]}";
-}
-
-function defaultHandler($parser, $data)
-{
-	if (substr($data, 0, 1) == "&" && substr($data, -1, 1) == ";") {
-		print "\{ENTREF[$data]}";
-	} else {
-		print "\{?[$data]}";
-	}
-}
-
-function externalEntityRefHandler($parser, $openEntityNames, $base, $systemId, $publicId)
-{
-	print "\{EXTENTREF[$openEntityNames,$base,$systemId,$publicId]}\n";
-	return true;
-}
-
-?>
---EXPECT--
-{?[<?xml version="1.0" encoding="ISO-8859-1"?>]}{?[
-]}{?[<!DOCTYPE]}{?[ ]}{?[phptest]}{?[ ]}{?[SYSTEM]}{?[ ]}{?["notfound.dtd"]}{?[ ]}{?[[]}{?[
-]}{?[<!ENTITY]}{?[ ]}{?[%]}{?[ ]}{?[incent]}{?[ ]}{?[SYSTEM]}{?[ ]}{?["inc.ent"]}{?[>]}{?[
-]}{?[%incent;]}{?[
-]}{?[]]}{?[>]}{?[
-]}{ROOT ID="elem1"}{CDATA[
-]}{CDATA[ Plain text.]}{CDATA[
-]}{CDATA[ ]}{ELEM1}{CDATA[
-]}{CDATA[  ]}{?[<!-- comment -->]}{CDATA[
-]}{CDATA[  ]}{ELEM2}{CDATA[
-]}{CDATA[   ]}{?[<![CDATA[]}{CDATA[CDATA block]}{?[]]>]}{CDATA[
-]}{CDATA[   ]}{ELEM3}{CDATA[
-]}{CDATA[    ]}{ENTREF[&included-entity;]}{CDATA[
-]}{CDATA[    ]}{ELEM4}{CDATA[
-]}{CDATA[     ]}{PI[test,processing instruction ]}{CDATA[
-]}{CDATA[    ]}{/ELEM4}{CDATA[
-]}{CDATA[   ]}{/ELEM3}{CDATA[
-]}{CDATA[  ]}{/ELEM2}{CDATA[
-]}{CDATA[ ]}{/ELEM1}{CDATA[
-]}{/ROOT}{?[
-]}parse complete
diff --git a/ext/xml/tests/xml002.phpt b/ext/xml/tests/xml002.phpt
deleted file mode 100644
index 9785002926..0000000000
--- a/ext/xml/tests/xml002.phpt
+++ /dev/null
@@ -1,100 +0,0 @@
---TEST--
-XML parser test, object tuple callbacks
---SKIPIF--
-<?php
-require_once("skipif.inc");
-XML_SAX_IMPL == 'libxml' && die('skip this test is not intended for libxml SAX parser');
-?>
---INI--
-magic_quotes_runtime=0
---FILE--
-<?php
-chdir(dirname(__FILE__));
-
-class myclass
-{
-	function startElement($parser, $name, $attribs)
-	{
-		print "\{$name";
-		if (sizeof($attribs)) {
-			while (list($k, $v) = each($attribs)) {
-				print " $k=\"$v\"";
-			}
-		}
-		print "}";
-	}
-	function endElement($parser, $name)
-	{
-		print "\{/$name}";
-	}
-	function characterData($parser, $data)
-	{
-		print "\{CDATA[$data]}";
-	}
-	function PIHandler($parser, $target, $data)
-	{
-		print "\{PI[$target,$data]}";
-	}
-	function defaultHandler($parser, $data)
-	{
-		if (substr($data, 0, 1) == "&" && substr($data, -1, 1) == ";") {
-			print "\{ENTREF[$data]}";
-		} else {
-			print "\{?[$data]}";
-		}
-	}
-	function externalEntityRefHandler($parser, $openEntityNames, $base,	$systemId, $publicId)
-	{
-		print "\{EXTENTREF[$openEntityNames,$base,$systemId,$publicId]}\n";
-		return true;
-	}
-}
-
-$xml_parser = xml_parser_create();
-$obj = new myclass;
-xml_parser_set_option($xml_parser, XML_OPTION_CASE_FOLDING, 1);
-xml_set_element_handler($xml_parser, array($obj,"startElement"),
-array($obj, "endElement"));
-xml_set_character_data_handler($xml_parser, array($obj, "characterData"));
-xml_set_processing_instruction_handler($xml_parser, array($obj, "PIHandler"));
-xml_set_default_handler($xml_parser, array($obj, "defaultHandler"));
-xml_set_external_entity_ref_handler($xml_parser,
-array($obj, "externalEntityRefHandler"));
-
-if (!($fp = @fopen("xmltest.xml", "r"))) {
-	die("could not open XML input");
-}
-
-while ($data = fread($fp, 4096)) {
-	if (!xml_parse($xml_parser, $data, feof($fp))) {
-		die(sprintf("XML error: %s at line %d\n",
-		xml_error_string(xml_get_error_code($xml_parser)),
-		xml_get_current_line_number($xml_parser)));
-	}
-}
-print "parse complete\n";
-xml_parser_free($xml_parser);
-
-?>
---EXPECT--
-{?[<?xml version="1.0" encoding="ISO-8859-1"?>]}{?[
-]}{?[<!DOCTYPE]}{?[ ]}{?[phptest]}{?[ ]}{?[SYSTEM]}{?[ ]}{?["notfound.dtd"]}{?[ ]}{?[[]}{?[
-]}{?[<!ENTITY]}{?[ ]}{?[%]}{?[ ]}{?[incent]}{?[ ]}{?[SYSTEM]}{?[ ]}{?["inc.ent"]}{?[>]}{?[
-]}{?[%incent;]}{?[
-]}{?[]]}{?[>]}{?[
-]}{ROOT ID="elem1"}{CDATA[
-]}{CDATA[ Plain text.]}{CDATA[
-]}{CDATA[ ]}{ELEM1}{CDATA[
-]}{CDATA[  ]}{?[<!-- comment -->]}{CDATA[
-]}{CDATA[  ]}{ELEM2}{CDATA[
-]}{CDATA[   ]}{?[<![CDATA[]}{CDATA[CDATA block]}{?[]]>]}{CDATA[
-]}{CDATA[   ]}{ELEM3}{CDATA[
-]}{CDATA[    ]}{ENTREF[&included-entity;]}{CDATA[
-]}{CDATA[    ]}{ELEM4}{CDATA[
-]}{CDATA[     ]}{PI[test,processing instruction ]}{CDATA[
-]}{CDATA[    ]}{/ELEM4}{CDATA[
-]}{CDATA[   ]}{/ELEM3}{CDATA[
-]}{CDATA[  ]}{/ELEM2}{CDATA[
-]}{CDATA[ ]}{/ELEM1}{CDATA[
-]}{/ROOT}{?[
-]}parse complete
diff --git a/ext/xml/tests/xml003.phpt b/ext/xml/tests/xml003.phpt
deleted file mode 100644
index fa0984e893..0000000000
--- a/ext/xml/tests/xml003.phpt
+++ /dev/null
@@ -1,98 +0,0 @@
---TEST--
-XML parser test, xml_set_object callbacks
---SKIPIF--
-<?php
-require_once("skipif.inc");
-XML_SAX_IMPL == 'libxml' && die('skip this test is not intended for libxml SAX parser');
-?>
---INI--
-magic_quotes_runtime=0
---FILE--
-<?php
-chdir(dirname(__FILE__));
-
-class myclass
-{
-	function startElement($parser, $name, $attribs) 
-	{
-		print "\{$name";
-		if (sizeof($attribs)) {
-			while (list($k, $v) = each($attribs)) {
-				print " $k=\"$v\"";
-			}
-		}
-		print "}";
-	}
-	function endElement($parser, $name)
-	{
-		print "\{/$name}";
-	}
-	function characterData($parser, $data)
-	{
-		print "\{CDATA[$data]}";
-	}
-	function PIHandler($parser, $target, $data)
-	{
-		print "\{PI[$target,$data]}";
-	}
-	function defaultHandler($parser, $data)
-	{
-		if (substr($data, 0, 1) == "&" && substr($data, -1, 1) == ";") {
-			print "\{ENTREF[$data]}";
-		} else {
-			print "\{?[$data]}";
-		}
-	}
-	function externalEntityRefHandler($parser, $openEntityNames, $base,	$systemId, $publicId)
-	{
-		print "\{EXTENTREF[$openEntityNames,$base,$systemId,$publicId]}\n";
-		return true;
-	}
-}
-
-$xml_parser = xml_parser_create();
-$obj = new myclass;
-xml_set_object($xml_parser, $obj);
-xml_parser_set_option($xml_parser, XML_OPTION_CASE_FOLDING, 1);
-xml_set_element_handler($xml_parser, "startElement", "endElement");
-xml_set_character_data_handler($xml_parser, "characterData");
-xml_set_processing_instruction_handler($xml_parser, "PIHandler");
-xml_set_default_handler($xml_parser, "defaultHandler");
-xml_set_external_entity_ref_handler($xml_parser, "externalEntityRefHandler");
-
-if (!($fp = @fopen("xmltest.xml", "r"))) {
-	die("could not open XML input");
-}
-
-while ($data = fread($fp, 4096)) {
-	if (!xml_parse($xml_parser, $data, feof($fp))) {
-		die(sprintf("XML error: %s at line %d\n",
-		xml_error_string(xml_get_error_code($xml_parser)),
-		xml_get_current_line_number($xml_parser)));
-	}
-}
-print "parse complete\n";
-xml_parser_free($xml_parser);
-?>
---EXPECT--
-{?[<?xml version="1.0" encoding="ISO-8859-1"?>]}{?[
-]}{?[<!DOCTYPE]}{?[ ]}{?[phptest]}{?[ ]}{?[SYSTEM]}{?[ ]}{?["notfound.dtd"]}{?[ ]}{?[[]}{?[
-]}{?[<!ENTITY]}{?[ ]}{?[%]}{?[ ]}{?[incent]}{?[ ]}{?[SYSTEM]}{?[ ]}{?["inc.ent"]}{?[>]}{?[
-]}{?[%incent;]}{?[
-]}{?[]]}{?[>]}{?[
-]}{ROOT ID="elem1"}{CDATA[
-]}{CDATA[ Plain text.]}{CDATA[
-]}{CDATA[ ]}{ELEM1}{CDATA[
-]}{CDATA[  ]}{?[<!-- comment -->]}{CDATA[
-]}{CDATA[  ]}{ELEM2}{CDATA[
-]}{CDATA[   ]}{?[<![CDATA[]}{CDATA[CDATA block]}{?[]]>]}{CDATA[
-]}{CDATA[   ]}{ELEM3}{CDATA[
-]}{CDATA[    ]}{ENTREF[&included-entity;]}{CDATA[
-]}{CDATA[    ]}{ELEM4}{CDATA[
-]}{CDATA[     ]}{PI[test,processing instruction ]}{CDATA[
-]}{CDATA[    ]}{/ELEM4}{CDATA[
-]}{CDATA[   ]}{/ELEM3}{CDATA[
-]}{CDATA[  ]}{/ELEM2}{CDATA[
-]}{CDATA[ ]}{/ELEM1}{CDATA[
-]}{/ROOT}{?[
-]}parse complete
diff --git a/ext/xml/tests/xml004.phpt b/ext/xml/tests/xml004.phpt
deleted file mode 100644
index 78840ee122..0000000000
--- a/ext/xml/tests/xml004.phpt
+++ /dev/null
@@ -1,64 +0,0 @@
---TEST--
-XML parser case folding test
---SKIPIF--
-<?php include("skipif.inc"); ?>
---INI--
-magic_quotes_runtime=0
---FILE--
-<?php
-chdir(dirname(__FILE__));
-
-$xp = xml_parser_create();
-xml_parser_set_option($xp, XML_OPTION_CASE_FOLDING, false);
-xml_set_element_handler($xp, "start_element", "end_element");
-$fp = fopen("xmltest.xml", "r");
-while ($data = fread($fp, 4096)) {
-	xml_parse($xp, $data, feof($fp));
-}
-xml_parser_free($xp);
-$xp = xml_parser_create();
-xml_parser_set_option($xp, XML_OPTION_CASE_FOLDING, true);
-xml_set_element_handler($xp, "start_element", "end_element");
-$fp = fopen("xmltest.xml", "r");
-while ($data = fread($fp, 4096)) {
-	xml_parse($xp, $data, feof($fp));
-}
-xml_parser_free($xp);
-
-function start_element($xp, $elem, $attribs)
-{
-	print "<$elem";
-	if (sizeof($attribs)) {
-		while (list($k, $v) = each($attribs)) {
-			print " $k=\"$v\"";
-		}
-	}
-	print ">\n";
-}
-
-function end_element($xp, $elem)
-{
-	print "</$elem>\n";
-}
-?>
---EXPECT--
-<root id="elem1">
-<elem1>
-<elem2>
-<elem3>
-<elem4>
-</elem4>
-</elem3>
-</elem2>
-</elem1>
-</root>
-<ROOT ID="elem1">
-<ELEM1>
-<ELEM2>
-<ELEM3>
-<ELEM4>
-</ELEM4>
-</ELEM3>
-</ELEM2>
-</ELEM1>
-</ROOT>
diff --git a/ext/xml/tests/xml006.phpt b/ext/xml/tests/xml006.phpt
deleted file mode 100644
index c714e85913..0000000000
--- a/ext/xml/tests/xml006.phpt
+++ /dev/null
@@ -1,12 +0,0 @@
---TEST--
-UTF-8<->ISO Latin 1 encoding/decoding test
---SKIPIF--
-<?php include("skipif.inc"); ?>
---FILE--
-<?php
-printf("%s -> %s\n", urlencode("æ"), urlencode(utf8_encode("æ")));
-printf("%s <- %s\n", urlencode(utf8_decode(urldecode("%C3%A6"))), "%C3%A6");
-?>
---EXPECT--
-%E6 -> %C3%A6
-%E6 <- %C3%A6
diff --git a/ext/xml/tests/xml007.phpt b/ext/xml/tests/xml007.phpt
deleted file mode 100644
index 377475bb1c..0000000000
--- a/ext/xml/tests/xml007.phpt
+++ /dev/null
@@ -1,53 +0,0 @@
---TEST--
-xml_parse_into_struct/umlauts in tags
---SKIPIF--
-<?php // vim600: syn=php
-include("skipif.inc");
-if(strtoupper("äöüß") != "ÄÖÜß")
-{
-	die("skip strtoupper on non-ascii not supported on this platform");
-}
-?>
---FILE--
-<?php
-function startHandler($parser,$tag,$attr)
-{
-	var_dump($tag,$attr);
-}
-
-function endHandler($parser,$tag)
-{ 
-	var_dump($tag); 
-}
-
-$xmldata = '<?xml version="1.0" encoding="ISO-8859-1"?><äöü üäß="Üäß">ÄÖÜ</äöü>';
-$parser = xml_parser_create('ISO-8859-1');
-xml_set_element_handler($parser, "startHandler", "endHandler");
-xml_parse_into_struct($parser, $xmldata, $struct, $index);
-var_dump($struct);
-?>
---EXPECT--
-string(3) "ÄÖÜ"
-array(1) {
-  ["ÜÄß"]=>
-  string(3) "Üäß"
-}
-string(3) "ÄÖÜ"
-array(1) {
-  [0]=>
-  array(5) {
-    ["tag"]=>
-    string(3) "ÄÖÜ"
-    ["type"]=>
-    string(8) "complete"
-    ["level"]=>
-    int(1)
-    ["attributes"]=>
-    array(1) {
-      ["ÜÄß"]=>
-      string(3) "Üäß"
-    }
-    ["value"]=>
-    string(3) "ÄÖÜ"
-  }
-}
diff --git a/ext/xml/tests/xmltest.xml b/ext/xml/tests/xmltest.xml
deleted file mode 100644
index c15d6ea1ab..0000000000
--- a/ext/xml/tests/xmltest.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE phptest SYSTEM "notfound.dtd" [
-<!ENTITY % incent SYSTEM "inc.ent">
-%incent;
-]>
-<root id="elem1">
- Plain text.
- <elem1>
-  <!-- comment -->
-  <elem2>
-   <![CDATA[CDATA block]]>
-   <elem3>
-    &included-entity;
-    <elem4>
-     <?test processing instruction ?>
-    </elem4>
-   </elem3>
-  </elem2>
- </elem1>
-</root>
diff --git a/ext/xml/xml.c b/ext/xml/xml.c
deleted file mode 100644
index 728a811f47..0000000000
--- a/ext/xml/xml.c
+++ /dev/null
@@ -1,1619 +0,0 @@
-/*
-   +----------------------------------------------------------------------+
-   | PHP Version 5                                                        |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2004 The PHP Group                                |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.0 of the PHP license,       |
-   | that is bundled with this package in the file LICENSE, and is        |
-   | available through the world-wide-web at the following url:           |
-   | http://www.php.net/license/3_0.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: Stig Sæther Bakken <ssb@php.net>                            |
-   |          Thies C. Arntzen <thies@thieso.net>                         |
-   |          Sterling Hughes <sterling@php.net>                          |
-   +----------------------------------------------------------------------+
- */
-
-/* $Id$ */
-
-#define IS_EXT_MODULE
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "php.h"
-
-#define PHP_XML_INTERNAL
-#include "zend_variables.h"
-#include "ext/standard/php_string.h"
-#include "ext/standard/info.h"
-
-#if HAVE_XML
-
-#include "php_xml.h"
-# include "ext/standard/head.h"
-#ifdef LIBXML_EXPAT_COMPAT
-#include "ext/libxml/php_libxml.h"
-#endif
-
-/* Short-term TODO list:
- * - Implement XML_ExternalEntityParserCreate()
- * - XML_SetCommentHandler
- * - XML_SetCdataSectionHandler
- * - XML_SetParamEntityParsing
- */
-
-/* Long-term TODO list:
- * - Fix the expat library so you can install your own memory manager
- *   functions
- */
-
-/* Known bugs:
- * - Weird things happen with <![CDATA[]]> sections.
- */
-
-#ifdef ZTS
-int xml_globals_id;
-#else
-PHP_XML_API php_xml_globals xml_globals;
-#endif
-
-/* {{{ dynamically loadable module stuff */
-#ifdef COMPILE_DL_XML
-ZEND_GET_MODULE(xml)
-# ifdef PHP_WIN32
-# include "zend_arg_defs.c"
-# endif
-#endif /* COMPILE_DL_XML */
-/* }}} */
-
-/* {{{ function prototypes */
-PHP_MINIT_FUNCTION(xml);
-PHP_RINIT_FUNCTION(xml);
-PHP_MSHUTDOWN_FUNCTION(xml);
-PHP_RSHUTDOWN_FUNCTION(xml);
-PHP_MINFO_FUNCTION(xml);
-
-static void xml_parser_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC);
-static void xml_set_handler(zval **, zval **);
-inline static unsigned short xml_encode_iso_8859_1(unsigned char);
-inline static char xml_decode_iso_8859_1(unsigned short);
-inline static unsigned short xml_encode_us_ascii(unsigned char);
-inline static char xml_decode_us_ascii(unsigned short);
-static XML_Char *xml_utf8_encode(const char *, int, int *, const XML_Char *);
-static zval *xml_call_handler(xml_parser *, zval *, zend_function *, int, zval **);
-static zval *_xml_xmlchar_zval(const XML_Char *, int, const XML_Char *);
-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 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);
-void _xml_unparsedEntityDeclHandler(void *, const XML_Char *, const XML_Char *, const XML_Char *, const XML_Char *, const XML_Char *);
-void _xml_notationDeclHandler(void *, const XML_Char *, const XML_Char *, const XML_Char *, const XML_Char *);
-int  _xml_externalEntityRefHandler(XML_Parser, const XML_Char *, const XML_Char *, const XML_Char *, const XML_Char *);
-
-void _xml_startNamespaceDeclHandler(void *, const XML_Char *, const XML_Char *);
-void _xml_endNamespaceDeclHandler(void *, const XML_Char *);
-/* }}} */
-
-/* {{{ extension definition structures */
-static
-	ZEND_BEGIN_ARG_INFO(third_and_fourth_args_force_ref, 0)
-		ZEND_ARG_PASS_INFO(0)
-		ZEND_ARG_PASS_INFO(0)
-		ZEND_ARG_PASS_INFO(1)
-		ZEND_ARG_PASS_INFO(1)
-	ZEND_END_ARG_INFO();
-
-function_entry xml_functions[] = {
-	PHP_FE(xml_parser_create, NULL)
-	PHP_FE(xml_parser_create_ns, NULL)
-	PHP_FE(xml_set_object, second_arg_force_ref)
-	PHP_FE(xml_set_element_handler, NULL)
-	PHP_FE(xml_set_character_data_handler, NULL)
-	PHP_FE(xml_set_processing_instruction_handler, NULL)
-	PHP_FE(xml_set_default_handler, NULL)
-	PHP_FE(xml_set_unparsed_entity_decl_handler, NULL)
-	PHP_FE(xml_set_notation_decl_handler, NULL)
-	PHP_FE(xml_set_external_entity_ref_handler, NULL)
-	PHP_FE(xml_set_start_namespace_decl_handler, NULL)
-	PHP_FE(xml_set_end_namespace_decl_handler, NULL)
-	PHP_FE(xml_parse, NULL)
-	PHP_FE(xml_parse_into_struct, third_and_fourth_args_force_ref)
-	PHP_FE(xml_get_error_code, NULL)
-	PHP_FE(xml_error_string, NULL)
-	PHP_FE(xml_get_current_line_number, NULL)
-	PHP_FE(xml_get_current_column_number, NULL)
-	PHP_FE(xml_get_current_byte_index, NULL)
-	PHP_FE(xml_parser_free, NULL)
-	PHP_FE(xml_parser_set_option, NULL)
-	PHP_FE(xml_parser_get_option, NULL)
-	PHP_FE(utf8_encode, NULL)
-	PHP_FE(utf8_decode, NULL)
-	{NULL, NULL, NULL}
-};
-
-zend_module_entry xml_module_entry = {
-    STANDARD_MODULE_HEADER,
-	"xml",                /* extension name */
-	xml_functions,        /* extension function list */
-	PHP_MINIT(xml),       /* extension-wide startup function */
-	PHP_MSHUTDOWN(xml),   /* extension-wide shutdown function */
-	PHP_RINIT(xml),       /* per-request startup function */
-	PHP_RSHUTDOWN(xml),   /* per-request shutdown function */
-	PHP_MINFO(xml),       /* information function */
-    NO_VERSION_YET,
-	STANDARD_MODULE_PROPERTIES
-};
-
-/* All the encoding functions are set to NULL right now, since all
- * the encoding is currently done internally by expat/xmltok.
- */
-xml_encoding xml_encodings[] = {
-	{ "ISO-8859-1", xml_decode_iso_8859_1, xml_encode_iso_8859_1 },
-	{ "US-ASCII",   xml_decode_us_ascii,   xml_encode_us_ascii   },
-	{ "UTF-8",      NULL,                  NULL                  },
-	{ NULL,         NULL,                  NULL                  }
-};
-
-static XML_Memory_Handling_Suite php_xml_mem_hdlrs;
-
-/* True globals, no need for thread safety */
-static int le_xml_parser; 
-
-/* }}} */
-
-/* {{{ startup, shutdown and info functions */
-#ifdef ZTS
-static void php_xml_init_globals(php_xml_globals *xml_globals_p TSRMLS_DC)
-{
-	XML(default_encoding) = "ISO-8859-1";
-}
-#endif
-
-static void *php_xml_malloc_wrapper(size_t sz)
-{
-	return emalloc(sz);
-}
-
-static void *php_xml_realloc_wrapper(void *ptr, size_t sz)
-{
-	return erealloc(ptr, sz);
-}
-
-static void php_xml_free_wrapper(void *ptr)
-{
-	if (ptr != NULL) {
-		efree(ptr);
-	}
-}
-
-PHP_MINIT_FUNCTION(xml)
-{
-	le_xml_parser =	zend_register_list_destructors_ex(xml_parser_dtor, NULL, "xml", module_number);
-
-#ifdef ZTS
-	ts_allocate_id(&xml_globals_id, sizeof(php_xml_globals), (ts_allocate_ctor) php_xml_init_globals, NULL);
-#else
-	XML(default_encoding) = "ISO-8859-1";
-#endif
-
-	REGISTER_LONG_CONSTANT("XML_ERROR_NONE", XML_ERROR_NONE, CONST_CS|CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("XML_ERROR_NO_MEMORY", XML_ERROR_NO_MEMORY, CONST_CS|CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("XML_ERROR_SYNTAX", XML_ERROR_SYNTAX, CONST_CS|CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("XML_ERROR_NO_ELEMENTS", XML_ERROR_NO_ELEMENTS, CONST_CS|CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("XML_ERROR_INVALID_TOKEN", XML_ERROR_INVALID_TOKEN, CONST_CS|CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("XML_ERROR_UNCLOSED_TOKEN", XML_ERROR_UNCLOSED_TOKEN, CONST_CS|CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("XML_ERROR_PARTIAL_CHAR", XML_ERROR_PARTIAL_CHAR, CONST_CS|CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("XML_ERROR_TAG_MISMATCH", XML_ERROR_TAG_MISMATCH, CONST_CS|CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("XML_ERROR_DUPLICATE_ATTRIBUTE", XML_ERROR_DUPLICATE_ATTRIBUTE, CONST_CS|CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("XML_ERROR_JUNK_AFTER_DOC_ELEMENT", XML_ERROR_JUNK_AFTER_DOC_ELEMENT, CONST_CS|CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("XML_ERROR_PARAM_ENTITY_REF", XML_ERROR_PARAM_ENTITY_REF, CONST_CS|CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("XML_ERROR_UNDEFINED_ENTITY", XML_ERROR_UNDEFINED_ENTITY, CONST_CS|CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("XML_ERROR_RECURSIVE_ENTITY_REF", XML_ERROR_RECURSIVE_ENTITY_REF, CONST_CS|CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("XML_ERROR_ASYNC_ENTITY", XML_ERROR_ASYNC_ENTITY, CONST_CS|CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("XML_ERROR_BAD_CHAR_REF", XML_ERROR_BAD_CHAR_REF, CONST_CS|CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("XML_ERROR_BINARY_ENTITY_REF", XML_ERROR_BINARY_ENTITY_REF, CONST_CS|CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF", XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF, CONST_CS|CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("XML_ERROR_MISPLACED_XML_PI", XML_ERROR_MISPLACED_XML_PI, CONST_CS|CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("XML_ERROR_UNKNOWN_ENCODING", XML_ERROR_UNKNOWN_ENCODING, CONST_CS|CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("XML_ERROR_INCORRECT_ENCODING", XML_ERROR_INCORRECT_ENCODING, CONST_CS|CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("XML_ERROR_UNCLOSED_CDATA_SECTION", XML_ERROR_UNCLOSED_CDATA_SECTION, CONST_CS|CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("XML_ERROR_EXTERNAL_ENTITY_HANDLING", XML_ERROR_EXTERNAL_ENTITY_HANDLING, CONST_CS|CONST_PERSISTENT);
-
-	REGISTER_LONG_CONSTANT("XML_OPTION_CASE_FOLDING", PHP_XML_OPTION_CASE_FOLDING, CONST_CS|CONST_PERSISTENT);
-	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);
-
-	/* this object should not be pre-initialised at compile time,
-	   as the order of members may vary */  
-
-	php_xml_mem_hdlrs.malloc_fcn = php_xml_malloc_wrapper;
-	php_xml_mem_hdlrs.realloc_fcn = php_xml_realloc_wrapper;
-	php_xml_mem_hdlrs.free_fcn = php_xml_free_wrapper;
-
-#ifdef LIBXML_EXPAT_COMPAT
-	REGISTER_STRING_CONSTANT("XML_SAX_IMPL", "libxml", CONST_CS|CONST_PERSISTENT);
-#else
-	REGISTER_STRING_CONSTANT("XML_SAX_IMPL", "expat", CONST_CS|CONST_PERSISTENT);
-#endif
-
-	return SUCCESS;
-}
-
-
-PHP_RINIT_FUNCTION(xml)
-{
-    return SUCCESS;
-}
-
-
-PHP_MSHUTDOWN_FUNCTION(xml)
-{
-	return SUCCESS;
-}
-
-
-PHP_RSHUTDOWN_FUNCTION(xml)
-{
-	return SUCCESS;
-}
-
-
-PHP_MINFO_FUNCTION(xml)
-{
-	php_info_print_table_start();
-	php_info_print_table_row(2, "XML Support", "active");
-	php_info_print_table_row(2, "XML Namespace Support", "active");
-#if defined(LIBXML_DOTTED_VERSION) && defined(LIBXML_EXPAT_COMPAT)
-	php_info_print_table_row(2, "libxml2 Version", LIBXML_DOTTED_VERSION);
-#else
-	php_info_print_table_row(2, "EXPAT Version", XML_ExpatVersion());
-#endif
-	php_info_print_table_end();
-}
-/* }}} */
-
-/* {{{ extension-internal functions */
-static zval *_xml_resource_zval(long value)
-{
-	zval *ret;
-	TSRMLS_FETCH();
-
-	MAKE_STD_ZVAL(ret);
-
-	Z_TYPE_P(ret) = IS_RESOURCE;
-	Z_LVAL_P(ret) = value;
-
-	zend_list_addref(value);
-
-	return ret;
-}
-
-static zval *_xml_string_zval(const char *str)
-{
-	zval *ret;
-	int len = strlen(str);
-	MAKE_STD_ZVAL(ret);
-
-	Z_TYPE_P(ret) = IS_STRING;
-	Z_STRLEN_P(ret) = len;
-	Z_STRVAL_P(ret) = estrndup(str, len);
-	return ret;
-}
-
-static zval *_xml_xmlchar_zval(const XML_Char *s, int len, const XML_Char *encoding)
-{
-	zval *ret;
-	MAKE_STD_ZVAL(ret);
-	
-	if (s == NULL) {
-		ZVAL_FALSE(ret);
-		return ret;
-	}
-	if (len == 0) {
-		len = _xml_xmlcharlen(s);
-	}
-	Z_TYPE_P(ret) = IS_STRING;
-	Z_STRVAL_P(ret) = xml_utf8_decode(s, len, &Z_STRLEN_P(ret), encoding);
-	return ret;
-}
-/* }}} */
-
-/* {{{ xml_parser_dtor() */
-static void xml_parser_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC)
-{
-	xml_parser *parser = (xml_parser *)rsrc->ptr;
-	
-	if (parser->parser) {
-		XML_ParserFree(parser->parser);
-	}
-	if (parser->ltags) {
-		int inx;
-		for (inx = 0; inx < parser->level; inx++)
-			efree(parser->ltags[ inx ]);
-		efree(parser->ltags);
-	}
-	if (parser->startElementHandler) {
-		zval_ptr_dtor(&parser->startElementHandler);
-	}
-	if (parser->endElementHandler) {
-		zval_ptr_dtor(&parser->endElementHandler);
-	}
-	if (parser->characterDataHandler) {
-		zval_ptr_dtor(&parser->characterDataHandler);
-	}
-	if (parser->processingInstructionHandler) {
-		zval_ptr_dtor(&parser->processingInstructionHandler);
-	}
-	if (parser->defaultHandler) {
-		zval_ptr_dtor(&parser->defaultHandler);
-	}
-	if (parser->unparsedEntityDeclHandler) {
-		zval_ptr_dtor(&parser->unparsedEntityDeclHandler);
-	}
-	if (parser->notationDeclHandler) {
-		zval_ptr_dtor(&parser->notationDeclHandler);
-	}
-	if (parser->externalEntityRefHandler) {
-		zval_ptr_dtor(&parser->externalEntityRefHandler);
-	}
-	if (parser->unknownEncodingHandler) {
-		zval_ptr_dtor(&parser->unknownEncodingHandler);
-	}
-	if (parser->startNamespaceDeclHandler) {
-		zval_ptr_dtor(&parser->startNamespaceDeclHandler);
-	}
-	if (parser->endNamespaceDeclHandler) {
-		zval_ptr_dtor(&parser->endNamespaceDeclHandler);
-	}
-	if (parser->baseURI) {
-		efree(parser->baseURI);
-	}
-
-	efree(parser);
-}
-/* }}} */
-
-/* {{{ xml_set_handler() */
-static void xml_set_handler(zval **handler, zval **data)
-{
-	/* If we have already a handler, release it */
-	if (*handler) {
-		zval_ptr_dtor(handler);
-	}
-
-	/* IS_ARRAY might indicate that we're using array($obj, 'method') syntax */
-	if (Z_TYPE_PP(data) != IS_ARRAY) {
-		convert_to_string_ex(data);
-	}
-
-	zval_add_ref(data);
-
-	*handler = *data;
-}
-/* }}} */
-
-/* {{{ xml_call_handler() */
-static zval *xml_call_handler(xml_parser *parser, zval *handler, zend_function *function_ptr, int argc, zval **argv)
-{
-	TSRMLS_FETCH();
-
-	if (parser && handler) {
-		zval ***args;
-		zval *retval;
-		int i;	
-		int result;
-		zend_fcall_info fci;
-
-		args = safe_emalloc(sizeof(zval **), argc, 0);
-		for (i = 0; i < argc; i++) {
-			args[i] = &argv[i];
-		}
-		
-		fci.size = sizeof(fci);
-		fci.function_table = EG(function_table);
-		fci.function_name = handler;
-		fci.symbol_table = NULL;
-		fci.object_pp = &parser->object;
-		fci.retval_ptr_ptr = &retval;
-		fci.param_count = argc;
-		fci.params = args;
-		fci.no_separation = 0;
-		/*fci.function_handler_cache = &function_ptr;*/
-
-		result = zend_call_function(&fci, NULL TSRMLS_CC);
-		if (result == FAILURE) {
-			zval **method;
-			zval **obj;
-
-			if (Z_TYPE_P(handler) == IS_STRING) {
-				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to call handler %s()", Z_STRVAL_P(handler));
-			} else if (zend_hash_index_find(Z_ARRVAL_P(handler), 0, (void **) &obj) == SUCCESS &&
-					   zend_hash_index_find(Z_ARRVAL_P(handler), 1, (void **) &method) == SUCCESS &&
-					   Z_TYPE_PP(obj) == IS_OBJECT &&
-					   Z_TYPE_PP(method) == IS_STRING) {
-				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to call handler %s::%s()", Z_OBJCE_PP(obj)->name, Z_STRVAL_PP(method));
-			} else 
-				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to call handler");
-		}
-
-		for (i = 0; i < argc; i++) {
-			zval_ptr_dtor(args[i]);
-		}
-		efree(args);
-
-		if (result == FAILURE) {
-			return NULL;
-		} else {
-			return retval;
-		}
-	}
-	return NULL;
-}
-/* }}} */
-
-/* {{{ xml_encode_iso_8859_1() */
-inline static unsigned short xml_encode_iso_8859_1(unsigned char c)
-{
-	return (unsigned short)c;
-}
-/* }}} */
-
-/* {{{ xml_decode_iso_8859_1() */
-inline static char xml_decode_iso_8859_1(unsigned short c)
-{
-	return (char)(c > 0xff ? '?' : c);
-}
-/* }}} */
-
-/* {{{ xml_encode_us_ascii() */
-inline static unsigned short xml_encode_us_ascii(unsigned char c)
-{
-	return (unsigned short)c;
-}
-/* }}} */
-
-/* {{{ xml_decode_us_ascii() */
-inline static char xml_decode_us_ascii(unsigned short c)
-{
-	return (char)(c > 0x7f ? '?' : c);
-}
-/* }}} */
-
-/* {{{ xml_get_encoding() */
-static xml_encoding *xml_get_encoding(const XML_Char *name)
-{
-	xml_encoding *enc = &xml_encodings[0];
-
-	while (enc && enc->name) {
-		if (strcasecmp(name, enc->name) == 0) {
-			return enc;
-		}
-		enc++;
-	}
-	return NULL;
-}
-/* }}} */
-
-/* {{{ xml_utf8_encode */
-static XML_Char *xml_utf8_encode(const char *s, int len, int *newlen, const XML_Char *encoding)
-{
-	int pos = len;
-	char *newbuf;
-	unsigned int c;
-	unsigned short (*encoder)(unsigned char) = NULL;
-	xml_encoding *enc = xml_get_encoding(encoding);
-
-	*newlen = 0;
-	if (enc) {
-		encoder = enc->encoding_function;
-	} else {
-		/* If the target encoding was unknown, fail */
-		return NULL;
-	}
-	if (encoder == NULL) {
-		/* If no encoder function was specified, return the data as-is.
-		 */
-		newbuf = emalloc(len + 1);
-		memcpy(newbuf, s, len);
-		*newlen = len;
-		newbuf[*newlen] = '\0';
-		return newbuf;
-	}
-	/* This is the theoretical max (will never get beyond len * 2 as long
-	 * as we are converting from single-byte characters, though) */
-	newbuf = safe_emalloc(len, 4, 1);
-	while (pos > 0) {
-		c = encoder ? encoder((unsigned char)(*s)) : (unsigned short)(*s);
-		if (c < 0x80) {
-			newbuf[(*newlen)++] = (char) c;
-		} else if (c < 0x800) {
-			newbuf[(*newlen)++] = (0xc0 | (c >> 6));
-			newbuf[(*newlen)++] = (0x80 | (c & 0x3f));
-		} else if (c < 0x10000) {
-			newbuf[(*newlen)++] = (0xe0 | (c >> 12));
-			newbuf[(*newlen)++] = (0xc0 | ((c >> 6) & 0x3f));
-			newbuf[(*newlen)++] = (0x80 | (c & 0x3f));
-		} else if (c < 0x200000) {
-			newbuf[(*newlen)++] = (0xf0 | (c >> 18));
-			newbuf[(*newlen)++] = (0xe0 | ((c >> 12) & 0x3f));
-			newbuf[(*newlen)++] = (0xc0 | ((c >> 6) & 0x3f));
-			newbuf[(*newlen)++] = (0x80 | (c & 0x3f));
-		}
-		pos--;
-		s++;
-	}
-	newbuf[*newlen] = 0;
-	newbuf = erealloc(newbuf, (*newlen)+1);
-	return newbuf;
-}
-/* }}} */
-
-/* {{{ xml_utf8_decode */
-PHPAPI char *xml_utf8_decode(const XML_Char *s, int len, int *newlen, const XML_Char *encoding)
-{
-	int pos = len;
-	char *newbuf = emalloc(len + 1);
-	unsigned short c;
-	char (*decoder)(unsigned short) = NULL;
-	xml_encoding *enc = xml_get_encoding(encoding);
-
-	*newlen = 0;
-	if (enc) {
-		decoder = enc->decoding_function;
-	}
-	if (decoder == NULL) {
-		/* If the target encoding was unknown, or no decoder function
-		 * was specified, return the UTF-8-encoded data as-is.
-		 */
-		memcpy(newbuf, s, len);
-		*newlen = len;
-		newbuf[*newlen] = '\0';
-		return newbuf;
-	}
-	while (pos > 0) {
-		c = (unsigned char)(*s);
-		if (c >= 0xf0) { /* four bytes encoded, 21 bits */
-			c = ((s[0]&7)<<18) | ((s[1]&63)<<12) | ((s[2]&63)<<6) | (s[3]&63);
-			s += 4;
-			pos -= 4;
-		} else if (c >= 0xe0) { /* three bytes encoded, 16 bits */
-			c = ((s[0]&63)<<12) | ((s[1]&63)<<6) | (s[2]&63);
-			s += 3;
-			pos -= 3;
-		} else if (c >= 0xc0) { /* two bytes encoded, 11 bits */
-			c = ((s[0]&63)<<6) | (s[1]&63);
-			s += 2;
-			pos -= 2;
-		} else {
-			s++;
-			pos--;
-		}
-		newbuf[*newlen] = decoder ? decoder(c) : c;
-		++*newlen;
-	}
-	if (*newlen < len) {
-		newbuf = erealloc(newbuf, *newlen + 1);
-	}
-	newbuf[*newlen] = '\0';
-	return newbuf;
-}
-/* }}} */
-
-/* {{{ _xml_xmlcharlen() */
-static int _xml_xmlcharlen(const XML_Char *s)
-{
-	int len = 0;
-
-	while (*s) {
-		len++;
-		s++;
-	}
-	return len;
-}
-/* }}} */
-
-/* {{{ _xml_zval_strdup() */
-PHPAPI char *_xml_zval_strdup(zval *val)
-{
-	if (Z_TYPE_P(val) == IS_STRING) {
-		char *buf = emalloc(Z_STRLEN_P(val) + 1);
-		memcpy(buf, Z_STRVAL_P(val), Z_STRLEN_P(val));
-		buf[Z_STRLEN_P(val)] = '\0';
-		return buf;
-	}
-	return NULL;
-}
-/* }}} */
-
-/* {{{ _xml_add_to_info */
-static void _xml_add_to_info(xml_parser *parser,char *name)
-{
-	zval **element, *values;
-
-	if (! parser->info) {
-		return;
-	}
-
-	if (zend_hash_find(Z_ARRVAL_P(parser->info),name,strlen(name) + 1,(void **) &element) == FAILURE) {
-		MAKE_STD_ZVAL(values);
-		
-		array_init(values);
-		
-		zend_hash_update(Z_ARRVAL_P(parser->info), name, strlen(name)+1, (void *) &values, sizeof(zval*), (void **) &element);
-	} 
-			
-	add_next_index_long(*element,parser->curtag);
-	
-	parser->curtag++;
-}
-/* }}} */
-
-/* {{{ _xml_decode_tag() */
-static char *_xml_decode_tag(xml_parser *parser, const char *tag)
-{
-	char *newstr;
-	int out_len;
-
-	newstr = xml_utf8_decode(tag, strlen(tag), &out_len, parser->target_encoding);
-
-	if (parser->case_folding) {
-		php_strtoupper(newstr, out_len);
-	}
-
-	return newstr;
-}
-/* }}} */
-
-/* {{{ _xml_startElementHandler() */
-void _xml_startElementHandler(void *userData, const XML_Char *name, const XML_Char **attributes)
-{
-	xml_parser *parser = (xml_parser *)userData;
-	const char **attrs = (const char **) attributes;
-	char *tag_name;
-	char *att, *val;
-	int val_len;
-	zval *retval, *args[3];
-
-	if (parser) {
-		parser->level++;
-
-		tag_name = _xml_decode_tag(parser, name);
-
-		if (parser->startElementHandler) {
-			args[0] = _xml_resource_zval(parser->index);
-			args[1] = _xml_string_zval(tag_name);
-			MAKE_STD_ZVAL(args[2]);
-			array_init(args[2]);
-
-			while (attributes && *attributes) {
-				att = _xml_decode_tag(parser, attributes[0]);
-				val = xml_utf8_decode(attributes[1], strlen(attributes[1]), &val_len, parser->target_encoding);
-
-				add_assoc_stringl(args[2], att, val, val_len, 0);
-
-				attributes += 2;
-
-				efree(att);
-			}
-			
-			if ((retval = xml_call_handler(parser, parser->startElementHandler, parser->startElementPtr, 3, args))) {
-				zval_ptr_dtor(&retval);
-			}
-		} 
-
-		if (parser->data) {
-			zval *tag, *atr;
-			int atcnt = 0;
-
-			MAKE_STD_ZVAL(tag);
-			MAKE_STD_ZVAL(atr);
-
-			array_init(tag);
-			array_init(atr);
-
-			_xml_add_to_info(parser,((char *) tag_name) + parser->toffset);
-
-			add_assoc_string(tag,"tag",((char *) tag_name) + parser->toffset,1); /* cast to avoid gcc-warning */
-			add_assoc_string(tag,"type","open",1);
-			add_assoc_long(tag,"level",parser->level);
-
-			parser->ltags[parser->level-1] = estrdup(tag_name);
-			parser->lastwasopen = 1;
-
-			attributes = (const XML_Char **) attrs;
-
-			while (attributes && *attributes) {
-				att = _xml_decode_tag(parser, attributes[0]);
-				val = xml_utf8_decode(attributes[1], strlen(attributes[1]), &val_len, parser->target_encoding);
-				
-				add_assoc_stringl(atr,att,val,val_len,0);
-
-				atcnt++;
-				attributes += 2;
-
-				efree(att);
-			}
-
-			if (atcnt) {
-				zend_hash_add(Z_ARRVAL_P(tag),"attributes",sizeof("attributes"),&atr,sizeof(zval*),NULL);
-			} else {
-				zval_ptr_dtor(&atr);
-			}
-
-			zend_hash_next_index_insert(Z_ARRVAL_P(parser->data),&tag,sizeof(zval*),(void *) &parser->ctag);
-		}
-
-		efree(tag_name);
-	}
-}
-/* }}} */
-
-/* {{{ _xml_endElementHandler() */
-void _xml_endElementHandler(void *userData, const XML_Char *name)
-{
-	xml_parser *parser = (xml_parser *)userData;
-	char *tag_name;
-
-	if (parser) {
-		zval *retval, *args[2];
-
-		tag_name = _xml_decode_tag(parser, name);
-
-		if (parser->endElementHandler) {
-			args[0] = _xml_resource_zval(parser->index);
-			args[1] = _xml_string_zval(tag_name);
-
-			if ((retval = xml_call_handler(parser, parser->endElementHandler, parser->endElementPtr, 2, args))) {
-				zval_ptr_dtor(&retval);
-			}
-		} 
-
-		if (parser->data) {
-			zval *tag;
-
-			if (parser->lastwasopen) {
-				add_assoc_string(*(parser->ctag),"type","complete",1);
-			} else {
-				MAKE_STD_ZVAL(tag);
-
-				array_init(tag);
-				  
-				_xml_add_to_info(parser,((char *) tag_name) + parser->toffset);
-
-				add_assoc_string(tag,"tag",((char *) tag_name) + parser->toffset,1); /* cast to avoid gcc-warning */
-				add_assoc_string(tag,"type","close",1);
-				add_assoc_long(tag,"level",parser->level);
-				  
-				zend_hash_next_index_insert(Z_ARRVAL_P(parser->data),&tag,sizeof(zval*),NULL);
-			}
-
-			parser->lastwasopen = 0;
-		}
-
-		efree(tag_name);
-
-		if (parser->ltags) {
-			efree(parser->ltags[parser->level-1]);
-		}
-
-		parser->level--;
-	}
-}
-/* }}} */
-
-/* {{{ _xml_characterDataHandler() */
-void _xml_characterDataHandler(void *userData, const XML_Char *s, int len)
-{
-	xml_parser *parser = (xml_parser *)userData;
-
-	if (parser) {
-		zval *retval, *args[2];
-
-		if (parser->characterDataHandler) {
-			args[0] = _xml_resource_zval(parser->index);
-			args[1] = _xml_xmlchar_zval(s, len, parser->target_encoding);
-			if ((retval = xml_call_handler(parser, parser->characterDataHandler, parser->characterDataPtr, 2, args))) {
-				zval_ptr_dtor(&retval);
-			}
-		} 
-
-		if (parser->data) {
-			int i;
-			int doprint = 0;
-
-			char *decoded_value;
-			int decoded_len;
-			
-			decoded_value = xml_utf8_decode(s,len,&decoded_len,parser->target_encoding);
-			for (i = 0; i < decoded_len; i++) {
-				switch (decoded_value[i]) {
-				case ' ':
-				case '\t':
-				case '\n':
-					continue;
-				default:
-					doprint = 1;
-					break;
-				}
-				if (doprint) {
-					break;
-				}
-			}
-			if (doprint || (! parser->skipwhite)) {
-				if (parser->lastwasopen) {
-					zval **myval;
-					
-					/* check if the current tag already has a value - if yes append to that! */
-					if (zend_hash_find(Z_ARRVAL_PP(parser->ctag),"value",sizeof("value"),(void **) &myval) == SUCCESS) {
-						int newlen = Z_STRLEN_PP(myval) + decoded_len;
-						Z_STRVAL_PP(myval) = erealloc(Z_STRVAL_PP(myval),newlen+1);
-						strcpy(Z_STRVAL_PP(myval) + Z_STRLEN_PP(myval),decoded_value);
-						Z_STRLEN_PP(myval) += decoded_len;
-						efree(decoded_value);
-					} else {
-						add_assoc_string(*(parser->ctag),"value",decoded_value,0);
-					}
-					
-				} else {
-					zval *tag;
-
-					MAKE_STD_ZVAL(tag);
-					
-					array_init(tag);
-					
-					_xml_add_to_info(parser,parser->ltags[parser->level-1] + parser->toffset);
-
-					add_assoc_string(tag,"tag",parser->ltags[parser->level-1] + parser->toffset,1);
-					add_assoc_string(tag,"value",decoded_value,0);
-					add_assoc_string(tag,"type","cdata",1);
-					add_assoc_long(tag,"level",parser->level);
-
-					zend_hash_next_index_insert(Z_ARRVAL_P(parser->data),&tag,sizeof(zval*),NULL);
-				}
-			} else {
-				efree(decoded_value);
-			}
-		}
-	}
-}
-/* }}} */
-
-/* {{{ _xml_processingInstructionHandler() */
-void _xml_processingInstructionHandler(void *userData, const XML_Char *target, const XML_Char *data)
-{
-	xml_parser *parser = (xml_parser *)userData;
-
-	if (parser && parser->processingInstructionHandler) {
-		zval *retval, *args[3];
-
-		args[0] = _xml_resource_zval(parser->index);
-		args[1] = _xml_xmlchar_zval(target, 0, parser->target_encoding);
-		args[2] = _xml_xmlchar_zval(data, 0, parser->target_encoding);
-		if ((retval = xml_call_handler(parser, parser->processingInstructionHandler, parser->processingInstructionPtr, 3, args))) {
-			zval_ptr_dtor(&retval);
-		}
-	}
-}
-/* }}} */
-
-/* {{{ _xml_defaultHandler() */
-void _xml_defaultHandler(void *userData, const XML_Char *s, int len)
-{
-	xml_parser *parser = (xml_parser *)userData;
-
-	if (parser && parser->defaultHandler) {
-		zval *retval, *args[2];
-
-		args[0] = _xml_resource_zval(parser->index);
-		args[1] = _xml_xmlchar_zval(s, len, parser->target_encoding);
-		if ((retval = xml_call_handler(parser, parser->defaultHandler, parser->defaultPtr, 2, args))) {
-			zval_ptr_dtor(&retval);
-		}
-	}
-}
-/* }}} */
-
-/* {{{ _xml_unparsedEntityDeclHandler() */
-void _xml_unparsedEntityDeclHandler(void *userData, 
-										 const XML_Char *entityName, 
-										 const XML_Char *base,
-										 const XML_Char *systemId,
-										 const XML_Char *publicId,
-										 const XML_Char *notationName)
-{
-	xml_parser *parser = (xml_parser *)userData;
-
-	if (parser && parser->unparsedEntityDeclHandler) {
-		zval *retval, *args[6];
-
-		args[0] = _xml_resource_zval(parser->index);
-		args[1] = _xml_xmlchar_zval(entityName, 0, parser->target_encoding);
-		args[2] = _xml_xmlchar_zval(base, 0, parser->target_encoding);
-		args[3] = _xml_xmlchar_zval(systemId, 0, parser->target_encoding);
-		args[4] = _xml_xmlchar_zval(publicId, 0, parser->target_encoding);
-		args[5] = _xml_xmlchar_zval(notationName, 0, parser->target_encoding);
-		if ((retval = xml_call_handler(parser, parser->unparsedEntityDeclHandler, parser->unparsedEntityDeclPtr, 6, args))) {
-			zval_ptr_dtor(&retval);
-		}
-	}
-}
-/* }}} */
-
-/* {{{ _xml_notationDeclHandler() */
-void _xml_notationDeclHandler(void *userData,
-							  const XML_Char *notationName,
-							  const XML_Char *base,
-							  const XML_Char *systemId,
-							  const XML_Char *publicId)
-{
-	xml_parser *parser = (xml_parser *)userData;
-
-	if (parser && parser->notationDeclHandler) {
-		zval *retval, *args[5];
-
-		args[0] = _xml_resource_zval(parser->index);
-		args[1] = _xml_xmlchar_zval(notationName, 0, parser->target_encoding);
-		args[2] = _xml_xmlchar_zval(base, 0, parser->target_encoding);
-		args[3] = _xml_xmlchar_zval(systemId, 0, parser->target_encoding);
-		args[4] = _xml_xmlchar_zval(publicId, 0, parser->target_encoding);
-		if ((retval = xml_call_handler(parser, parser->notationDeclHandler, parser->notationDeclPtr, 5, args))) {
-			zval_ptr_dtor(&retval);
-		}
-	}
-}
-/* }}} */
-
-/* {{{ _xml_externalEntityRefHandler() */
-int _xml_externalEntityRefHandler(XML_Parser parserPtr,
-								   const XML_Char *openEntityNames,
-								   const XML_Char *base,
-								   const XML_Char *systemId,
-								   const XML_Char *publicId)
-{
-	xml_parser *parser = XML_GetUserData(parserPtr);
-	int ret = 0; /* abort if no handler is set (should be configurable?) */
-
-	if (parser && parser->externalEntityRefHandler) {
-		zval *retval, *args[5];
-
-		args[0] = _xml_resource_zval(parser->index);
-		args[1] = _xml_xmlchar_zval(openEntityNames, 0, parser->target_encoding);
-		args[2] = _xml_xmlchar_zval(base, 0, parser->target_encoding);
-		args[3] = _xml_xmlchar_zval(systemId, 0, parser->target_encoding);
-		args[4] = _xml_xmlchar_zval(publicId, 0, parser->target_encoding);
-		if ((retval = xml_call_handler(parser, parser->externalEntityRefHandler, parser->externalEntityRefPtr, 5, args))) {
-			convert_to_long(retval);
-			ret = Z_LVAL_P(retval);
-			efree(retval);
-		} else {
-			ret = 0;
-		}
-	}
-	return ret;
-}
-/* }}} */
-
-/* {{{ _xml_startNamespaceDeclHandler() */
-void _xml_startNamespaceDeclHandler(void *userData,const XML_Char *prefix, const XML_Char *uri)
-{
-	xml_parser *parser = (xml_parser *)userData;
-
-	if (parser && parser->startNamespaceDeclHandler) {
-		zval *retval, *args[3];
-
-		args[0] = _xml_resource_zval(parser->index);
-		args[1] = _xml_xmlchar_zval(prefix, 0, parser->target_encoding);
-		args[2] = _xml_xmlchar_zval(uri, 0, parser->target_encoding);
-		if ((retval = xml_call_handler(parser, parser->startNamespaceDeclHandler, parser->startNamespaceDeclPtr, 3, args))) {
-			zval_ptr_dtor(&retval);
-		}
-	}
-}
-/* }}} */
-
-/* {{{ _xml_endNamespaceDeclHandler() */
-void _xml_endNamespaceDeclHandler(void *userData, const XML_Char *prefix)
-{
-	xml_parser *parser = (xml_parser *)userData;
-
-	if (parser && parser->endNamespaceDeclHandler) {
-		zval *retval, *args[2];
-
-		args[0] = _xml_resource_zval(parser->index);
-		args[1] = _xml_xmlchar_zval(prefix, 0, parser->target_encoding);
-		if ((retval = xml_call_handler(parser, parser->endNamespaceDeclHandler, parser->endNamespaceDeclPtr, 2, args))) {
-			zval_ptr_dtor(&retval);
-		}
-	}
-}
-/* }}} */
-
-/************************* EXTENSION FUNCTIONS *************************/
-
-static void php_xml_parser_create_impl(INTERNAL_FUNCTION_PARAMETERS, int ns_support)
-{
-	xml_parser *parser;
-	int auto_detect = 0;
-
-	char *encoding_param = NULL;
-	int encoding_param_len = 0;
-
-	char *ns_param = NULL;
-	int ns_param_len = 0;
-	
-	XML_Char *encoding;
-	
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, (ns_support ? "|ss": "|s"), &encoding_param, &encoding_param_len, &ns_param, &ns_param_len) == FAILURE) {
-		RETURN_FALSE;
-	}
-
-	if (encoding_param != NULL) {
-		/* The supported encoding types are hardcoded here because
-		 * we are limited to the encodings supported by expat/xmltok.
-		 */
-		if (encoding_param_len == 0) {
-			encoding = XML(default_encoding);
-			auto_detect = 1;
-		} else if (strcasecmp(encoding_param, "ISO-8859-1") == 0) {
-			encoding = "ISO-8859-1";
-		} else if (strcasecmp(encoding_param, "UTF-8") == 0) {
-			encoding = "UTF-8";
-		} else if (strcasecmp(encoding_param, "US-ASCII") == 0) {
-			encoding = "US-ASCII";
-		} else {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "unsupported source encoding \"%s\"", encoding_param);
-			RETURN_FALSE;
-		}
-	} else {
-		encoding = XML(default_encoding);
-	}
-
-	if (ns_support && ns_param == NULL){
-		ns_param = ":";
-	}
-
-	parser = ecalloc(sizeof(xml_parser), 1);
-	parser->parser = XML_ParserCreate_MM((auto_detect ? NULL : encoding),
-                                         &php_xml_mem_hdlrs, ns_param);
-
-	parser->target_encoding = encoding;
-	parser->case_folding = 1;
-	parser->object = NULL;
-	XML_SetUserData(parser->parser, parser);
-
-	ZEND_REGISTER_RESOURCE(return_value, parser,le_xml_parser);
-	parser->index = Z_LVAL_P(return_value);
-}
-
-/* {{{ proto resource xml_parser_create([string encoding]) 
-   Create an XML parser */
-PHP_FUNCTION(xml_parser_create)
-{
-	php_xml_parser_create_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);	
-}
-/* }}} */
-
-/* {{{ proto resource xml_parser_create_ns([string encoding [, string sep]]) 
-   Create an XML parser */
-PHP_FUNCTION(xml_parser_create_ns)
-{
-	php_xml_parser_create_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
-}
-/* }}} */
-
-/* {{{ proto int xml_set_object(resource parser, object &obj) 
-   Set up object which should be used for callbacks */
-PHP_FUNCTION(xml_set_object)
-{
-	xml_parser *parser;
-	zval **pind, **mythis;
-
-	if (ZEND_NUM_ARGS() != 2 ||
-		zend_get_parameters_ex(2, &pind, &mythis) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-
-	if (Z_TYPE_PP(mythis) != IS_OBJECT) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Argument 2 has wrong type");
-		RETURN_FALSE;
-	}
-
-	ZEND_FETCH_RESOURCE(parser,xml_parser *,pind, -1, "XML Parser", le_xml_parser);
-
-	/* please leave this commented - or ask thies@thieso.net before doing it (again) */
-	if (parser->object) {
-		zval_ptr_dtor(&parser->object);
-	}
-	
-	parser->object = *mythis;
-
-	/* please leave this commented - or ask thies@thieso.net before doing it (again) */
-/* #ifdef ZEND_ENGINE_2
-	zval_add_ref(&parser->object); 
-#endif */
-
-	RETVAL_TRUE;
-}
-/* }}} */
-
-/* {{{ proto int xml_set_element_handler(resource parser, string shdl, string ehdl) 
-   Set up start and end element handlers */
-PHP_FUNCTION(xml_set_element_handler)
-{
-	xml_parser *parser;
-	zval **pind, **shdl, **ehdl;
-
-	if (ZEND_NUM_ARGS() != 3 ||
-		zend_get_parameters_ex(3, &pind, &shdl, &ehdl) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-
-	ZEND_FETCH_RESOURCE(parser,xml_parser *,pind, -1, "XML Parser", le_xml_parser);
-
-	xml_set_handler(&parser->startElementHandler, shdl);
-	xml_set_handler(&parser->endElementHandler, ehdl);
-	XML_SetElementHandler(parser->parser, _xml_startElementHandler, _xml_endElementHandler);
-	RETVAL_TRUE;
-}
-/* }}} */
-
-/* {{{ proto int xml_set_character_data_handler(resource parser, string hdl) 
-   Set up character data handler */
-PHP_FUNCTION(xml_set_character_data_handler)
-{
-	xml_parser *parser;
-	zval **pind, **hdl;
-
-	if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &pind, &hdl) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-
-	ZEND_FETCH_RESOURCE(parser,xml_parser *, pind, -1, "XML Parser", le_xml_parser);
-
-	xml_set_handler(&parser->characterDataHandler, hdl);
-	XML_SetCharacterDataHandler(parser->parser, _xml_characterDataHandler);
-	RETVAL_TRUE;
-}
-/* }}} */
-
-/* {{{ proto int xml_set_processing_instruction_handler(resource parser, string hdl) 
-   Set up processing instruction (PI) handler */
-PHP_FUNCTION(xml_set_processing_instruction_handler)
-{
-	xml_parser *parser;
-	zval **pind, **hdl;
-
-	if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &pind, &hdl) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-
-	ZEND_FETCH_RESOURCE(parser,xml_parser *, pind, -1, "XML Parser", le_xml_parser);
-
-	xml_set_handler(&parser->processingInstructionHandler, hdl);
-	XML_SetProcessingInstructionHandler(parser->parser, _xml_processingInstructionHandler);
-	RETVAL_TRUE;
-}
-/* }}} */
-
-/* {{{ proto int xml_set_default_handler(resource parser, string hdl) 
-   Set up default handler */
-PHP_FUNCTION(xml_set_default_handler)
-{
-	xml_parser *parser;
-	zval **pind, **hdl;
-
-	if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &pind, &hdl) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-	ZEND_FETCH_RESOURCE(parser,xml_parser *, pind, -1, "XML Parser", le_xml_parser);
-
-	xml_set_handler(&parser->defaultHandler, hdl);
-	XML_SetDefaultHandler(parser->parser, _xml_defaultHandler);
-	RETVAL_TRUE;
-}
-/* }}} */
-
-/* {{{ proto int xml_set_unparsed_entity_decl_handler(resource parser, string hdl) 
-   Set up unparsed entity declaration handler */
-PHP_FUNCTION(xml_set_unparsed_entity_decl_handler)
-{
-	xml_parser *parser;
-	zval **pind, **hdl;
-
-	if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &pind, &hdl) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-
-	ZEND_FETCH_RESOURCE(parser,xml_parser *, pind, -1, "XML Parser", le_xml_parser);
-
-	xml_set_handler(&parser->unparsedEntityDeclHandler, hdl);
-	XML_SetUnparsedEntityDeclHandler(parser->parser, _xml_unparsedEntityDeclHandler);
-	RETVAL_TRUE;
-}
-/* }}} */
-
-/* {{{ proto int xml_set_notation_decl_handler(resource parser, string hdl) 
-   Set up notation declaration handler */
-PHP_FUNCTION(xml_set_notation_decl_handler)
-{
-	xml_parser *parser;
-	zval **pind, **hdl;
-
-	if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &pind, &hdl) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-	ZEND_FETCH_RESOURCE(parser,xml_parser *, pind, -1, "XML Parser", le_xml_parser);
-
-	xml_set_handler(&parser->notationDeclHandler, hdl);
-	XML_SetNotationDeclHandler(parser->parser, _xml_notationDeclHandler);
-	RETVAL_TRUE;
-}
-/* }}} */
-
-/* {{{ proto int xml_set_external_entity_ref_handler(resource parser, string hdl) 
-   Set up external entity reference handler */
-PHP_FUNCTION(xml_set_external_entity_ref_handler)
-{
-	xml_parser *parser;
-	zval **pind, **hdl;
-
-	if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &pind, &hdl) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-	ZEND_FETCH_RESOURCE(parser,xml_parser *, pind, -1, "XML Parser", le_xml_parser);
-
-	xml_set_handler(&parser->externalEntityRefHandler, hdl);
-	XML_SetExternalEntityRefHandler(parser->parser, (void *) _xml_externalEntityRefHandler);
-	RETVAL_TRUE;
-}
-/* }}} */
-
-/* {{{ proto int xml_set_start_namespace_decl_handler(resource parser, string hdl) 
-   Set up character data handler */
-PHP_FUNCTION(xml_set_start_namespace_decl_handler)
-{
-	xml_parser *parser;
-	zval **pind, **hdl;
-
-	if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &pind, &hdl) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-
-	ZEND_FETCH_RESOURCE(parser,xml_parser *, pind, -1, "XML Parser", le_xml_parser);
-
-	xml_set_handler(&parser->startNamespaceDeclHandler, hdl);
-	XML_SetStartNamespaceDeclHandler(parser->parser, _xml_startNamespaceDeclHandler);
-	RETVAL_TRUE;
-}
-/* }}} */
-
-/* {{{ proto int xml_set_end_namespace_decl_handler(resource parser, string hdl) 
-   Set up character data handler */
-PHP_FUNCTION(xml_set_end_namespace_decl_handler)
-{
-	xml_parser *parser;
-	zval **pind, **hdl;
-
-	if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &pind, &hdl) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-
-	ZEND_FETCH_RESOURCE(parser,xml_parser *, pind, -1, "XML Parser", le_xml_parser);
-
-	xml_set_handler(&parser->endNamespaceDeclHandler, hdl);
-	XML_SetEndNamespaceDeclHandler(parser->parser, _xml_endNamespaceDeclHandler);
-	RETVAL_TRUE;
-}
-/* }}} */
-
-/* {{{ proto int xml_parse(resource parser, string data [, int isFinal]) 
-   Start parsing an XML document */
-PHP_FUNCTION(xml_parse)
-{
-	xml_parser *parser;
-	zval **pind, **data, **final;
-	int argc, isFinal, ret;
-
-	argc = ZEND_NUM_ARGS();
-	if (argc < 2 || argc > 3 || zend_get_parameters_ex(argc, &pind, &data, &final) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-	ZEND_FETCH_RESOURCE(parser,xml_parser *, pind, -1, "XML Parser", le_xml_parser);
-
-	convert_to_string_ex(data);
-
-	if (argc == 3) {
-		convert_to_long_ex(final);
-		isFinal = Z_LVAL_PP(final);
-	} else {
-		isFinal = 0;
-	}
-
-	ret = XML_Parse(parser->parser, Z_STRVAL_PP(data), Z_STRLEN_PP(data), isFinal);
-	RETVAL_LONG(ret);
-}
-
-/* }}} */
-
-/* {{{ proto int xml_parse_into_struct(resource parser, string data, array &struct, array &index) 
-   Parsing a XML document */
-
-PHP_FUNCTION(xml_parse_into_struct)
-{
-	xml_parser *parser;
-	zval **pind, **data, **xdata, **info = 0;
-	int argc, ret;
-
-	argc = ZEND_NUM_ARGS();
-	if (zend_get_parameters_ex(4, &pind, &data, &xdata,&info) == SUCCESS) {
-		zval_dtor(*info);
-		array_init(*info);
-	} else if (zend_get_parameters_ex(3, &pind, &data, &xdata) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-
-	ZEND_FETCH_RESOURCE(parser,xml_parser *, pind, -1, "XML Parser", le_xml_parser);
-
-	convert_to_string_ex(data);
-	zval_dtor(*xdata);
-	array_init(*xdata);
-
-	parser->data = *xdata;
-	if (info)
-	  parser->info = *info;
-	parser->level = 0;
-	parser->ltags = safe_emalloc(XML_MAXLEVEL, sizeof(char *), 0);
-
-	XML_SetDefaultHandler(parser->parser, _xml_defaultHandler);
-	XML_SetElementHandler(parser->parser, _xml_startElementHandler, _xml_endElementHandler);
-	XML_SetCharacterDataHandler(parser->parser, _xml_characterDataHandler);
-
-	ret = XML_Parse(parser->parser, Z_STRVAL_PP(data), Z_STRLEN_PP(data), 1);
-
-	RETVAL_LONG(ret);
-}
-/* }}} */
-
-/* {{{ proto int xml_get_error_code(resource parser) 
-   Get XML parser error code */
-PHP_FUNCTION(xml_get_error_code)
-{
-	xml_parser *parser;
-	zval **pind;
-
-	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &pind) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-	ZEND_FETCH_RESOURCE(parser,xml_parser *, pind, -1, "XML Parser", le_xml_parser);
-
-	RETVAL_LONG((long)XML_GetErrorCode(parser->parser));
-}
-/* }}} */
-
-/* {{{ proto string xml_error_string(int code)
-   Get XML parser error string */
-PHP_FUNCTION(xml_error_string)
-{
-	zval **code;
-	char *str;
-
-	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &code) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-	convert_to_long_ex(code);
-	str = (char *)XML_ErrorString((int)Z_LVAL_PP(code));
-	if (str) {
-		RETVAL_STRING(str, 1);
-	}
-}
-/* }}} */
-
-/* {{{ proto int xml_get_current_line_number(resource parser) 
-   Get current line number for an XML parser */
-PHP_FUNCTION(xml_get_current_line_number)
-{
-	xml_parser *parser;
-	zval **pind;
-
-	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &pind) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-	ZEND_FETCH_RESOURCE(parser,xml_parser *, pind, -1, "XML Parser", le_xml_parser);
-
-	RETVAL_LONG(XML_GetCurrentLineNumber(parser->parser));
-}
-/* }}} */
-
-/* {{{ proto int xml_get_current_column_number(resource parser)
-   Get current column number for an XML parser */
-PHP_FUNCTION(xml_get_current_column_number)
-{
-	xml_parser *parser;
-	zval **pind;
-
-	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &pind) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-	ZEND_FETCH_RESOURCE(parser,xml_parser *, pind, -1, "XML Parser", le_xml_parser);
-
-	RETVAL_LONG(XML_GetCurrentColumnNumber(parser->parser));
-}
-/* }}} */
-
-/* {{{ proto int xml_get_current_byte_index(resource parser) 
-   Get current byte index for an XML parser */
-PHP_FUNCTION(xml_get_current_byte_index)
-{
-	xml_parser *parser;
-	zval **pind;
-
-	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &pind) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-	ZEND_FETCH_RESOURCE(parser,xml_parser *, pind, -1, "XML Parser", le_xml_parser);
-
-	RETVAL_LONG(XML_GetCurrentByteIndex(parser->parser));
-}
-/* }}} */
-
-/* {{{ proto int xml_parser_free(resource parser) 
-   Free an XML parser */
-PHP_FUNCTION(xml_parser_free)
-{
-	zval **pind;
-	xml_parser *parser;
-
-	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &pind) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-
-	ZEND_FETCH_RESOURCE(parser,xml_parser *, pind, -1, "XML Parser", le_xml_parser);
-
-	if (zend_list_delete(parser->index) == FAILURE) {
-		RETURN_FALSE;
-	}
-
-	RETVAL_TRUE;
-}
-/* }}} */
-
-/* {{{ proto int xml_parser_set_option(resource parser, int option, mixed value) 
-   Set options in an XML parser */
-PHP_FUNCTION(xml_parser_set_option)
-{
-	xml_parser *parser;
-	zval **pind, **opt, **val;
-
-	if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, &pind, &opt, &val) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-	ZEND_FETCH_RESOURCE(parser,xml_parser *, pind, -1, "XML Parser", le_xml_parser);
-
-	convert_to_long_ex(opt);
-
-	switch (Z_LVAL_PP(opt)) {
-		case PHP_XML_OPTION_CASE_FOLDING:
-			convert_to_long_ex(val);
-			parser->case_folding = Z_LVAL_PP(val);
-			break;
-		case PHP_XML_OPTION_SKIP_TAGSTART:
-			convert_to_long_ex(val);
-			parser->toffset = Z_LVAL_PP(val);
-			break;
-		case PHP_XML_OPTION_SKIP_WHITE:
-			convert_to_long_ex(val);
-			parser->skipwhite = Z_LVAL_PP(val);
-			break;
-		case PHP_XML_OPTION_TARGET_ENCODING: {
-			xml_encoding *enc;
-			convert_to_string_ex(val);
-			enc = xml_get_encoding(Z_STRVAL_PP(val));
-			if (enc == NULL) {
-				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unsupported target encoding \"%s\"", Z_STRVAL_PP(val));
-				RETURN_FALSE;
-			}
-			parser->target_encoding = enc->name;
-			break;
-		}
-		default:
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown option");
-			RETURN_FALSE;
-			break;
-	}
-	RETVAL_TRUE;
-}
-/* }}} */
-
-/* {{{ proto int xml_parser_get_option(resource parser, int option) 
-   Get options from an XML parser */
-PHP_FUNCTION(xml_parser_get_option)
-{
-	xml_parser *parser;
-	zval **pind, **opt;
-
-	if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &pind, &opt) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-	ZEND_FETCH_RESOURCE(parser,xml_parser *, pind, -1, "XML Parser", le_xml_parser);
-
-	convert_to_long_ex(opt);
-
-	switch (Z_LVAL_PP(opt)) {
-		case PHP_XML_OPTION_CASE_FOLDING:
-			RETURN_LONG(parser->case_folding);
-			break;
-		case PHP_XML_OPTION_TARGET_ENCODING:
-			RETURN_STRING(parser->target_encoding, 1);
-			break;
-		default:
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown option");
-			RETURN_FALSE;
-			break;
-	}
-
-	RETVAL_FALSE;	/* never reached */
-}
-/* }}} */
-
-/* {{{ proto string utf8_encode(string data) 
-   Encodes an ISO-8859-1 string to UTF-8 */
-PHP_FUNCTION(utf8_encode)
-{
-	zval **arg;
-	XML_Char *encoded;
-	int len;
-
-	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-	convert_to_string_ex(arg);
-	encoded = xml_utf8_encode(Z_STRVAL_PP(arg), Z_STRLEN_PP(arg), &len, "ISO-8859-1");
-	if (encoded == NULL) {
-		RETURN_FALSE;
-	}
-	RETVAL_STRINGL(encoded, len, 0);
-}
-/* }}} */
-
-/* {{{ proto string utf8_decode(string data) 
-   Converts a UTF-8 encoded string to ISO-8859-1 */
-PHP_FUNCTION(utf8_decode)
-{
-	zval **arg;
-	XML_Char *decoded;
-	int len;
-
-	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-	convert_to_string_ex(arg);
-	decoded = xml_utf8_decode(Z_STRVAL_PP(arg), Z_STRLEN_PP(arg), &len, "ISO-8859-1");
-	if (decoded == NULL) {
-		RETURN_FALSE;
-	}
-	RETVAL_STRINGL(decoded, len, 0);
-}
-/* }}} */
-
-#endif
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/ext/xml/xml.mak b/ext/xml/xml.mak
deleted file mode 100644
index ab60f28eed..0000000000
--- a/ext/xml/xml.mak
+++ /dev/null
@@ -1,172 +0,0 @@
-# Temporarily here -- later may go into some batch file
-# which will set this as an environment variable
-PROJECT_ROOT = ..\..
-
-# Module details
-MODULE_NAME = php_xml
-MODULE_DESC = "PHP 5 - XML Extension"
-VMAJ = 3
-VMIN = 0
-VREV = 0
-
-#include the common settings
-include $(PROJECT_ROOT)/netware/common.mif
-
-# Extensions of all input and output files
-.SUFFIXES:
-.SUFFIXES: .nlm .lib .obj .cpp .c .msg .mlc .mdb .xdc .d
-
-# Source files
-C_SRC = xml.c \
-        start.c
-
-CPP_SRC_NODIR = $(notdir $(CPP_SRC))
-C_SRC_NODIR = $(notdir $(C_SRC))
-SRC_DIR = $(dir $(CPP_SRC) $(C_SRC))
-
-# Library files
-LIBRARY = 
-
-# Destination directories and files
-OBJ_DIR = $(BUILD)
-FINAL_DIR = $(BUILD)
-MAP_FILE = $(FINAL_DIR)\$(MODULE_NAME).map
-OBJECTS  = $(addprefix $(OBJ_DIR)/,$(CPP_SRC_NODIR:.c=.obj) $(C_SRC_NODIR:.c=.obj))
-DEPDS  = $(addprefix $(OBJ_DIR)/,$(CPP_SRC_NODIR:.c=.d) $(C_SRC_NODIR:.c=.d))
-
-# Binary file
-ifndef BINARY
-	BINARY=$(FINAL_DIR)\$(MODULE_NAME).nlm
-endif
-
-# Compile flags
-C_FLAGS += -c -maxerrors 25 -msgstyle gcc
-C_FLAGS += -wchar_t on -bool on
-C_FLAGS += -processor Pentium
-C_FLAGS += -nostdinc -nosyspath
-C_FLAGS += -relax_pointers		# To remove type-casting errors
-C_FLAGS += -DNETWARE -DZTS
-C_FLAGS += -DNEW_LIBC
-C_FLAGS += -DCOMPILE_DL_XML -DHAVE_LIBEXPAT=1
-C_FLAGS += -I. -I- -I$(PROJECT_ROOT) -I$(PROJECT_ROOT)/main
-C_FLAGS += -I$(PROJECT_ROOT)/ext/standard -I$(PROJECT_ROOT)/netware
-C_FLAGS += -I$(PROJECT_ROOT)/zend -I$(PROJECT_ROOT)/tsrm
-C_FLAGS += -I$(SDK_DIR)/include -I$(MWCIncludes)
-C_FLAGS += -I$(EXPAT_DIR)/include
-
-ifndef STACK_SIZE
-STACK_SIZE=8192
-endif
-
-# Extra stuff based on debug / release builds
-ifeq '$(BUILD)' 'debug'
-	SYM_FILE = $(FINAL_DIR)\$(MODULE_NAME).sym
-	C_FLAGS  += -inline smart -sym on -sym codeview4 -opt off -opt intrinsics -sym internal -DDEBUGGING -DDKFBPON
-	C_FLAGS += -exc cw -DZEND_DEBUG=1
-	LD_FLAGS += -sym on -sym codeview4 -osym $(SYM_FILE)
-	export MWLibraryFiles=$(SDK_DIR)/imports/libcpre.o;mwcrtld.lib
-else
-	C_FLAGS  += -opt speed -inline on -inline smart -inline auto -sym off
-	C_FLAGS += -opt intrinsics
-	C_FLAGS += -opt level=4 -DZEND_DEBUG=0
-	LD_FLAGS += -sym off
-	export MWLibraryFiles=$(SDK_DIR)/imports/libcpre.o;mwcrtl.lib
-endif
-
-# Dependencies
-MODULE = LibC     \
-         expatlbc \
-         phplib
-IMPORT = @$(SDK_DIR)/imports/libc.imp        \
-         @$(SDK_DIR)/imports/ws2nlm.imp      \
-         @$(MPK_DIR)/import/mpkOrg.imp       \
-         @$(EXPAT_DIR)/imports/expatlbc.imp             \
-         @$(PROJECT_ROOT)/netware/phplib.imp
-EXPORT = ($(MODULE_NAME)) get_module
-API =  OutputToScreen
-
-
-# Virtual paths
-vpath %.cpp .
-vpath %.c . ..\..\netware
-vpath %.obj $(OBJ_DIR)
-
-
-all: prebuild project
-
-.PHONY: all
-
-prebuild:
-	@if not exist $(OBJ_DIR) md $(OBJ_DIR)
-
-project: $(BINARY)
-	@echo Build complete.
-
-$(OBJ_DIR)/%.d: %.cpp
-	@echo Building Dependencies for $(<F)
-	@$(CC) -M $< $(C_FLAGS) -o $@
-
-$(OBJ_DIR)/%.d: %.c
-	@echo Building Dependencies for $(<F)
-	@$(CC) -M $< $(C_FLAGS) -o $@
-
-$(OBJ_DIR)/%.obj: %.cpp
-	@echo Compiling $?...
-	@$(CC) $< $(C_FLAGS) -o $@
-	
-$(OBJ_DIR)/%.obj: %.c
-	@echo Compiling $?...
-	@$(CC) $< $(C_FLAGS) -o $@
-
-
-$(BINARY): $(OBJECTS)
-	@echo Import $(IMPORT) > $(basename $@).def
-ifdef API
-	@echo Import $(API) >> $(basename $@).def
-endif
-	@echo Module $(MODULE) >> $(basename $@).def
-ifdef EXPORT
-	@echo Export $(EXPORT) >> $(basename $@).def
-endif
-	@echo AutoUnload >> $(basename $@).def
-ifeq '$(BUILD)' 'debug'
-	@echo Debug >> $(basename $@).def
-endif
-	@echo Flag_On 0x00000008 >> $(basename $@).def
-	@echo Start _LibCPrelude >> $(basename $@).def
-	@echo Exit _LibCPostlude >> $(basename $@).def
-
-	$(MPKTOOL) $(XDCFLAGS) $(basename $@).xdc
-	@echo xdcdata $(basename $@).xdc >> $(basename $@).def
-
-	@echo Linking $@...
-	@echo $(LD_FLAGS) -commandfile $(basename $@).def > $(basename $@).link
-	@echo $(LIBRARY) $(OBJECTS) >> $(basename $@).link
-
-	@$(LINK) @$(basename $@).link
-
-
-.PHONY: clean
-clean: cleanobj cleanbin
-
-.PHONY: cleand
-cleand:
-	@echo Deleting all dependency files...
-	-@del "$(OBJ_DIR)\*.d"
-
-.PHONY: cleanobj
-cleanobj:
-	@echo Deleting all object files...
-	-@del "$(OBJ_DIR)\*.obj"
-
-.PHONY: cleanbin
-cleanbin:
-	@echo Deleting binary files...
-	-@del "$(FINAL_DIR)\$(MODULE_NAME).nlm"
-	@echo Deleting MAP, DEF files, etc....
-	-@del "$(FINAL_DIR)\$(MODULE_NAME).map"
-	-@del "$(FINAL_DIR)\$(MODULE_NAME).def"
-	-@del "$(FINAL_DIR)\$(MODULE_NAME).link"
-ifeq '$(BUILD)' 'debug'
-	-@del $(FINAL_DIR)\$(MODULE_NAME).sym
-endif