Commit: 1a09bf8023356c65a461076c6525749bdd005b58 Author: Dmitry Stogov <dmi...@zend.com> Thu, 29 Nov 2012 14:38:18 +0400 Parents: f877d7fee6efe6457e665e60f99fc2f524d26d52 Branches: PHP-5.4
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1a09bf8023356c65a461076c6525749bdd005b58 Log: Fixed bug #61557 (Crasher in tt-rss backend.php) Bugs: https://bugs.php.net/61557 Changed paths: M NEWS M ext/libxml/libxml.c Diff: diff --git a/NEWS b/NEWS index 20ef5e3..e8ad77a 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,8 @@ PHP NEWS . Fixed bug #63635 (Segfault in gc_collect_cycles). (Dmitry) . Fixed bug #63468 (wrong called method as callback with inheritance). (Laruence) + . Fixed bug #61557 (Crasher in tt-rss backend.php). + (i dot am dot jack dot mail at gmail dot com) . Fixed bug #61272 (ob_start callback gets passed empty string). (Mike, casper at langemeijer dot eu) 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
