From: Rob Richards <rrichards@php.net>
Date: Wed, 1 Mar 2006 15:36:34 +0000 (+0000)
Subject: nuke tests for libxml2 version - will always be > 2.6.0
X-Git-Tag: RELEASE_1_2~47
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=96cb8329e5600a3d624cf305fb766b0728915aa5;p=php

nuke tests for libxml2 version - will always be > 2.6.0
---

diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c
index 5e287aa900..ce3078494d 100644
--- a/ext/simplexml/simplexml.c
+++ b/ext/simplexml/simplexml.c
@@ -1684,11 +1684,7 @@ PHP_FUNCTION(simplexml_load_file)
 		return;
 	}
 
-#if LIBXML_VERSION >= 20600
 	docp = xmlReadFile(filename, NULL, options);
-#else
-	docp = xmlParseFile(filename);
-#endif
 
 	if (! docp) {
 		RETURN_FALSE;
@@ -1728,11 +1724,7 @@ PHP_FUNCTION(simplexml_load_string)
 		return;
 	}
 
-#if LIBXML_VERSION >= 20600
 	docp = xmlReadMemory(data, data_len, NULL, NULL, options);
-#else
-	docp = xmlParseMemory(data, data_len);
-#endif
 
 	if (! docp) {
 		RETURN_FALSE;
@@ -1774,11 +1766,9 @@ SXE_METHOD(__construct)
 	}
 
 	php_std_error_handling();
-#if LIBXML_VERSION >= 20600
+
 	docp = is_url ? xmlReadFile(data, NULL, options) : xmlReadMemory(data, data_len, NULL, NULL, options);
-#else
-	docp = is_url ? xmlParseFile(data) : xmlParseMemory(data, data_len);
-#endif
+
 	if (!docp) {
 		((php_libxml_node_object *)sxe)->document = NULL;
 		zend_throw_exception(zend_exception_get_default(TSRMLS_C), "String could not be parsed as XML", 0 TSRMLS_CC);