chregu Mon Feb 23 11:19:41 2004 EDT
Modified files:
/php-src/ext/xml xml.c
/php-src/ext/xml/tests bug25666.phpt xml009.phpt xml010.phpt
Log:
- omit WARNING instead of ERROR for x_p_c_ns
- fix SKIPIF code in tests
http://cvs.php.net/diff.php/php-src/ext/xml/xml.c?r1=1.149&r2=1.150&ty=u
Index: php-src/ext/xml/xml.c
diff -u php-src/ext/xml/xml.c:1.149 php-src/ext/xml/xml.c:1.150
--- php-src/ext/xml/xml.c:1.149 Mon Feb 23 04:19:25 2004
+++ php-src/ext/xml/xml.c Mon Feb 23 11:19:39 2004
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: xml.c,v 1.149 2004/02/23 09:19:25 chregu Exp $ */
+/* $Id: xml.c,v 1.150 2004/02/23 16:19:39 chregu Exp $ */
#define IS_EXT_MODULE
@@ -1110,7 +1110,8 @@
PHP_FUNCTION(xml_parser_create_ns)
{
#if defined(HAVE_LIBXML) && defined(HAVE_XML) && !defined(HAVE_LIBEXPAT) &&
LIBXML_VERSION < 20600
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "is broken with libxml2 %s. Please
upgrade to libxml2 2.6", LIBXML_DOTTED_VERSION);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "is broken with libxml2 %s. Please
upgrade to libxml2 2.6", LIBXML_DOTTED_VERSION);
+ RETURN_FALSE;
#else
php_xml_parser_create_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
#endif
http://cvs.php.net/diff.php/php-src/ext/xml/tests/bug25666.phpt?r1=1.2&r2=1.3&ty=u
Index: php-src/ext/xml/tests/bug25666.phpt
diff -u php-src/ext/xml/tests/bug25666.phpt:1.2 php-src/ext/xml/tests/bug25666.phpt:1.3
--- php-src/ext/xml/tests/bug25666.phpt:1.2 Mon Feb 23 11:01:15 2004
+++ php-src/ext/xml/tests/bug25666.phpt Mon Feb 23 11:19:40 2004
@@ -2,7 +2,7 @@
Bug #25666 (XML namespaces broken in libxml-based SAX interface)
--SKIPIF--
<?php
-if (!xml_parser_create_ns('ISO-8859-1')) { die("skip xml_parser_create_ns is not
supported on this plattform");};
+if (! @xml_parser_create_ns('ISO-8859-1')) { die("skip xml_parser_create_ns is not
supported on this plattform");}
?>
--FILE--
<?php
http://cvs.php.net/diff.php/php-src/ext/xml/tests/xml009.phpt?r1=1.2&r2=1.3&ty=u
Index: php-src/ext/xml/tests/xml009.phpt
diff -u php-src/ext/xml/tests/xml009.phpt:1.2 php-src/ext/xml/tests/xml009.phpt:1.3
--- php-src/ext/xml/tests/xml009.phpt:1.2 Mon Feb 23 11:01:15 2004
+++ php-src/ext/xml/tests/xml009.phpt Mon Feb 23 11:19:40 2004
@@ -2,7 +2,7 @@
XML parser test, default namespaces
--SKIPIF--
<?php
-if (!xml_parser_create_ns('ISO-8859-1')) { die("skip xml_parser_create_ns is not
supported on this plattform");};
+if (! @xml_parser_create_ns('ISO-8859-1')) { die("skip xml_parser_create_ns is not
supported on this plattform");}
?>
--FILE--
<?php
http://cvs.php.net/diff.php/php-src/ext/xml/tests/xml010.phpt?r1=1.2&r2=1.3&ty=u
Index: php-src/ext/xml/tests/xml010.phpt
diff -u php-src/ext/xml/tests/xml010.phpt:1.2 php-src/ext/xml/tests/xml010.phpt:1.3
--- php-src/ext/xml/tests/xml010.phpt:1.2 Mon Feb 23 11:01:15 2004
+++ php-src/ext/xml/tests/xml010.phpt Mon Feb 23 11:19:40 2004
@@ -2,7 +2,7 @@
XML parser test, attributes
--SKIPIF--
<?php
-if (!xml_parser_create_ns('ISO-8859-1')) { die("skip xml_parser_create_ns is not
supported on this plattform");};
+if (! @xml_parser_create_ns('ISO-8859-1')) { die("skip xml_parser_create_ns is not
supported on this plattform");}
?>
--FILE--
<?php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
