diff options
| author | Christopher Jones <sixd@php.net> | 2012-03-29 17:42:40 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2012-03-29 17:42:40 -0700 |
| commit | 06235747b17b3f5709604c8d6f12770905a28fcc (patch) | |
| tree | f731d2b64cec00416e4828ac0b29536ad9bd661f /ext/libxml/libxml.c | |
| parent | 4b72d505ae54fe3f2a7106c755f985ad9ee7baa5 (diff) | |
| parent | c02aa086c6d075e765d75476b05fa3df3da68c13 (diff) | |
| download | php-git-06235747b17b3f5709604c8d6f12770905a28fcc.tar.gz | |
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
* 'PHP-5.4' of https://git.php.net/repository/php-src:
Fixed bug61115-1.phpt for debug build version.
Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less)
Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less)
This will be PHP 5.3.12
ext/pcntl/pcntl.c: Fix typo in comment
Revert "ext/pcntl/pcntl.c: Fix typo in comment" (apply correct workflow)
Revert "ext/pcntl/pcntl.c: Fix typo in comment" (apply correct workflow)
ext/pcntl/pcntl.c: Fix typo in comment
ext/pcntl/pcntl.c: Fix typo in comment
- fix bug #61541, Segfault when using ob_* in output_callback
- fix bug #61541, Segfault when using ob_* in output_callback
update NEWS
fix bug #61367 - open_basedir bypass using libxml RSHUTDOWN
open_basedir check for linkinfo
NEWS entry for readline fix
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 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); |