rrichards Wed Mar 1 15:37:45 2006 UTC Modified files: (Branch: PHP_5_1) /php-src/ext/simplexml simplexml.c Log: nuke tests for libxml2 version - will always be > 2.6.0 http://cvs.php.net/viewcvs.cgi/php-src/ext/simplexml/simplexml.c?r1=1.151.2.15&r2=1.151.2.16&diff_format=u Index: php-src/ext/simplexml/simplexml.c diff -u php-src/ext/simplexml/simplexml.c:1.151.2.15 php-src/ext/simplexml/simplexml.c:1.151.2.16 --- php-src/ext/simplexml/simplexml.c:1.151.2.15 Mon Feb 27 13:38:03 2006 +++ php-src/ext/simplexml/simplexml.c Wed Mar 1 15:37:45 2006 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: simplexml.c,v 1.151.2.15 2006/02/27 13:38:03 helly Exp $ */ +/* $Id: simplexml.c,v 1.151.2.16 2006/03/01 15:37:45 rrichards Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1685,11 +1685,7 @@ return; } -#if LIBXML_VERSION >= 20600 docp = xmlReadFile(filename, NULL, options); -#else - docp = xmlParseFile(filename); -#endif if (! docp) { RETURN_FALSE; @@ -1729,11 +1725,7 @@ 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 @@ } 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); @@ -2113,7 +2103,7 @@ { php_info_print_table_start(); php_info_print_table_header(2, "Simplexml support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.151.2.15 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.151.2.16 $"); php_info_print_table_row(2, "Schema support", #ifdef LIBXML_SCHEMAS_ENABLED "enabled");
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php