From: Rob Richards <rrichards@php.net>
Date: Sat, 14 Mar 2009 17:30:28 +0000 (+0000)
Subject: MFH: add LIBXML_LOADED_VERSION constant that contains currently loaded libxml2 version
X-Git-Tag: RELEASE_1_3_5~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1313c864845b26bfd0654476a83d149b10967ec9;p=php

MFH: add LIBXML_LOADED_VERSION constant that contains currently loaded libxml2 version
add libxml2 version being used to info output
---

diff --git a/ext/libxml/libxml.c b/ext/libxml/libxml.c
index 2a76e25488..86bc171615 100644
--- a/ext/libxml/libxml.c
+++ b/ext/libxml/libxml.c
@@ -592,6 +592,7 @@ static PHP_MINIT_FUNCTION(libxml)
 
 	REGISTER_LONG_CONSTANT("LIBXML_VERSION",			LIBXML_VERSION,			CONST_CS | CONST_PERSISTENT);
 	REGISTER_STRING_CONSTANT("LIBXML_DOTTED_VERSION",	LIBXML_DOTTED_VERSION,	CONST_CS | CONST_PERSISTENT);
+	REGISTER_STRING_CONSTANT("LIBXML_LOADED_VERSION",	(char *)xmlParserVersion,		CONST_CS | CONST_PERSISTENT);
 
 	/* For use with loading xml */
 	REGISTER_LONG_CONSTANT("LIBXML_NOENT",		XML_PARSE_NOENT,		CONST_CS | CONST_PERSISTENT);
@@ -671,7 +672,8 @@ static PHP_MINFO_FUNCTION(libxml)
 {
 	php_info_print_table_start();
 	php_info_print_table_row(2, "libXML support", "active");
-	php_info_print_table_row(2, "libXML Version", LIBXML_DOTTED_VERSION);
+	php_info_print_table_row(2, "libXML Compiled Version", LIBXML_DOTTED_VERSION);
+	php_info_print_table_row(2, "libXML Loaded Version", (char *)xmlParserVersion);
 	php_info_print_table_row(2, "libXML streams", "enabled");
 	php_info_print_table_end();
 }