From 167e2fd78224887144496cdec2089cd5b2f3312d Mon Sep 17 00:00:00 2001 From: Stanislav Malyshev Date: Sun, 25 Mar 2012 12:50:25 -0700 Subject: fix bug #61367 - open_basedir bypass using libxml RSHUTDOWN --- ext/libxml/libxml.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'ext/libxml/libxml.c') diff --git a/ext/libxml/libxml.c b/ext/libxml/libxml.c index cf20598fa5..515d58ea6a 100644 --- a/ext/libxml/libxml.c +++ b/ext/libxml/libxml.c @@ -82,8 +82,8 @@ ZEND_GET_MODULE(libxml) static PHP_MINIT_FUNCTION(libxml); static PHP_RINIT_FUNCTION(libxml); static PHP_MSHUTDOWN_FUNCTION(libxml); -static PHP_RSHUTDOWN_FUNCTION(libxml); static PHP_MINFO_FUNCTION(libxml); +static int php_libxml_post_deactivate(); /* }}} */ @@ -129,13 +129,13 @@ zend_module_entry libxml_module_entry = { PHP_MINIT(libxml), /* extension-wide startup function */ PHP_MSHUTDOWN(libxml), /* extension-wide shutdown function */ PHP_RINIT(libxml), /* per-request startup function */ - PHP_RSHUTDOWN(libxml), /* per-request shutdown function */ + NULL, /* per-request shutdown function */ PHP_MINFO(libxml), /* information function */ NO_VERSION_YET, PHP_MODULE_GLOBALS(libxml), /* globals descriptor */ PHP_GINIT(libxml), /* globals ctor */ NULL, /* globals dtor */ - NULL, /* post deactivate */ + php_libxml_post_deactivate, /* post deactivate */ STANDARD_MODULE_PROPERTIES_EX }; @@ -655,9 +655,9 @@ static PHP_MSHUTDOWN_FUNCTION(libxml) return SUCCESS; } - -static PHP_RSHUTDOWN_FUNCTION(libxml) +static int php_libxml_post_deactivate() { + TSRMLS_FETCH(); /* reset libxml generic error handling */ xmlSetGenericErrorFunc(NULL, NULL); xmlSetStructuredErrorFunc(NULL, NULL); -- cgit v1.2.1