com php-src: Callback has to be restored in MSHUTDOWN: ext/session/session.c

From: Date: Mon, 10 Jun 2013 08:32:53 +0000
Subject: com php-src: Callback has to be restored in MSHUTDOWN: ext/session/session.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-72346@lists.php.net to get a copy of this message
Commit: 336a8e1943af85bb49cb5986d897d967ba73dcc0 Author: Dmitry Stogov <dmitry@zend.com> Mon, 10 Jun 2013 12:32:53 +0400 Parents: fdd73796866cd95ffc3af1864509c2af8d983949 Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=336a8e1943af85bb49cb5986d897d967ba73dcc0 Log: Callback has to be restored in MSHUTDOWN Changed paths: M ext/session/session.c Diff: diff --git a/ext/session/session.c b/ext/session/session.c index a3be9a7..d9989ba 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -2221,6 +2221,9 @@ static PHP_MSHUTDOWN_FUNCTION(session) /* {{{ */ PHP_MSHUTDOWN(ps_mm) (SHUTDOWN_FUNC_ARGS_PASSTHRU); #endif + /* restore the orig callback */ + php_rfc1867_callback = php_session_rfc1867_orig_callback; + ps_serializers[PREDEFINED_SERIALIZERS].name = NULL; memset(&ps_modules[PREDEFINED_MODULES], 0, (MAX_MODULES-PREDEFINED_MODULES)*sizeof(ps_module *));

« previous php.cvs (#72346) next »