- omit WARNING instead of ERROR for x_p_c_ns

- fix SKIPIF code in tests

diff --git a/ext/xml/tests/bug25666.phpt b/ext/xml/tests/bug25666.phpt
index 119f55e4ea8e6050134af63b8b82e06f0f799add..ce67ea8ed43e9ba08b35d56b7fd54c0d810b1cfe 100644 (file)
--- a/ext/xml/tests/bug25666.phpt
+++ b/ext/xml/tests/bug25666.phpt
@@ -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

diff --git a/ext/xml/tests/xml009.phpt b/ext/xml/tests/xml009.phpt
index 9e297925d697623c76f5732f760e910388e838f9..3b64e7b8baff86379b0d24687f2db35044c3168a 100644 (file)
--- a/ext/xml/tests/xml009.phpt
+++ b/ext/xml/tests/xml009.phpt
@@ -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

diff --git a/ext/xml/tests/xml010.phpt b/ext/xml/tests/xml010.phpt
index 795c455e404710fd2f3c5251c4604f2abfbd9818..125e9c7b03e9bd78279326d67b073e49d10dbe8f 100644 (file)
--- a/ext/xml/tests/xml010.phpt
+++ b/ext/xml/tests/xml010.phpt
@@ -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

diff --git a/ext/xml/xml.c b/ext/xml/xml.c
index 1d91f6e1acb43edc5fd409c3cae53ea0eb211e13..1f29585df07c5f9bb36524c52c63952b96ae915f 100644 (file)
--- a/ext/xml/xml.c
+++ b/ext/xml/xml.c
@@ -1110,7 +1110,8 @@ PHP_FUNCTION(xml_parser_create)
 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