diff options
| author | Xinchen Hui <laruence@php.net> | 2012-04-04 17:36:18 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2012-04-04 17:36:18 +0800 |
| commit | 1ff80215190e0746d89c5502c232e26c6fabe5d4 (patch) | |
| tree | 6a1949497b7f9f6b28e5ba22fb581d1b85e0e49a | |
| parent | 9882358984709539a3aa5228ef95843da52c7d7b (diff) | |
| parent | 94f1c05ff8f83b2130de21683c5c2bd3af7e065c (diff) | |
| download | php-git-1ff80215190e0746d89c5502c232e26c6fabe5d4.tar.gz | |
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
| -rw-r--r-- | ext/libxml/libxml.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/libxml/libxml.c b/ext/libxml/libxml.c index 9d6c25737d..e42d845f90 100644 --- a/ext/libxml/libxml.c +++ b/ext/libxml/libxml.c @@ -874,7 +874,8 @@ static int php_libxml_post_deactivate() } 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)); |