summaryrefslogtreecommitdiff
path: root/ext/xml/xml.c
diff options
context:
space:
mode:
authorChristian Stocker <chregu@php.net>2004-02-23 08:21:07 +0000
committerChristian Stocker <chregu@php.net>2004-02-23 08:21:07 +0000
commit2f310c3e4f9d2b5967694e1e6fe6d59b4e0c66ae (patch)
tree76927e9cf3331d27c00906c1a3fcd5f3fca5005f /ext/xml/xml.c
parentb3979e76bac985102a1a7eb710da0b02b15e1459 (diff)
downloadphp-git-2f310c3e4f9d2b5967694e1e6fe6d59b4e0c66ae.tar.gz
- make it compile with libxml2 2.5 again
- disable xml_parser_create_ns with libxml2 2.5 for the time being - the #if s can be removed, once we insist on libxml2 2.6
Diffstat (limited to 'ext/xml/xml.c')
-rw-r--r--ext/xml/xml.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/ext/xml/xml.c b/ext/xml/xml.c
index 728a811f47..f9ddc740de 100644
--- a/ext/xml/xml.c
+++ b/ext/xml/xml.c
@@ -1109,7 +1109,11 @@ PHP_FUNCTION(xml_parser_create)
Create an XML parser */
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 %d. Please upgrade to libxml2 2.6", LIBXML_DOTTED_VERSION);
+#else
php_xml_parser_create_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
+#endif
}
/* }}} */