diff options
| author | Stanislav Malyshev <stas@php.net> | 2012-03-25 12:51:46 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2012-03-25 12:51:46 -0700 |
| commit | 2a74cb40080c9e16f7ae952fc46f64b219aaf77e (patch) | |
| tree | 8545aedc195249d18fe45dc830b740f7f47b6b31 /ext/libxml/libxml.c | |
| parent | b08b7fe78785230dd37e7969e38f1913727fbc88 (diff) | |
| parent | 167e2fd78224887144496cdec2089cd5b2f3312d (diff) | |
| download | php-git-2a74cb40080c9e16f7ae952fc46f64b219aaf77e.tar.gz | |
Merge branch 'sec53' into sec54
* sec53:
fix bug #61367 - open_basedir bypass using libxml RSHUTDOWN
Diffstat (limited to 'ext/libxml/libxml.c')
| -rw-r--r-- | ext/libxml/libxml.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/libxml/libxml.c b/ext/libxml/libxml.c index 93d410bc76..9d6c25737d 100644 --- a/ext/libxml/libxml.c +++ b/ext/libxml/libxml.c @@ -86,8 +86,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(); /* }}} */ @@ -137,13 +137,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 }; @@ -861,9 +861,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 */ if (_php_libxml_per_request_initialization) { xmlSetGenericErrorFunc(NULL, NULL); |