diff options
| author | Stanislav Malyshev <stas@php.net> | 2012-03-25 12:50:25 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2012-03-25 12:50:25 -0700 |
| commit | 167e2fd78224887144496cdec2089cd5b2f3312d (patch) | |
| tree | 3331b93b3112c2c533795dae68c346d4d85dbf43 /ext/libxml/libxml.c | |
| parent | 900778731c49611e1318e4d1839768eb46f26813 (diff) | |
| download | php-git-167e2fd78224887144496cdec2089cd5b2f3312d.tar.gz | |
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 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); |