diff options
| author | Tjerk Meesters <datibbaw@php.net> | 2014-08-23 09:21:36 +0800 |
|---|---|---|
| committer | Tjerk Meesters <datibbaw@php.net> | 2014-08-23 09:21:36 +0800 |
| commit | 86674b5837bffe4486714f9661620020ee498f3b (patch) | |
| tree | 6d3e613976e7f3eb0dad94fcced9b6e626df7c29 /ext/session/session.c | |
| parent | d1d0f55e225287f3314e3eaac9c550d16e679b7e (diff) | |
| parent | ce9bdae33f101ff85c08d32ce5c2c6502a451d62 (diff) | |
| download | php-git-86674b5837bffe4486714f9661620020ee498f3b.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed #67694: Regression in session_regenerate_id()
Conflicts:
ext/session/session.c
Diffstat (limited to 'ext/session/session.c')
| -rw-r--r-- | ext/session/session.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/session/session.c b/ext/session/session.c index 8811a08caf..8632ba493c 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -1979,7 +1979,7 @@ static PHP_FUNCTION(session_regenerate_id) RETURN_FALSE; } STR_RELEASE(PS(id)); - PS(id) = NULL; + memset(PS(session_data_hash),'\0', 16); } PS(id) = PS(mod)->s_create_sid(&PS(mod_data) TSRMLS_CC); |