diff options
| author | Tjerk Meesters <datibbaw@php.net> | 2014-08-23 09:18:02 +0800 |
|---|---|---|
| committer | Tjerk Meesters <datibbaw@php.net> | 2014-08-23 09:18:02 +0800 |
| commit | ce9bdae33f101ff85c08d32ce5c2c6502a451d62 (patch) | |
| tree | 7329046107274b0e47509ba386577c8bdb178b81 | |
| parent | 3b82c4e52063e74abaca637811629b521754de3d (diff) | |
| download | php-git-ce9bdae33f101ff85c08d32ce5c2c6502a451d62.tar.gz | |
Fixed #67694: Regression in session_regenerate_id()
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | ext/session/session.c | 2 | ||||
| -rw-r--r-- | ext/session/tests/bug67694.phpt | 41 |
3 files changed, 45 insertions, 1 deletions
@@ -16,6 +16,9 @@ PHP NEWS - Zlib: . Fixed bug #67865 (internal corruption phar error). Mike +- Session: + . Fixed bug #67694 (Regression in session_regenerate_id()). (Tjerk) + 14 Aug 2014, PHP 5.6.0 Release Candidate 4 - COM: diff --git a/ext/session/session.c b/ext/session/session.c index d1a7a073a5..d440e6fdd9 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -1994,7 +1994,7 @@ static PHP_FUNCTION(session_regenerate_id) RETURN_FALSE; } efree(PS(id)); - PS(id) = NULL; + memset(PS(session_data_hash),'\0', 16); } PS(id) = PS(mod)->s_create_sid(&PS(mod_data), NULL TSRMLS_CC); diff --git a/ext/session/tests/bug67694.phpt b/ext/session/tests/bug67694.phpt new file mode 100644 index 0000000000..08a296923f --- /dev/null +++ b/ext/session/tests/bug67694.phpt @@ -0,0 +1,41 @@ +--TEST-- +Bug #67694 Regression in session_regenerate_id() +--INI-- +session.save_handler = files +session.name=PHPSESSID +session.auto_start = 0 +session.use_cookies = 0 +session.cache_limiter = +date.timezone = UTC +--SKIPIF-- +<?php include('skipif.inc'); ?> +--FILE-- +<?php + +$data = date('r'); + +session_start(); +$id = session_id(); +$_SESSION['init'] = $data; + +session_write_close(); + +session_id($id); +session_start(); + +session_regenerate_id(false); + +$newid = session_id(); +var_dump($newid != $id); + +session_write_close(); + +unset($_SESSION); + +session_id($newid); +session_start(); + +var_dump(isset($_SESSION['init']) && $data == $_SESSION['init']); +--EXPECT-- +bool(true) +bool(true) |