diff --git a/NEWS b/NEWS index 5bed8eccf7c..16d8b26b2df 100644 --- a/NEWS +++ b/NEWS @@ -31,4 +31,7 @@ PHP NEWS - GD: . Made fontFetch's path parser thread-safe. (Sara) +- Session: + . Fixed bug #67694 (Regression in session_regenerate_id()). (Tjerk) + <<< NOTE: Insert NEWS from last stable release here prior to actual release! >>> diff --git a/ext/session/session.c b/ext/session/session.c index 8811a08caf7..8632ba493cd 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); diff --git a/ext/session/tests/bug67694.phpt b/ext/session/tests/bug67694.phpt new file mode 100644 index 00000000000..08a296923fc --- /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-- + +--FILE-- +