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
commite481f05470605dc35007898a3ed27e3824013dfa (patch)
tree761033c662e8fa9ac789036b2f110146671f197b /ext/session/session.c
parentf117d56170166c26f038812ac2419f3eb9693874 (diff)
downloadphp-git-e481f05470605dc35007898a3ed27e3824013dfa.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 eb679cd3cb..4b87104129 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -1742,7 +1742,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;
}