21 files changed, 0 insertions, 1626 deletions
diff --git a/ext/xmlreader/CREDITS b/ext/xmlreader/CREDITS
deleted file mode 100644
index 35f3af1933..0000000000
--- a/ext/xmlreader/CREDITS
+++ /dev/null
@@ -1,2 +0,0 @@
-XMLReader
-Rob Richards
diff --git a/ext/xmlreader/EXPERIMENTAL b/ext/xmlreader/EXPERIMENTAL
deleted file mode 100644
index dfa49ae496..0000000000
--- a/ext/xmlreader/EXPERIMENTAL
+++ /dev/null
@@ -1,4 +0,0 @@
-this module is experimental,
-its functions may change their names 
-so do not rely to much on them 
-you have been warned!
diff --git a/ext/xmlreader/README b/ext/xmlreader/README
deleted file mode 100644
index 0d946f62da..0000000000
--- a/ext/xmlreader/README
+++ /dev/null
@@ -1,5 +0,0 @@
-XMLReader represents a reader that provides non-cached, 
-forward-only access to XML data. It is based upon the 
-xmlTextReader api from libxml
-
-This extension is designed to only work under PHP 5.
diff --git a/ext/xmlreader/TODO b/ext/xmlreader/TODO
deleted file mode 100644
index 5bf20edcc3..0000000000
--- a/ext/xmlreader/TODO
+++ /dev/null
@@ -1,6 +0,0 @@
-- Refactor internals once libxml 2.6.x is minimum requirement for PHP 5
-  use new api for creating the xmlTextReaderPtr
-
-- Add Custom Error Handling
-
-
diff --git a/ext/xmlreader/config.m4 b/ext/xmlreader/config.m4
deleted file mode 100644
index 2de9292ca8..0000000000
--- a/ext/xmlreader/config.m4
+++ /dev/null
@@ -1,22 +0,0 @@
-dnl
-dnl $Id$
-dnl
-
-PHP_ARG_WITH(xmlreader, for XMLReader support,
-[  --with-xmlreader        Include XMLReader support.])
-
-if test -z "$PHP_LIBXML_DIR"; then
-  PHP_ARG_WITH(libxml-dir, libxml2 install dir,
-  [  --with-libxml-dir=DIR     XMLReader: libxml2 install prefix], no, no)
-fi
-
-if test "$PHP_XMLREADER" != "no" && test "$PHP_LIBXML" != "no"; then
-
-  PHP_SETUP_LIBXML(XMLREADER_SHARED_LIBADD, [
-    AC_DEFINE(HAVE_XMLREADER,1,[ ])
-    PHP_NEW_EXTENSION(xmlreader, php_xmlreader.c, $ext_shared)
-    PHP_SUBST(XMLREADER_SHARED_LIBADD)
-  ], [
-    AC_MSG_ERROR([xml2-config not found. Please check your libxml2 installation.])
-  ])
-fi
diff --git a/ext/xmlreader/config.w32 b/ext/xmlreader/config.w32
deleted file mode 100644
index 1788356c9e..0000000000
--- a/ext/xmlreader/config.w32
+++ /dev/null
@@ -1,14 +0,0 @@
-// $Id$
-// vim:ft=javascript
-
-ARG_WITH("xmlreader", "XMLReader support", "yes");
-
-if (PHP_XMLREADER == "yes" && PHP_LIBXML == "yes") {
-	EXTENSION("xmlreader", "php_xmlreader.c");
-	AC_DEFINE("HAVE_XMLREADER", 1, "XMLReader support");
-	if (!PHP_XMLREADER_SHARED) {
-		ADD_FLAG("CFLAGS_XMLREADER", "/D LIBXML_STATIC");
-	}
-	ADD_EXTENSION_DEP('xmlreader', 'libxml');
-}
-
diff --git a/ext/xmlreader/examples/dtdexample.dtd b/ext/xmlreader/examples/dtdexample.dtd
deleted file mode 100644
index ce53f0bc18..0000000000
--- a/ext/xmlreader/examples/dtdexample.dtd
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!ELEMENT LIST (MOVIE+)>
-<!ELEMENT MOVIE (TITLE, ORGTITLE, LOC, INFO)>
-<!ATTLIST MOVIE ID ID #REQUIRED>
-<!ELEMENT TITLE (#PCDATA)>
-<!ELEMENT ORGTITLE (#PCDATA)>
-<!ELEMENT LOC (#PCDATA)>
-<!ELEMENT INFO (#PCDATA)>
diff --git a/ext/xmlreader/examples/dtdexample.xml b/ext/xmlreader/examples/dtdexample.xml
deleted file mode 100644
index 052889c05d..0000000000
--- a/ext/xmlreader/examples/dtdexample.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE LIST SYSTEM "dtdexample.dtd">
-<LIST>
-<MOVIE ID="x200338360">
-<TITLE>Move Title 1</TITLE>
-<ORGTITLE/><LOC>Location 1</LOC>
-<INFO/>
-</MOVIE>
-<MOVIE ID="m200338361">
-<TITLE>Move Title 2</TITLE>
-<ORGTITLE/>
-<LOC>Location 2</LOC>
-<INFO/>
-</MOVIE>
-</LIST>
diff --git a/ext/xmlreader/examples/relaxNG.rng b/ext/xmlreader/examples/relaxNG.rng
deleted file mode 100644
index f4357e04ef..0000000000
--- a/ext/xmlreader/examples/relaxNG.rng
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<grammar xmlns="http://relaxng.org/ns/structure/1.0"
- datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-
-<include href="relaxNG2.rng">
-<define name="TEI.prose"><ref name="INCLUDE"/></define>
-</include>
-</grammar>
-
-
-
diff --git a/ext/xmlreader/examples/relaxNG.xml b/ext/xmlreader/examples/relaxNG.xml
deleted file mode 100644
index 6b0cac1225..0000000000
--- a/ext/xmlreader/examples/relaxNG.xml
+++ /dev/null
@@ -1 +0,0 @@
-<TEI.2>hello</TEI.2>
-\ No newline at end of file
diff --git a/ext/xmlreader/examples/relaxNG2.rng b/ext/xmlreader/examples/relaxNG2.rng
deleted file mode 100644
index 4adae7b151..0000000000
--- a/ext/xmlreader/examples/relaxNG2.rng
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<grammar xmlns="http://relaxng.org/ns/structure/1.0" xmlns:t="http://www.thaiopensource.com/ns/annotations" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-
-   <start>
-         <ref name="TEI.2"/>
-   </start>
-   <define name="IGNORE">
-      <notAllowed/>
-   </define>
-   <define name="INCLUDE">
-      <empty/>
-   </define>
-
-
-  <include href="relaxNG3.rng"/>
-
-   <define name="TEI.2">
-      <element name="TEI.2">
-         <text/>
-      </element>
-   </define>
-
-</grammar>
-\ No newline at end of file
diff --git a/ext/xmlreader/examples/relaxNG3.rng b/ext/xmlreader/examples/relaxNG3.rng
deleted file mode 100644
index 73e1eb6165..0000000000
--- a/ext/xmlreader/examples/relaxNG3.rng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<grammar xmlns="http://relaxng.org/ns/structure/1.0" xmlns:t="http://www.thaiopensource.com/ns/annotations" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-
-   <define name="TEI.prose" combine="interleave">
-      <ref name="IGNORE"/>
-   </define>
-
-</grammar>
-\ No newline at end of file
diff --git a/ext/xmlreader/examples/xmlreader.xml b/ext/xmlreader/examples/xmlreader.xml
deleted file mode 100644
index 4c53743de6..0000000000
--- a/ext/xmlreader/examples/xmlreader.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<books>
- <book num="1">
-  <title>The Grapes of Wrath</title>
-  <author>John Steinbeck</author>
- </book>
- <book num="2">
-  <title>The Pearl</title>
-  <author>John Steinbeck</author>
- </book>
-</books>
diff --git a/ext/xmlreader/examples/xmlreader_file.php b/ext/xmlreader/examples/xmlreader_file.php
deleted file mode 100644
index 480b152d7e..0000000000
--- a/ext/xmlreader/examples/xmlreader_file.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-$reader = new XMLReader();
-$reader->open('xmlreader.xml');
-while ($reader->read()) {
-	if ($reader->nodeType != XMLREADER_END_ELEMENT) {
-		print "Node Name: ".$reader->name."\n";
-		print "Node Value: ".$reader->value."\n";
-		print "Node Depth: ".$reader->depth."\n";
-		if ($reader->nodeType==XMLREADER_ELEMENT && $reader->hasAttributes) {
-			$attr = $reader->moveToFirstAttribute();
-			while ($attr) {
-				print "   Attribute Name: ".$reader->name."\n";
-				print "   Attribute Value: ".$reader->value."\n";
-				$attr = $reader->moveToNextAttribute();
-			}
-		}
-		print "\n";
-	}
-}
-?>
diff --git a/ext/xmlreader/examples/xmlreader_relaxNG.php b/ext/xmlreader/examples/xmlreader_relaxNG.php
deleted file mode 100644
index e56739a2fb..0000000000
--- a/ext/xmlreader/examples/xmlreader_relaxNG.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-$indent = 5; /* Number of spaces to indent per level */
-
-$reader = new XMLReader();
-$reader->open('relaxNG.xml');
-/*
-Example setting relaxNG using string:
-$reader->setRelaxNGSchemaSource(file_get_contents('relaxNG.rng'));
-*/
-if ($reader->setRelaxNGSchema('relaxNG.rng')) {
-  while ($reader->read()) {
-    /* Print node name indenting it based on depth and $indent var */
-    print str_repeat(" ", $reader->depth * $indent).$reader->name."\n";
-  }
-}
-
-print "\n";
-
-if (! $reader->isValid()) {
-  print "Document is not valid\n";
-} else {
-  print "Document is valid\n";
-}
-
-?>
-\ No newline at end of file
diff --git a/ext/xmlreader/examples/xmlreader_string.php b/ext/xmlreader/examples/xmlreader_string.php
deleted file mode 100644
index d545c22c8b..0000000000
--- a/ext/xmlreader/examples/xmlreader_string.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-$xmlstring = '<books>
- <book num="1">
-  <title>The Grapes of Wrath</title>
-  <author>John Steinbeck</author>
- </book>
- <book num="2">
-  <title>The Pearl</title>
-  <author>John Steinbeck</author>
- </book>
-</books>';
-
-$reader = new XMLReader();
-$reader->XML($xmlstring);
-while ($reader->read()) {
-	if ($reader->nodeType != XMLREADER_END_ELEMENT) {
-		print "Node Name: ".$reader->name."\n";
-		print "Node Value: ".$reader->value."\n";
-		print "Node Depth: ".$reader->depth."\n";
-		if ($reader->nodeType==XMLREADER_ELEMENT && $reader->hasAttributes) {
-			$attr = $reader->moveToFirstAttribute();
-			while ($attr) {
-				print "   Attribute Name: ".$reader->name."\n";
-				print "   Attribute Value: ".$reader->value."\n";
-				$attr = $reader->moveToNextAttribute();
-			}
-		}
-		print "\n";
-	}
-}
-?>
diff --git a/ext/xmlreader/examples/xmlreader_validatedtd.php b/ext/xmlreader/examples/xmlreader_validatedtd.php
deleted file mode 100644
index 5173154f5a..0000000000
--- a/ext/xmlreader/examples/xmlreader_validatedtd.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-$indent = 5; /* Number of spaces to indent per level */
-
-$xml = new XMLReader();
-$xml->open("dtdexample.xml");
-$xml->setParserProperty(XMLREADER_LOADDTD, TRUE);
-$xml->setParserProperty(XMLREADER_VALIDATE, TRUE);
-while($xml->read()) {
-	/* Print node name indenting it based on depth and $indent var */
-	print str_repeat(" ", $xml->depth * $indent).$xml->name."\n";
-	if ($xml->hasAttributes) {
-		$attCount = $xml->attributeCount;
-		print str_repeat(" ", $xml->depth * $indent)." Number of Attributes: ".$xml->attributeCount."\n";
-	}
-}
-print "\n\nValid:\n";
-var_dump($xml->isValid());
-?>
-\ No newline at end of file
diff --git a/ext/xmlreader/package.xml b/ext/xmlreader/package.xml
deleted file mode 100644
index 45dcbc3708..0000000000
--- a/ext/xmlreader/package.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE package SYSTEM "../package.dtd">
-<package>
- <name>xmlreader</name>
- <summary>Provides fast, non-cached, forward-only access to XML data.</summary>
- <description>
-  This extension wraps the libxml xmlReader API. The reader acts as a cursor 
-  going forward on the document stream and stopping at each node in the way. 
-  xmlReader is similar to SAX though uses a much simpler API.
- </description>
- <license>PHP License</license>
- <maintainers>
-  <maintainer>
-   <user>rrichards</user>
-   <name>Rob Richards</name>
-   <email>rrichards@php.net</email>
-   <role>lead</role>
-  </maintainer>
-  <maintainer>
-   <user>chregu</user>
-   <role>lead</role>
-   <name>Christian Stocker</name>
-   <email>chregu@php.net</email>
-  </maintainer>
- </maintainers>
- <release>
-  <version>0.2</version>
-  <date>2004-05-10</date>
-  <state>beta</state>
-  <notes>
-   Allow open and XML methods to be called statically.
-   Add expand() support to export copies of nodes as DOM objects. (chregu)
-   Add next() support to skip to next sibling node. (chregu)
-  </notes>
-  <configureoptions>
-    <configureoption name="with-xmlreader" default="autodetect" prompt="Include XMLReader support?"/>
-  </configureoptions>
-  <filelist>
-   <file role="src" name="config.m4"/>
-   <file role="src" name="config.w32"/>
-   <file role="src" name="php_xmlreader.c"/>
-   <file role="src" name="php_xmlreader.h"/>
-   
-   <file role="doc" name="CREDITS"/>
-   <file role="doc" name="TODO"/>
-   <file role="doc" name="README"/>
-   <file role="doc" name="EXPERIMENTAL"/>
-   <file role="doc" name="examples/xmlreader_file.php"/>
-   <file role="doc" name="examples/xmlreader_string.php"/>
-   <file role="doc" name="examples/xmlreader.xml"/>
-   <file role="doc" name="examples/xmlreader_validatedtd.php"/>
-   <file role="doc" name="examples/dtdexample.xml"/>
-   <file role="doc" name="examples/dtdexample.dtd"/>
-   <file role="doc" name="examples/xmlreader_relaxNG.php"/>
-   <file role="doc" name="examples/relaxNG.xml"/>
-   <file role="doc" name="examples/relaxNG.rng"/>
-   <file role="doc" name="examples/relaxNG2.rng"/>
-   <file role="doc" name="examples/relaxNG3.rng"/>
-  </filelist>
-  <deps>
-   <dep type="php" rel="ge" version="5" />
-   <dep type="ext" rel="has">libxml</dep>
-  </deps>
- </release>
-</package>
diff --git a/ext/xmlreader/php_xmlreader.c b/ext/xmlreader/php_xmlreader.c
deleted file mode 100644
index 2c9b5b8355..0000000000
--- a/ext/xmlreader/php_xmlreader.c
+++ /dev/null
@@ -1,1152 +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.               |
-  +----------------------------------------------------------------------+
-  | Author: Rob Richards <rrichards@php.net>                             |
-  +----------------------------------------------------------------------+
-*/
-
-/* $Id$ */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-
-#include "php.h"
-#include "php_ini.h"
-#include "ext/standard/info.h"
-#include "php_xmlreader.h"
-#ifdef HAVE_DOM
-#include "ext/dom/xml_common.h"
-#endif
-#include <libxml/uri.h>
-
-zend_class_entry *xmlreader_class_entry;
-
-static zend_object_handlers xmlreader_object_handlers;
-
-static HashTable xmlreader_prop_handlers;
-
-typedef int (*xmlreader_read_int_t)(xmlTextReaderPtr reader);
-typedef unsigned char *(*xmlreader_read_char_t)(xmlTextReaderPtr reader);
-typedef int (*xmlreader_write_t)(xmlreader_object *obj, zval *newval TSRMLS_DC);
-
-typedef unsigned char *(*xmlreader_read_one_char_t)(xmlTextReaderPtr reader, const unsigned char *);
-
-typedef struct _xmlreader_prop_handler {
-	xmlreader_read_int_t read_int_func;
-	xmlreader_read_char_t read_char_func;
-	xmlreader_write_t write_func;
-	int type;
-} xmlreader_prop_handler;
-
-#define XMLREADER_LOAD_STRING 0
-#define XMLREADER_LOAD_FILE 1
-
-static void xmlreader_register_prop_handler(HashTable *prop_handler, char *name, xmlreader_read_int_t read_int_func, xmlreader_read_char_t read_char_func, int rettype TSRMLS_DC)
-{
-	xmlreader_prop_handler hnd;
-	
-	hnd.read_char_func = read_char_func;
-	hnd.read_int_func = read_int_func;
-	hnd.type = rettype;
-	zend_hash_add(prop_handler, name, strlen(name)+1, &hnd, sizeof(xmlreader_prop_handler), NULL);
-}
-
-static int xmlreader_property_reader(xmlreader_object *obj, xmlreader_prop_handler *hnd, zval **retval TSRMLS_DC)
-{
-	char *retchar = NULL;
-	int retint = 0;
-
-	if (obj->ptr != NULL) {
-		if (hnd->read_char_func) {
-			retchar = hnd->read_char_func(obj->ptr);
-		} else {
-			if (hnd->read_int_func) {
-				retint = hnd->read_int_func(obj->ptr);
-				if (retint == -1) {
-					php_error_docref(NULL TSRMLS_CC, E_WARNING, "Internal libxml error returned");
-					return FAILURE;
-				}
-			}
-		}
-	}
-
-	ALLOC_ZVAL(*retval);
-
-	switch (hnd->type) {
-		case IS_STRING:
-			if (retchar) {
-				ZVAL_STRING(*retval, retchar, 1);
-				xmlFree(retchar);
-			} else {
-				ZVAL_EMPTY_STRING(*retval);
-			}
-			break;
-		case IS_BOOL:
-			ZVAL_BOOL(*retval, retint);
-			break;
-		case IS_LONG:
-			ZVAL_LONG(*retval, retint);
-			break;
-		default:
-			ZVAL_NULL(*retval);
-	}
-
-	return SUCCESS;
-}
-
-/* {{{ xmlreader_read_property */
-zval *xmlreader_read_property(zval *object, zval *member, int type TSRMLS_DC)
-{
-	xmlreader_object *obj;
-	zval tmp_member;
-	zval *retval;
-	xmlreader_prop_handler *hnd;
-	zend_object_handlers *std_hnd;
-	int ret;
-
- 	if (member->type != IS_STRING) {
-		tmp_member = *member;
-		zval_copy_ctor(&tmp_member);
-		convert_to_string(&tmp_member);
-		member = &tmp_member;
-	}
-
-	ret = FAILURE;
-	obj = (xmlreader_object *)zend_objects_get_address(object TSRMLS_CC);
-
-	if (obj->prop_handler != NULL) {
-		ret = zend_hash_find(obj->prop_handler, Z_STRVAL_P(member), Z_STRLEN_P(member)+1, (void **) &hnd);
-	}
-	if (ret == SUCCESS) {
-		ret = xmlreader_property_reader(obj, hnd, &retval TSRMLS_CC);
-		if (ret == SUCCESS) {
-			/* ensure we're creating a temporary variable */
-			retval->refcount = 0;
-		} else {
-			retval = EG(uninitialized_zval_ptr);
-		}
-	} else {
-		std_hnd = zend_get_std_object_handlers();
-		retval = std_hnd->read_property(object, member, type TSRMLS_CC);
-	}
-
-	if (member == &tmp_member) {
-		zval_dtor(member);
-	}
-	return retval;
-}
-/* }}} */
-
-/* {{{ xmlreader_write_property */
-void xmlreader_write_property(zval *object, zval *member, zval *value TSRMLS_DC)
-{
-	xmlreader_object *obj;
-	zval tmp_member;
-	xmlreader_prop_handler *hnd;
-	zend_object_handlers *std_hnd;
-	int ret;
-
- 	if (member->type != IS_STRING) {
-		tmp_member = *member;
-		zval_copy_ctor(&tmp_member);
-		convert_to_string(&tmp_member);
-		member = &tmp_member;
-	}
-
-	ret = FAILURE;
-	obj = (xmlreader_object *)zend_objects_get_address(object TSRMLS_CC);
-
-	if (obj->prop_handler != NULL) {
-		ret = zend_hash_find((HashTable *)obj->prop_handler, Z_STRVAL_P(member), Z_STRLEN_P(member)+1, (void **) &hnd);
-	}
-	if (ret == SUCCESS) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot write to read-only property");
-	} else {
-		std_hnd = zend_get_std_object_handlers();
-		std_hnd->write_property(object, member, value TSRMLS_CC);
-	}
-
-	if (member == &tmp_member) {
-		zval_dtor(member);
-	}
-}
-/* }}} */
-
-/* _xmlreader_get_valid_file_path and _xmlreader_get_relaxNG should be made a 
-	common function in libxml extension as code is common to a few xml extensions */
-char *_xmlreader_get_valid_file_path(char *source, char *resolved_path, int resolved_path_len  TSRMLS_DC) {
-	xmlURI *uri;
-	xmlChar *escsource;
-	char *file_dest;
-	int isFileUri = 0;
-
-	uri = xmlCreateURI();
-	escsource = xmlURIEscapeStr(source, ":");
-	xmlParseURIReference(uri, escsource);
-	xmlFree(escsource);
-
-	if (uri->scheme != NULL) {
-		/* absolute file uris - libxml only supports localhost or empty host */
-		if (strncasecmp(source, "file:///",8) == 0) {
-			isFileUri = 1;
-#ifdef PHP_WIN32
-			source += 8;
-#else
-			source += 7;
-#endif
-		} else if (strncasecmp(source, "file://localhost/",17) == 0) {
-			isFileUri = 1;
-#ifdef PHP_WIN32
-			source += 17;
-#else
-			source += 16;
-#endif
-		}
-	}
-
-	file_dest = source;
-
-	if ((uri->scheme == NULL || isFileUri)) {
-		/* XXX possible buffer overflow if VCWD_REALPATH does not know size of resolved_path */
-		if (! VCWD_REALPATH(source, resolved_path)) {
-			expand_filepath(source, resolved_path TSRMLS_CC);
-		}
-		file_dest = resolved_path;
-	}
-
-	xmlFreeURI(uri);
-
-	return file_dest;
-}
-
-#ifdef LIBXML_SCHEMAS_ENABLED
-static xmlRelaxNGPtr _xmlreader_get_relaxNG(char *source, int source_len, int type, 
-											xmlRelaxNGValidityErrorFunc error_func, 
-											xmlRelaxNGValidityWarningFunc warn_func TSRMLS_DC)
-{
-	char *valid_file = NULL;
-	xmlRelaxNGParserCtxtPtr parser = NULL;
-	xmlRelaxNGPtr           sptr;
-	char resolved_path[MAXPATHLEN + 1];
-
-	switch (type) {
-	case XMLREADER_LOAD_FILE:
-		valid_file = _xmlreader_get_valid_file_path(source, resolved_path, MAXPATHLEN  TSRMLS_CC);
-		if (!valid_file) {
-			return NULL;
-		}
-		parser = xmlRelaxNGNewParserCtxt(valid_file);
-		break;
-	case XMLREADER_LOAD_STRING:
-		parser = xmlRelaxNGNewMemParserCtxt(source, source_len);
-		/* If loading from memory, we need to set the base directory for the document 
-		   but it is not apparent how to do that for schema's */
-		break;
-	default:
-		return NULL;
-	}
-
-	if (parser == NULL) {
-		return NULL;
-	}
-
-	if (error_func || warn_func) {
-		xmlRelaxNGSetParserErrors(parser,
-			(xmlRelaxNGValidityErrorFunc) error_func,
-			(xmlRelaxNGValidityWarningFunc) warn_func,
-			parser);
-	}
-	sptr = xmlRelaxNGParse(parser);
-	xmlRelaxNGFreeParserCtxt(parser);
-
-	return sptr;
-}
-#endif
-
-/* {{{ xmlreader_module_entry
- */
-zend_module_entry xmlreader_module_entry = {
-	STANDARD_MODULE_HEADER,
-	"xmlreader",
-	NULL,
-	PHP_MINIT(xmlreader),
-	PHP_MSHUTDOWN(xmlreader),
-	NULL,
-	NULL,
-	PHP_MINFO(xmlreader),
-	"0.1", /* Replace with version number for your extension */
-	STANDARD_MODULE_PROPERTIES
-};
-/* }}} */
-
-#ifdef COMPILE_DL_XMLREADER
-ZEND_GET_MODULE(xmlreader)
-#endif
-
-/* {{{ xmlreader_objects_clone */
-void xmlreader_objects_clone(void *object, void **object_clone TSRMLS_DC)
-{
-	/* TODO */
-}
-/* }}} */
-
-static void xmlreader_free_resources(xmlreader_object *intern) {
-	if (intern) {
-		if (intern->input) {
-			xmlFreeParserInputBuffer(intern->input);
-			intern->input = NULL;
-		}
-
-		if (intern->ptr) {
-			xmlFreeTextReader(intern->ptr);
-			intern->ptr = NULL;
-		}
-#ifdef LIBXML_SCHEMAS_ENABLED
-		if (intern->schema) {
-			xmlRelaxNGFree((xmlRelaxNGPtr) intern->schema);
-			intern->schema = NULL;
-		}
-#endif
-	}
-}
-
-/* {{{ xmlreader_objects_free_storage */
-void xmlreader_objects_free_storage(void *object TSRMLS_DC)
-{
-	xmlreader_object *intern = (xmlreader_object *)object;
-
-	zend_hash_destroy(intern->std.properties);
-	FREE_HASHTABLE(intern->std.properties);
-	
-	xmlreader_free_resources(intern);
-
-	efree(object);
-}
-/* }}} */
-
-/* {{{ xmlreader_objects_new */
-zend_object_value xmlreader_objects_new(zend_class_entry *class_type TSRMLS_DC)
-{
-	zend_object_value retval;
-	xmlreader_object *intern;
-	zval *tmp;
-
-	intern = emalloc(sizeof(xmlreader_object));
-	intern->std.ce = class_type;
-	intern->std.in_get = 0;
-	intern->std.in_set = 0;
-	intern->ptr = NULL;
-	intern->input = NULL;
-	intern->schema = NULL;
-	intern->prop_handler = &xmlreader_prop_handlers;
-
-	ALLOC_HASHTABLE(intern->std.properties);
-	zend_hash_init(intern->std.properties, 0, NULL, ZVAL_PTR_DTOR, 0);
-	zend_hash_copy(intern->std.properties, &class_type->default_properties, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *));
-	retval.handle = zend_objects_store_put(intern, NULL, (zend_objects_free_object_storage_t) xmlreader_objects_free_storage, xmlreader_objects_clone TSRMLS_CC);
-	intern->handle = retval.handle;
-	retval.handlers = &xmlreader_object_handlers;
-	return retval;
-}
-/* }}} */
-
-static void php_xmlreader_string_arg(INTERNAL_FUNCTION_PARAMETERS, xmlreader_read_one_char_t internal_function) {
-	zval *id;
-	int name_len = 0;
-	char *retchar = NULL;
-	xmlreader_object *intern;
-	char *name;
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &name, &name_len) == FAILURE) {
-		return;
-	}
-
-	if (!name_len) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Argument cannot be an empty string");
-		RETURN_FALSE;
-	}
-
-	id = getThis();
-
-	intern = (xmlreader_object *)zend_object_store_get_object(id TSRMLS_CC);
-	if (intern && intern->ptr) {
-		retchar = internal_function(intern->ptr, name);
-	}
-	if (retchar) {
-		RETVAL_STRING(retchar, 1);
-		xmlFree(retchar);
-		return;
-	} else {
-		RETVAL_EMPTY_STRING();
-	}
-}
-
-static void php_xmlreader_no_arg(INTERNAL_FUNCTION_PARAMETERS, xmlreader_read_int_t internal_function) {
-	zval *id;
-	int retval;
-	xmlreader_object *intern;
-
-	id = getThis();
-
-	intern = (xmlreader_object *)zend_object_store_get_object(id TSRMLS_CC);
-	if (intern && intern->ptr) {
-		retval = internal_function(intern->ptr);
-		if (retval == 1) {
-			RETURN_TRUE;
-		}
-	}
-
-	RETURN_FALSE;
-}
-
-/* This function not yet needed until some additional functions are implemented in libxml
-static void php_xmlreader_no_arg_string(INTERNAL_FUNCTION_PARAMETERS, xmlreader_read_char_t internal_function) {
-	zval *id;
-	char *retchar = NULL;
-	xmlreader_object *intern;
-
-	id = getThis();
-
-	intern = (xmlreader_object *)zend_object_store_get_object(id TSRMLS_CC);
-	if (intern && intern->ptr) {
-		retchar = xmlTextReaderReadString(intern->ptr);
-	}
-	if (retchar) {
-		RETVAL_STRING(retchar, 1);
-		xmlFree(retchar);
-		return;
-	} else {
-		RETVAL_EMPTY_STRING();
-	}
-}
-*/
-
-static void php_xmlreader_set_relaxng_schema(INTERNAL_FUNCTION_PARAMETERS, int type) {
-#ifdef LIBXML_SCHEMAS_ENABLED
-	zval *id;
-	int source_len = 0, retval = -1;
-	xmlreader_object *intern;
-	xmlRelaxNGPtr schema = NULL;
-	char *source;
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s!", &source, &source_len) == FAILURE) {
-		return;
-	}
-
-	if (source != NULL && !source_len) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Schema data source is requried");
-		RETURN_FALSE;
-	}
-
-	id = getThis();
-
-	intern = (xmlreader_object *)zend_object_store_get_object(id TSRMLS_CC);
-	if (intern && intern->ptr) {
-		if (source) {
-			schema =  _xmlreader_get_relaxNG(source, source_len, type, NULL, NULL TSRMLS_CC);
-			if (schema) {
-				retval = xmlTextReaderRelaxNGSetSchema(intern->ptr, schema);
-			}
-		} else {
-			/* unset the associated relaxNG context and schema if one exists */
-			retval = xmlTextReaderRelaxNGSetSchema(intern->ptr, NULL);
-		}
-
-		if (retval == 0) {
-			if (intern->schema) {
-				xmlRelaxNGFree((xmlRelaxNGPtr) intern->schema);
-			}
-
-			intern->schema = schema;
-
-			RETURN_TRUE;
-		}
-	}
-	
-	php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to set schema. This must be set prior to reading or schema contains errors.");
-
-	RETURN_FALSE;
-#else
-	php_error_docref(NULL TSRMLS_CC, E_WARNING, "No Schema support built into libxml.");
-
-	RETURN_FALSE;
-#endif
-}
-
-/* {{{ proto boolean close()
-Closes xmlreader - current frees resources until xmlTextReaderClose is fixed in libxml */
-PHP_METHOD(xmlreader, close)
-{
-	zval *id;
-	xmlreader_object *intern;
-
-	id = getThis();
-	intern = (xmlreader_object *)zend_object_store_get_object(id TSRMLS_CC);
-	/* libxml is segfaulting in versions up to 2.6.8 using xmlTextReaderClose so for 
-	now we will free the whole reader when close is called as it would get rebuilt on 
-	a new load anyways */
-	xmlreader_free_resources(intern);
-	
-	RETURN_TRUE;
-}
-
-/* {{{ proto string getAttribute(string name)
-Get value of an attribute from current element */
-PHP_METHOD(xmlreader, getAttribute)
-{
-	php_xmlreader_string_arg(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextReaderGetAttribute);
-}
-/* }}} */
-
-/* {{{ proto string getAttributeNo(int index)
-Get value of an attribute at index from current element */
-PHP_METHOD(xmlreader, getAttributeNo)
-{
-	zval *id;
-	int attr_pos;
-	char *retchar = NULL;
-	xmlreader_object *intern;
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &attr_pos) == FAILURE) {
-		return;
-	}
-
-	id = getThis();
-
-	intern = (xmlreader_object *)zend_object_store_get_object(id TSRMLS_CC);
-	if (intern && intern->ptr) {
-		retchar = xmlTextReaderGetAttributeNo(intern->ptr,attr_pos);
-	}
-	if (retchar) {
-		RETVAL_STRING(retchar, 1);
-		xmlFree(retchar);
-		return;
-	} else {
-		RETURN_EMPTY_STRING();
-	}
-}
-/* }}} */
-
-/* {{{ proto string getAttributeNs(string name, string namespaceURI)
-Get value of a attribute via name and namespace from current element */
-PHP_METHOD(xmlreader, getAttributeNs)
-{
-	zval *id;
-	int name_len = 0, ns_uri_len = 0;
-	xmlreader_object *intern;
-	char *name, *ns_uri, *retchar = NULL;
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &name, &name_len, &ns_uri, &ns_uri_len) == FAILURE) {
-		return;
-	}
-
-	if (name_len == 0 || ns_uri_len == 0) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Attribute Name and Namespace URI cannot be empty");
-		RETURN_FALSE;
-	}
-
-	id = getThis();
-
-	intern = (xmlreader_object *)zend_object_store_get_object(id TSRMLS_CC);
-	if (intern && intern->ptr) {
-		retchar = xmlTextReaderGetAttributeNs(intern->ptr, name, ns_uri);
-	}
-	if (retchar) {
-		RETVAL_STRING(retchar, 1);
-		xmlFree(retchar);
-		return;
-	} else {
-		RETURN_EMPTY_STRING();
-	}
-}
-/* }}} */
-
-/* {{{ proto boolean getParserProperty(int property)
-Indicates wether given property (one of the parser option constants) is set or not on parser */
-PHP_METHOD(xmlreader, getParserProperty)
-{
-	zval *id;
-	int property, retval = -1;
-	xmlreader_object *intern;
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &property) == FAILURE) {
-		return;
-	}
-
-	id = getThis();
-
-	intern = (xmlreader_object *)zend_object_store_get_object(id TSRMLS_CC);
-	if (intern && intern->ptr) {
-		retval = xmlTextReaderGetParserProp(intern->ptr,property);
-	}
-	if (retval == -1) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid parser property");
-		RETURN_FALSE;
-	}
-
-	RETURN_BOOL(retval);
-}
-/* }}} */
-
-/* {{{ proto boolean isValid()
-Returns boolean indicating if parsed document is valid or not.
-Must set XMLREADER_LOADDTD or XMLREADER_VALIDATE parser option prior to the first call to read 
-or this method will always return FALSE */
-PHP_METHOD(xmlreader, isValid)
-{
-	php_xmlreader_no_arg(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextReaderIsValid);
-}
-/* }}} */
-
-/* {{{ proto string lookupNamespace(string prefix)
-Return namespaceURI for associated prefix on current node */
-PHP_METHOD(xmlreader, lookupNamespace)
-{
-	php_xmlreader_string_arg(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextReaderLookupNamespace);
-}
-/* }}} */
-
-/* {{{ proto boolean moveToAttribute(string name)
-Positions reader at specified attribute - Returns TRUE on success and FALSE on failure */
-PHP_METHOD(xmlreader, moveToAttribute)
-{
-	zval *id;
-	int name_len = 0, retval;
-	xmlreader_object *intern;
-	char *name;
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &name, &name_len) == FAILURE) {
-		return;
-	}
-
-	if (name_len == 0) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Attribute Name is required");
-		RETURN_FALSE;
-	}
-
-	id = getThis();
-
-	intern = (xmlreader_object *)zend_object_store_get_object(id TSRMLS_CC);
-	if (intern && intern->ptr) {
-		retval = xmlTextReaderMoveToAttribute(intern->ptr, name);
-		if (retval == 1) {
-			RETURN_TRUE;
-		}
-	}
-
-	RETURN_FALSE;
-}
-/* }}} */
-
-/* {{{ proto boolean moveToAttributeNo(int index)
-Positions reader at attribute at spcecified index.
-Returns TRUE on success and FALSE on failure */
-PHP_METHOD(xmlreader, moveToAttributeNo)
-{
-	zval *id;
-	int attr_pos, retval;
-	xmlreader_object *intern;
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &attr_pos) == FAILURE) {
-		return;
-	}
-
-	id = getThis();
-
-	intern = (xmlreader_object *)zend_object_store_get_object(id TSRMLS_CC);
-	if (intern && intern->ptr) {
-		retval = xmlTextReaderMoveToAttributeNo(intern->ptr, attr_pos);
-		if (retval == 1) {
-			RETURN_TRUE;
-		}
-	}
-
-	RETURN_FALSE;
-}
-/* }}} */
-
-/* {{{ proto boolean moveToAttributeNs(string name, string namespaceURI)
-Positions reader at attribute spcified by name and namespaceURI.
-Returns TRUE on success and FALSE on failure */
-PHP_METHOD(xmlreader, moveToAttributeNs)
-{
-	zval *id;
-	int name_len=0, ns_uri_len=0, retval;
-	xmlreader_object *intern;
-	char *name, *ns_uri;
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &name, &name_len, &ns_uri, &ns_uri_len) == FAILURE) {
-		return;
-	}
-
-	if (name_len == 0 || ns_uri_len == 0) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Attribute Name and Namespace URI cannot be empty");
-		RETURN_FALSE;
-	}
-
-	id = getThis();
-
-	intern = (xmlreader_object *)zend_object_store_get_object(id TSRMLS_CC);
-	if (intern && intern->ptr) {
-		retval = xmlTextReaderMoveToAttributeNs(intern->ptr, name, ns_uri);
-		if (retval == 1) {
-			RETURN_TRUE;
-		}
-	}
-
-	RETURN_FALSE;
-}
-/* }}} */
-
-/* {{{ proto boolean moveToElement()
-Moves the position of the current instance to the node that contains the current Attribute node. */
-PHP_METHOD(xmlreader, moveToElement)
-{
-	php_xmlreader_no_arg(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextReaderMoveToElement);
-}
-/* }}} */
-
-/* {{{ proto boolean moveToFirstAttribute()
-Moves the position of the current instance to the first attribute associated with the current node. */
-PHP_METHOD(xmlreader, moveToFirstAttribute)
-{
-	php_xmlreader_no_arg(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextReaderMoveToFirstAttribute);
-}
-/* }}} */
-
-/* {{{ proto boolean moveToNextAttribute()
-Moves the position of the current instance to the next attribute associated with the current node. */
-PHP_METHOD(xmlreader, moveToNextAttribute)
-{
-	php_xmlreader_no_arg(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextReaderMoveToNextAttribute);
-}
-/* }}} */
-
-/* {{{ proto boolean read()
-Moves the position of the current instance to the next node in the stream. */
-PHP_METHOD(xmlreader, read)
-{
-	zval *id;
-	int retval;
-	xmlreader_object *intern;
-
-	id = getThis();
-	intern = (xmlreader_object *)zend_object_store_get_object(id TSRMLS_CC);
-	if (intern != NULL && intern->ptr != NULL) {
-		retval = xmlTextReaderRead(intern->ptr);
-		if (retval == -1) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "An Error Occured while reading");
-			RETURN_FALSE;
-		} else {
-			RETURN_BOOL(retval);
-		}
-	}
-	
-	php_error_docref(NULL TSRMLS_CC, E_WARNING, "Load Data before trying to read");
-	RETURN_FALSE;
-}
-/* }}} */
-
-/* {{{ proto boolean read()
-Moves the position of the current instance to the next node in the stream. */
-PHP_METHOD(xmlreader, next)
-{
-	zval *id;
-	int retval;
-	xmlreader_object *intern;
-
-	id = getThis();
-	intern = (xmlreader_object *)zend_object_store_get_object(id TSRMLS_CC);
-	if (intern != NULL && intern->ptr != NULL) {
-		retval = xmlTextReaderNext(intern->ptr);
-		if (retval == -1) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "An Error Occured while reading");
-			RETURN_FALSE;
-		} else {
-			RETURN_BOOL(retval);
-		}
-	}
-	
-	php_error_docref(NULL TSRMLS_CC, E_WARNING, "Load Data before trying to read");
-	RETURN_FALSE;
-}
-/* }}} */
-
-/* {{{ proto boolean open(string URI)
-Sets the URI that the the XMLReader will parse. */
-PHP_METHOD(xmlreader, open)
-{
-	zval *id;
-	int source_len = 0;
-	xmlreader_object *intern;
-	char *source, *valid_file = NULL;
-	char resolved_path[MAXPATHLEN + 1];
-	xmlTextReaderPtr reader = NULL;
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &source, &source_len) == FAILURE) {
-		return;
-	}
-
-	id = getThis();
-	if (id != NULL) {
-		if (! instanceof_function(Z_OBJCE_P(id), xmlreader_class_entry TSRMLS_CC)) {
-			id = NULL;
-		} else {
-			intern = (xmlreader_object *)zend_object_store_get_object(id TSRMLS_CC);
-			xmlreader_free_resources(intern);
-		}
-	}
-
-	if (!source_len) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty string supplied as input");
-		RETURN_FALSE;
-	}
-
-	valid_file = _xmlreader_get_valid_file_path(source, resolved_path, MAXPATHLEN  TSRMLS_CC);
-
-	if (valid_file) {
-		reader = xmlNewTextReaderFilename(valid_file);
-	}
-
-	if (reader == NULL) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to open source data");
-		RETURN_FALSE;
-	}
-
-	if (id == NULL) {
-		object_init_ex(return_value, xmlreader_class_entry);
-		intern = (xmlreader_object *)zend_objects_get_address(return_value TSRMLS_CC);
-		intern->ptr = reader;
-		return;
-	}
-
-	intern->ptr = reader;
-
-	RETURN_TRUE;
-
-}
-/* }}} */
-
-/* Not Yet Implemented in libxml - functions exist just not coded
-PHP_METHOD(xmlreader, readInnerXml)
-{
-	php_xmlreader_no_arg_string(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextReaderReadInnerXml);
-}
-
-PHP_METHOD(xmlreader, readOuterXml)
-{
-	php_xmlreader_no_arg_string(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextReaderReadInnerXml);
-}
-
-PHP_METHOD(xmlreader, readString)
-{
-	php_xmlreader_no_arg_string(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextReaderReadString);
-}
-
-PHP_METHOD(xmlreader, resetState)
-{
-
-}
-*/
-
-/* {{{ proto boolean setParserProperty(int property, boolean value)
-Sets parser property (one of the parser option constants).
-Properties must be set after open() or XML() and before the first read() is called */
-PHP_METHOD(xmlreader, setParserProperty)
-{
-	zval *id;
-	int property, value, retval = -1;
-	xmlreader_object *intern;
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lb", &property, &value) == FAILURE) {
-		return;
-	}
-
-	id = getThis();
-
-	intern = (xmlreader_object *)zend_object_store_get_object(id TSRMLS_CC);
-	if (intern && intern->ptr) {
-		retval = xmlTextReaderSetParserProp(intern->ptr,property, value);
-	}
-	if (retval == -1) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid parser property");
-		RETURN_FALSE;
-	}
-
-	RETURN_TRUE;
-}
-/* }}} */
-
-/* {{{ proto boolean setRelaxNGSchemaSource(string filename)
-Sets the string that the the XMLReader will parse. */
-PHP_METHOD(xmlreader, setRelaxNGSchema)
-{
-	php_xmlreader_set_relaxng_schema(INTERNAL_FUNCTION_PARAM_PASSTHRU, XMLREADER_LOAD_FILE);
-}
-/* }}} */
-
-/* {{{ proto boolean setRelaxNGSchemaSource(string source)
-Sets the string that the the XMLReader will parse. */
-PHP_METHOD(xmlreader, setRelaxNGSchemaSource)
-{
-	php_xmlreader_set_relaxng_schema(INTERNAL_FUNCTION_PARAM_PASSTHRU, XMLREADER_LOAD_STRING);
-}
-/* }}} */
-
-/* {{{ proto boolean XML(string source)
-Sets the string that the the XMLReader will parse. */
-PHP_METHOD(xmlreader, XML)
-{
-	zval *id;
-	int source_len = 0;
-	xmlreader_object *intern;
-	char *source, *uri = NULL;
-	int resolved_path_len;
-	char *directory=NULL, resolved_path[MAXPATHLEN];
-	xmlParserInputBufferPtr inputbfr;
-	xmlTextReaderPtr reader;
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &source, &source_len) == FAILURE) {
-		return;
-	}
-
-	id = getThis();
-	if (id != NULL && ! instanceof_function(Z_OBJCE_P(id), xmlreader_class_entry TSRMLS_CC)) {
-		id = NULL;
-	}
-	if (id != NULL) {
-		intern = (xmlreader_object *)zend_object_store_get_object(id TSRMLS_CC);
-		xmlreader_free_resources(intern);
-	}
-
-	if (!source_len) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty string supplied as input");
-		RETURN_FALSE;
-	}
-
-	inputbfr = xmlParserInputBufferCreateMem(source, source_len, XML_CHAR_ENCODING_NONE);
-
-    if (inputbfr != NULL) {
-/* Get the URI of the current script so that we can set the base directory in libxml */
-#if HAVE_GETCWD
-		directory = VCWD_GETCWD(resolved_path, MAXPATHLEN);
-#elif HAVE_GETWD
-		directory = VCWD_GETWD(resolved_path);
-#endif
-		if (directory) {
-			resolved_path_len = strlen(resolved_path);
-			if (resolved_path[resolved_path_len - 1] != DEFAULT_SLASH) {
-				resolved_path[resolved_path_len] = DEFAULT_SLASH;
-				resolved_path[++resolved_path_len] = '\0';
-			}
-			uri = (char *) xmlCanonicPath((const xmlChar *) resolved_path);
-		}
-		reader = xmlNewTextReader(inputbfr, uri);
-		if (uri) {
-			xmlFree(uri);
-		}
-		if (reader != NULL) {
-			if (id == NULL) {
-				object_init_ex(return_value, xmlreader_class_entry);
-				intern = (xmlreader_object *)zend_objects_get_address(return_value TSRMLS_CC);
-				intern->input = inputbfr;
-				intern->ptr = reader;
-				return;
-			} else {
-				intern->input = inputbfr;
-				intern->ptr = reader;
-				RETURN_TRUE;
-
-			}
-		}
-	}
-
-	if (inputbfr) {
-		xmlFreeParserInputBuffer(inputbfr);
-	}
-	php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to load source data");
-	RETURN_FALSE;
-}
-/* }}} */
-
-/* {{{ proto boolean expand()
-Moves the position of the current instance to the next node in the stream. */
-PHP_METHOD(xmlreader, expand)
-{
-#ifdef HAVE_DOM
-	zval *id, *rv = NULL;
-	int ret;
-	xmlreader_object *intern;
-	xmlNode *node, *nodec;
-
-	id = getThis();
-	intern = (xmlreader_object *)zend_object_store_get_object(id TSRMLS_CC);
-
-	if (intern && intern->ptr) {
-		node = xmlTextReaderExpand(intern->ptr);
-		
-		if (node == NULL) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "An Error Occured while expanding ");
-			RETURN_FALSE;
-		} else {
-			nodec = xmlCopyNode(node, 1);
-			DOM_RET_OBJ(rv, nodec, &ret, NULL);
-		}
-	} else {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Load Data before trying to expand");
-		RETURN_FALSE;
-	}
-#else
-	php_error(E_WARNING, "DOM support is not enabled");
-	return;
-#endif
-}
-/* }}} */
-
-static zend_function_entry xmlreader_functions[] = {
-	PHP_ME(xmlreader, close, NULL, ZEND_ACC_PUBLIC)
-	PHP_ME(xmlreader, getAttribute, NULL, ZEND_ACC_PUBLIC)
-	PHP_ME(xmlreader, getAttributeNo, NULL, ZEND_ACC_PUBLIC)
-	PHP_ME(xmlreader, getAttributeNs, NULL, ZEND_ACC_PUBLIC)
-	PHP_ME(xmlreader, getParserProperty, NULL, ZEND_ACC_PUBLIC)
-	PHP_ME(xmlreader, isValid, NULL, ZEND_ACC_PUBLIC)
-	PHP_ME(xmlreader, lookupNamespace, NULL, ZEND_ACC_PUBLIC)
-	PHP_ME(xmlreader, moveToAttributeNo, NULL, ZEND_ACC_PUBLIC)
-	PHP_ME(xmlreader, moveToAttribute, NULL, ZEND_ACC_PUBLIC)
-	PHP_ME(xmlreader, moveToAttributeNs, NULL, ZEND_ACC_PUBLIC)
-	PHP_ME(xmlreader, moveToElement, NULL, ZEND_ACC_PUBLIC)
-	PHP_ME(xmlreader, moveToFirstAttribute, NULL, ZEND_ACC_PUBLIC)
-	PHP_ME(xmlreader, moveToNextAttribute, NULL, ZEND_ACC_PUBLIC)
-	PHP_ME(xmlreader, open, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_ALLOW_STATIC)
-	PHP_ME(xmlreader, read, NULL, ZEND_ACC_PUBLIC)
-	PHP_ME(xmlreader, next, NULL, ZEND_ACC_PUBLIC)
-/* Not Yet Implemented though defined in libxml as of 2.6.9dev
-	PHP_ME(xmlreader, readInnerXml, NULL, ZEND_ACC_PUBLIC)
-	PHP_ME(xmlreader, readOuterXml, NULL, ZEND_ACC_PUBLIC)
-	PHP_ME(xmlreader, readString, NULL, ZEND_ACC_PUBLIC)
-	PHP_ME(xmlreader, resetState, NULL, ZEND_ACC_PUBLIC)
-*/
-	PHP_ME(xmlreader, setParserProperty, NULL, ZEND_ACC_PUBLIC)
-	PHP_ME(xmlreader, setRelaxNGSchema, NULL, ZEND_ACC_PUBLIC)
-	PHP_ME(xmlreader, setRelaxNGSchemaSource, NULL, ZEND_ACC_PUBLIC)
-	PHP_ME(xmlreader, XML, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_ALLOW_STATIC)
-	PHP_ME(xmlreader, expand, NULL, ZEND_ACC_PUBLIC)
-	{NULL, NULL, NULL}
-};
-
-/* {{{ PHP_MINIT_FUNCTION
- */
-PHP_MINIT_FUNCTION(xmlreader)
-{
-	
-	zend_class_entry ce;
-	
-	memcpy(&xmlreader_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
-	xmlreader_object_handlers.read_property = xmlreader_read_property;
-	xmlreader_object_handlers.write_property = xmlreader_write_property;
-	xmlreader_object_handlers.get_property_ptr_ptr = NULL;
-
-	INIT_CLASS_ENTRY(ce, "XMLReader", xmlreader_functions);
-	ce.create_object = xmlreader_objects_new;
-	xmlreader_class_entry = zend_register_internal_class(&ce TSRMLS_CC);
-
-	zend_hash_init(&xmlreader_prop_handlers, 0, NULL, NULL, 1);
-	xmlreader_register_prop_handler(&xmlreader_prop_handlers, "attributeCount", xmlTextReaderAttributeCount, NULL, IS_LONG TSRMLS_CC);
-	xmlreader_register_prop_handler(&xmlreader_prop_handlers, "baseURI", NULL, xmlTextReaderBaseUri, IS_STRING TSRMLS_CC);
-	xmlreader_register_prop_handler(&xmlreader_prop_handlers, "depth", xmlTextReaderDepth, NULL, IS_LONG TSRMLS_CC);
-	xmlreader_register_prop_handler(&xmlreader_prop_handlers, "hasAttributes", xmlTextReaderHasAttributes, NULL, IS_BOOL TSRMLS_CC);
-	xmlreader_register_prop_handler(&xmlreader_prop_handlers, "hasValue", xmlTextReaderHasValue, NULL, IS_BOOL TSRMLS_CC);
-	xmlreader_register_prop_handler(&xmlreader_prop_handlers, "isDefault", xmlTextReaderIsDefault, NULL, IS_BOOL TSRMLS_CC);
-	xmlreader_register_prop_handler(&xmlreader_prop_handlers, "isEmptyElement", xmlTextReaderIsEmptyElement, NULL, IS_BOOL TSRMLS_CC);
-	xmlreader_register_prop_handler(&xmlreader_prop_handlers, "localName", NULL, xmlTextReaderLocalName, IS_STRING TSRMLS_CC);
-	xmlreader_register_prop_handler(&xmlreader_prop_handlers, "name", NULL, xmlTextReaderName, IS_STRING TSRMLS_CC);
-	xmlreader_register_prop_handler(&xmlreader_prop_handlers, "namespaceURI", NULL, xmlTextReaderNamespaceUri, IS_STRING TSRMLS_CC);
-	xmlreader_register_prop_handler(&xmlreader_prop_handlers, "nodeType", xmlTextReaderNodeType, NULL, IS_LONG TSRMLS_CC);
-	xmlreader_register_prop_handler(&xmlreader_prop_handlers, "prefix", NULL, xmlTextReaderPrefix, IS_STRING TSRMLS_CC);
-	xmlreader_register_prop_handler(&xmlreader_prop_handlers, "value", NULL, xmlTextReaderValue, IS_STRING TSRMLS_CC);
-	xmlreader_register_prop_handler(&xmlreader_prop_handlers, "xmlLang", NULL, xmlTextReaderXmlLang, IS_STRING TSRMLS_CC);
-
-	/* Constants for NodeType - cannot define common types to share with dom as there are differences in these types */
-	REGISTER_LONG_CONSTANT("XMLREADER_NONE",			XML_READER_TYPE_NONE,			CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("XMLREADER_ELEMENT",			XML_READER_TYPE_ELEMENT,		CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("XMLREADER_ATTRIBUTE",		XML_READER_TYPE_ATTRIBUTE,		CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("XMLREADER_TEXT",			XML_READER_TYPE_TEXT,			CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("XMLREADER_CDATA",			XML_READER_TYPE_CDATA,			CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("XMLREADER_ENTITY_REF",		XML_READER_TYPE_ENTITY_REFERENCE,	CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("XMLREADER_ENTITY",			XML_READER_TYPE_ENTITY,			CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("XMLREADER_PI",				XML_READER_TYPE_PROCESSING_INSTRUCTION,	CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("XMLREADER_COMMENT",			XML_READER_TYPE_COMMENT,		CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("XMLREADER_DOC",				XML_READER_TYPE_DOCUMENT,		CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("XMLREADER_DOC_TYPE",		XML_READER_TYPE_DOCUMENT_TYPE,	CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("XMLREADER_DOC_FRAGMENT",	XML_READER_TYPE_DOCUMENT_FRAGMENT,	CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("XMLREADER_NOTATION",		XML_READER_TYPE_NOTATION,		CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("XMLREADER_WHITESPACE",		XML_READER_TYPE_WHITESPACE,		CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("XMLREADER_SIGNIFICANT_WHITESPACE",	XML_READER_TYPE_SIGNIFICANT_WHITESPACE,	CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("XMLREADER_END_ELEMENT",		XML_READER_TYPE_END_ELEMENT,	CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("XMLREADER_END_ENTITY",		XML_READER_TYPE_END_ENTITY,		CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("XMLREADER_XML_DECLARATION",	XML_READER_TYPE_XML_DECLARATION,	CONST_CS | CONST_PERSISTENT);
-
-	/* Constants for Parser options */
-	REGISTER_LONG_CONSTANT("XMLREADER_LOADDTD",			XML_PARSER_LOADDTD,				CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("XMLREADER_DEFAULTATTRS",	XML_PARSER_DEFAULTATTRS,		CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("XMLREADER_VALIDATE",		XML_PARSER_VALIDATE,			CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("XMLREADER_SUBST_ENTITIES",	XML_PARSER_SUBST_ENTITIES,		CONST_CS | CONST_PERSISTENT);
-
-	/* Constants for Errors when loading - not yet used until we implement custom error handling
-	REGISTER_LONG_CONSTANT("XMLREADER_VALIDITY_WARNING",	XML_PARSER_SEVERITY_VALIDITY_WARNING,	CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("XMLREADER_VALIDITY_ERROR",		XML_PARSER_SEVERITY_VALIDITY_ERROR,		CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("XMLREADER_WARNING",				XML_PARSER_SEVERITY_WARNING,			CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("XMLREADER_ERROR",				XML_PARSER_SEVERITY_ERROR,				CONST_CS | CONST_PERSISTENT);
-	*/
-
-	return SUCCESS;
-}
-/* }}} */
-
-
-/* {{{ PHP_MSHUTDOWN_FUNCTION
- */
-PHP_MSHUTDOWN_FUNCTION(xmlreader)
-{
-	zend_hash_destroy(&xmlreader_prop_handlers);
-	return SUCCESS;
-}
-/* }}} */
-
-/* {{{ PHP_MINFO_FUNCTION
- */
-PHP_MINFO_FUNCTION(xmlreader)
-{
-	php_info_print_table_start();
-	{
-		php_info_print_table_row(2, "XMLReader", "enabled");
-	}
-	php_info_print_table_end();
-
-	/* Remove comments if you have entries in php.ini
-	DISPLAY_INI_ENTRIES();
-	*/
-}
-/* }}} */
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: noet sw=4 ts=4 fdm=marker
- * vim<600: noet sw=4 ts=4
- */
diff --git a/ext/xmlreader/php_xmlreader.h b/ext/xmlreader/php_xmlreader.h
deleted file mode 100644
index 2a753efe4f..0000000000
--- a/ext/xmlreader/php_xmlreader.h
+++ /dev/null
@@ -1,72 +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.               |
-  +----------------------------------------------------------------------+
-  | Author: Rob Richards <rrichards@php.net>                             |
-  +----------------------------------------------------------------------+
-*/
-
-/* $Id$ */
-
-#ifndef PHP_XMLREADER_H
-#define PHP_XMLREADER_H
-
-extern zend_module_entry xmlreader_module_entry;
-#define phpext_xmlreader_ptr &xmlreader_module_entry
-
-#ifdef PHP_WIN32
-#define PHP_XMLREADER_API __declspec(dllexport)
-#else
-#define PHP_XMLREADER_API
-#endif
-
-#ifdef ZTS
-#include "TSRM.h"
-#endif
-
-#include "ext/libxml/php_libxml.h"
-#include <libxml/xmlreader.h>
-
-typedef struct _xmlreader_object {
-	zend_object  std;
-	xmlTextReaderPtr ptr;
-	/* input is used to allow strings to be loaded under libxml 2.5.x
-	must manually allocate and de-allocate these - can be refactored when
-	libxml 2.6.x becomes minimum version */
-	xmlParserInputBufferPtr input;
-	void *schema;
-	HashTable *prop_handler;
-	zend_object_handle handle;
-} xmlreader_object;
-
-PHP_MINIT_FUNCTION(xmlreader);
-PHP_MSHUTDOWN_FUNCTION(xmlreader);
-PHP_MINFO_FUNCTION(xmlreader);
-
-
-#ifdef ZTS
-#define XMLREADER_G(v) TSRMG(xmlreader_globals_id, zend_xmlreader_globals *, v)
-#else
-#define XMLREADER_G(v) (xmlreader_globals.v)
-#endif
-
-#endif	/* PHP_XMLREADER_H */
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: noet sw=4 ts=4 fdm=marker
- * vim<600: noet sw=4 ts=4
- */
diff --git a/ext/xmlreader/xmlreader.dsp b/ext/xmlreader/xmlreader.dsp
deleted file mode 100644
index 7b21518ba3..0000000000
--- a/ext/xmlreader/xmlreader.dsp
+++ /dev/null
@@ -1,114 +0,0 @@
-# Microsoft Developer Studio Project File - Name="xmlreader" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=xmlreader - Win32 Release_TS
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "xmlreader.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "xmlreader.mak" CFG="xmlreader - Win32 Release_TS"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "xmlreader - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "xmlreader - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "xmlreader - Win32 Debug_TS"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "xmlreader___Win32_Debug_TS"
-# PROP BASE Intermediate_Dir "xmlreader___Win32_Debug_TS"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug_TS"
-# PROP Intermediate_Dir "Debug_TS"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XMLREADER_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\.." /I "..\..\Zend" /I "..\..\TSRM" /I "..\..\main" /D ZEND_DEBUG=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XMLREADER_EXPORTS" /D "COMPILE_DL_XMLREADER" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D "LIBXML_THREAD_ENABLED" /FR /YX /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 php5ts_debug.lib resolv.lib kernel32.lib user32.lib gdi32.lib winspool.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"msvcrt" /out:"..\..\Debug_TS/php_xmlreader.dll" /libpath:"..\..\Debug_TS" /libpath:"..\..\..\bindlib_w32\Release"
-
-!ELSEIF  "$(CFG)" == "xmlreader - Win32 Release_TS"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "xmlreader___Win32_Release_TS0"
-# PROP BASE Intermediate_Dir "xmlreader___Win32_Release_TS0"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Release_TS"
-# PROP Intermediate_Dir "Release_TS"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\.." /I "..\..\Zend" /I "..\..\TSRM" /I "..\..\main" /D ZEND_DEBUG=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XMLREADER_EXPORTS" /D "COMPILE_DL_XSL" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D "LIBXML_THREAD_ENABLED" /FR /YX /FD /GZ /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\TSRM" /I "..\..\main" /D ZEND_DEBUG=0 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XMLREADER_EXPORTS" /D "COMPILE_DL_XSL" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D "LIBXML_THREAD_ENABLED" /YX /FD /GZ /c
-# SUBTRACT CPP /Fr
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 php5ts_debug.lib resolv.lib kernel32.lib user32.lib gdi32.lib winspool.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"msvcrt" /out:"..\..\Debug_TS/php_xmlreader.dll" /libpath:"..\..\Debug_TS" /libpath:"..\..\..\bindlib_w32\Release"
-# ADD LINK32 php5ts.lib resolv.lib kernel32.lib user32.lib gdi32.lib winspool.lib /nologo /dll /incremental:no /machine:I386 /out:"..\..\Release_TS/php_xmlreader.dll" /libpath:"..\..\Debug_TS" /libpath:"..\..\..\bindlib_w32\Release"
-# SUBTRACT LINK32 /debug
-
-!ENDIF 
-
-# Begin Target
-
-# Name "xmlreader - Win32 Debug_TS"
-# Name "xmlreader - Win32 Release_TS"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\php_xmlreader.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\php_xmlreader.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project