Commit: bf6fea6ba06ee670e55ce06a190e82440e2fa9ce Author: Dmitry Stogov <dmi...@zend.com> Thu, 29 Nov 2012 14:41:20 +0400 Parents: 3c1888f58468ff0fd7f6c20f3fd7701ed7273647 Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=bf6fea6ba06ee670e55ce06a190e82440e2fa9ce Log: Fixed bug #61557 (Crasher in tt-rss backend.php) Bugs: https://bugs.php.net/61557 Changed paths: M ext/libxml/libxml.c Diff: diff --git a/ext/libxml/libxml.c b/ext/libxml/libxml.c index c97ee67..06de013 100644 --- a/ext/libxml/libxml.c +++ b/ext/libxml/libxml.c @@ -860,7 +860,6 @@ static PHP_MSHUTDOWN_FUNCTION(libxml) { if (!_php_libxml_per_request_initialization) { xmlSetGenericErrorFunc(NULL, NULL); - xmlSetStructuredErrorFunc(NULL, NULL); xmlParserInputBufferCreateFilenameDefault(NULL); xmlOutputBufferCreateFilenameDefault(NULL); @@ -876,11 +875,11 @@ static int php_libxml_post_deactivate() /* reset libxml generic error handling */ if (_php_libxml_per_request_initialization) { xmlSetGenericErrorFunc(NULL, NULL); - xmlSetStructuredErrorFunc(NULL, NULL); xmlParserInputBufferCreateFilenameDefault(NULL); xmlOutputBufferCreateFilenameDefault(NULL); } + xmlSetStructuredErrorFunc(NULL, NULL); if (LIBXML(stream_context)) { /* the steam_context resource will be released by resource list destructor */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
