summaryrefslogtreecommitdiff
path: root/ext/libxml
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2012-11-29 14:38:18 +0400
committerDmitry Stogov <dmitry@zend.com>2012-11-29 14:38:18 +0400
commit1a09bf8023356c65a461076c6525749bdd005b58 (patch)
tree2c308cbbf9c14354870a8a7aa64d434300d5d703 /ext/libxml
parentf877d7fee6efe6457e665e60f99fc2f524d26d52 (diff)
downloadphp-git-1a09bf8023356c65a461076c6525749bdd005b58.tar.gz
Fixed bug #61557 (Crasher in tt-rss backend.php)
Diffstat (limited to 'ext/libxml')
-rw-r--r--ext/libxml/libxml.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/ext/libxml/libxml.c b/ext/libxml/libxml.c
index c97ee6724d..06de013858 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 */