diff options
| author | Rob Richards <rrichards@php.net> | 2006-03-01 15:37:45 +0000 |
|---|---|---|
| committer | Rob Richards <rrichards@php.net> | 2006-03-01 15:37:45 +0000 |
| commit | 84ad62553d2918e896ad7c12b6edadcfcb45efaf (patch) | |
| tree | 55d763715cd87f923042bcd33f01a275ee8140e6 | |
| parent | 3022080d849fd49e4086596336455e5748607c9c (diff) | |
| download | php-git-84ad62553d2918e896ad7c12b6edadcfcb45efaf.tar.gz | |
nuke tests for libxml2 version - will always be > 2.6.0
| -rw-r--r-- | ext/simplexml/simplexml.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c index e8150eaf98..8a321ce0ba 100644 --- a/ext/simplexml/simplexml.c +++ b/ext/simplexml/simplexml.c @@ -1685,11 +1685,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; @@ -1729,11 +1725,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; @@ -1775,11 +1767,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(), "String could not be parsed as XML", 0 TSRMLS_CC); |