com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/libxml/libxml.c

Commit: 1ff80215190e0746d89c5502c232e26c6fabe5d4 Author: Xinchen Hui <laruence@php.net> Wed, 4 Apr 2012 17:36:18 +0800 Parents: 9882358984709539a3aa5228ef95843da52c7d7b 94f1c05ff8f83b2130de21683c5c2bd3af7e065c Branches: PHP-5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1ff80215190e0746d89c5502c232e26c6fabe5d4 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: Fixed bug #61617 (Libxml tests failed(ht is already destroyed)) Cherry-pick 4cc74767 Conflicts: NEWS Bugs: https://bugs.php.net/61617 Changed paths: MM ext/libxml/libxml.c Diff: diff --cc ext/libxml/libxml.c index 9d6c257,a178478..e42d845 --- a/ext/libxml/libxml.c +++ b/ext/libxml/libxml.c @@@ -865,16 -659,15 +865,17 @@@ static int php_libxml_post_deactivate( { TSRMLS_FETCH(); /* reset libxml generic error handling */ - xmlSetGenericErrorFunc(NULL, NULL); - xmlSetStructuredErrorFunc(NULL, NULL); + if (_php_libxml_per_request_initialization) { + xmlSetGenericErrorFunc(NULL, NULL); + xmlSetStructuredErrorFunc(NULL, NULL); - xmlParserInputBufferCreateFilenameDefault(NULL); - xmlOutputBufferCreateFilenameDefault(NULL); + xmlParserInputBufferCreateFilenameDefault(NULL); + xmlOutputBufferCreateFilenameDefault(NULL); + } if (LIBXML(stream_context)) { - zval_ptr_dtor(&LIBXML(stream_context)); + /* the steam_context resource will be released by resource list destructor */ + efree(LIBXML(stream_context)); LIBXML(stream_context) = NULL; } smart_str_free(&LIBXML(error_buffer));