Merge branch 'PHP-5.4'

* PHP-5.4:
  Fixed bug #61617 (Libxml tests failed(ht is already destroyed))
  Cherry-pick 4cc74767
This commit is contained in:
Xinchen Hui 2012-04-04 17:38:15 +08:00
commit 1a3097373b

View File

@ -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));