summaryrefslogtreecommitdiff
path: root/ext/session/session.c
diff options
context:
space:
mode:
authorHannes Magnusson <bjori@php.net>2011-08-29 21:20:41 +0000
committerHannes Magnusson <bjori@php.net>2011-08-29 21:20:41 +0000
commit7746cf83d9cbc1d76a45685bdd4faced9fe51037 (patch)
treea8e6b6703cfdda2f7e17b36b6b127efa9634ff5d /ext/session/session.c
parent25941436839de232b651a878ee08f7cd7e3174ab (diff)
downloadphp-git-7746cf83d9cbc1d76a45685bdd4faced9fe51037.tar.gz
fixed bug #55267 - session_regenerate_id fails after header sent even if session.use_cookies = 0
Diffstat (limited to 'ext/session/session.c')
-rw-r--r--ext/session/session.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/session/session.c b/ext/session/session.c
index bc3b3487a0..89a3aca415 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -1670,7 +1670,7 @@ static PHP_FUNCTION(session_regenerate_id)
return;
}
- if (SG(headers_sent)) {
+ if (SG(headers_sent) && PS(use_cookies)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot regenerate session id - headers already sent");
RETURN_FALSE;
}