diff options
| author | Johannes Schlüter <johannes@schlueters.de> | 2012-03-29 10:54:08 +0200 |
|---|---|---|
| committer | Johannes Schlüter <johannes@schlueters.de> | 2012-03-29 10:54:08 +0200 |
| commit | 21fa9634c19210050b130bed9f3ac77c5332080b (patch) | |
| tree | 2a1f602422649dc67a29932495f30014734e8f64 /ext/libxml/libxml.c | |
| parent | 67bf07f3e79de6653681d9317229c49b5e2415db (diff) | |
| parent | 167e2fd78224887144496cdec2089cd5b2f3312d (diff) | |
| download | php-git-21fa9634c19210050b130bed9f3ac77c5332080b.tar.gz | |
Merge remote branch 'security/PHP-5.3' into PHP-5.3
* security/PHP-5.3:
fix bug #61367 - open_basedir bypass using libxml RSHUTDOWN
open_basedir check for linkinfo
NEWS entry for readline fix
Add open_basedir checks to readline_write_history and readline_read_history
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); |