Add XML_SAX_IMPL constant to determine which implementation (libxml / expat)

is selected for SAX interface.

diff --git a/ext/xml/xml.c b/ext/xml/xml.c
index 4d644cacc05f3c800af65af53583ed5c95254afb..83f377140a593cc49c5371c2ee059e944008b551 100644 (file)
--- a/ext/xml/xml.c
+++ b/ext/xml/xml.c
@@ -240,6 +240,12 @@ PHP_MINIT_FUNCTION(xml)
        php_xml_mem_hdlrs.realloc_fcn = php_xml_realloc_wrapper;
        php_xml_mem_hdlrs.free_fcn = php_xml_free_wrapper;
 
+#ifdef LIBXML_EXPAT_COMPAT
+       REGISTER_STRING_CONSTANT("XML_SAX_IMPL", "libxml", CONST_CS|CONST_PERSISTENT);
+#else
+       REGISTER_STRING_CONSTANT("XML_SAX_IMPL", "expat", CONST_CS|CONST_PERSISTENT);
+#endif
+       
 #ifdef LIBXML_EXPAT_COMPAT
        php_libxml_initialize();
 #endif
@@ -273,7 +279,7 @@ PHP_MINFO_FUNCTION(xml)
        php_info_print_table_start();
        php_info_print_table_row(2, "XML Support", "active");
        php_info_print_table_row(2, "XML Namespace Support", "active");
-#ifdef LIBXML_DOTTED_VERSION
+#if defined(LIBXML_DOTTED_VERSION) && defined(LIBXML_EXPAT_COMPAT)
        php_info_print_table_row(2, "libxml2 Version", LIBXML_DOTTED_VERSION);
 #else
        php_info_print_table_row(2, "EXPAT Version", XML_ExpatVersion());