rrichards Sat Mar 14 17:30:28 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/libxml libxml.c Log: MFH: add LIBXML_LOADED_VERSION constant that contains currently loaded libxml2 version add libxml2 version being used to info output http://cvs.php.net/viewvc.cgi/php-src/ext/libxml/libxml.c?r1=1.32.2.7.2.15.2.10&r2=1.32.2.7.2.15.2.11&diff_format=u Index: php-src/ext/libxml/libxml.c diff -u php-src/ext/libxml/libxml.c:1.32.2.7.2.15.2.10 php-src/ext/libxml/libxml.c:1.32.2.7.2.15.2.11 --- php-src/ext/libxml/libxml.c:1.32.2.7.2.15.2.10 Wed Dec 31 11:15:38 2008 +++ php-src/ext/libxml/libxml.c Sat Mar 14 17:30:28 2009 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: libxml.c,v 1.32.2.7.2.15.2.10 2008/12/31 11:15:38 sebastian Exp $ */ +/* $Id: libxml.c,v 1.32.2.7.2.15.2.11 2009/03/14 17:30:28 rrichards Exp $ */ #define IS_EXT_MODULE @@ -592,6 +592,7 @@ 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 @@ { 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(); }
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php