diff options
| author | Arpad Ray <arraypad@gmail.com> | 2013-07-17 11:05:23 +0100 |
|---|---|---|
| committer | Arpad Ray <arraypad@gmail.com> | 2013-07-17 11:05:23 +0100 |
| commit | 0d3d739bf784d215dc3b8c45ab2a4fafd2a590b3 (patch) | |
| tree | e62c8f72509213d8c5dcea87e10ce49bd02be533 | |
| parent | c855f447378958149ecc6dcb42abc67197dd3b24 (diff) | |
| parent | ba3234888dfbe14dadac7ac6c403a58bc1fdd220 (diff) | |
| download | php-git-0d3d739bf784d215dc3b8c45ab2a4fafd2a590b3.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #62129 - rfc1867 crashes php even though turned off
| -rw-r--r-- | ext/session/session.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ext/session/session.c b/ext/session/session.c index 341b8fb549..e992f31d2f 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -2294,8 +2294,11 @@ 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; + /* reset rfc1867 callbacks */ + php_session_rfc1867_orig_callback = NULL; + if (php_rfc1867_callback == php_session_rfc1867_callback) { + php_rfc1867_callback = NULL; + } ps_serializers[PREDEFINED_SERIALIZERS].name = NULL; memset(&ps_modules[PREDEFINED_MODULES], 0, (MAX_MODULES-PREDEFINED_MODULES)*sizeof(ps_module *)); |