diff options
| author | Christian Stocker <chregu@php.net> | 2004-02-23 16:19:40 +0000 |
|---|---|---|
| committer | Christian Stocker <chregu@php.net> | 2004-02-23 16:19:40 +0000 |
| commit | 1d0596dbef4c1eb5e74ecad5cc3145ad09aa5400 (patch) | |
| tree | fa436c16646d40d1450c54b96cb7ba0f7007eafd /ext | |
| parent | 9e6de31645baaa879ebc2c3c43b99f50497ab016 (diff) | |
| download | php-git-1d0596dbef4c1eb5e74ecad5cc3145ad09aa5400.tar.gz | |
- omit WARNING instead of ERROR for x_p_c_ns
- fix SKIPIF code in tests
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/xml/tests/bug25666.phpt | 2 | ||||
| -rw-r--r-- | ext/xml/tests/xml009.phpt | 2 | ||||
| -rw-r--r-- | ext/xml/tests/xml010.phpt | 2 | ||||
| -rw-r--r-- | ext/xml/xml.c | 3 |
4 files changed, 5 insertions, 4 deletions
diff --git a/ext/xml/tests/bug25666.phpt b/ext/xml/tests/bug25666.phpt index 119f55e4ea..ce67ea8ed4 100644 --- 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 9e297925d6..3b64e7b8ba 100644 --- 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 795c455e40..125e9c7b03 100644 --- 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 1d91f6e1ac..1f29585df0 100644 --- 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 |