fixed bug #55267 - session_regenerate_id fails after header sent even if session...

diff --git a/NEWS b/NEWS
index 8e5ae39e5a142f50531026974a58cb1ab2c5a271..c8891aa58d1d873eff3bba59f5a0dec345f2a315 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,9 @@ PHP                                                                        NEWS
   . Fixed bug#52013 (Unable to decompress files in a compressed phar). (Hannes)
   . Fixed bug#53872 (internal corruption of phar). (Hannes)
 
+- Session:
+  . Fixed bug #55267 (session_regenerate_id fails after header sent). (Hannes)
+
 - NSAPI SAPI:
   . Don't set $_SERVER['HTTPS'] on unsecure connection (bug #55403). (Uwe
     Schindler)

diff --git a/ext/session/session.c b/ext/session/session.c
index eb679cd3cb3874c75b3c8aaa458080d2f2a03675..4b87104129a7268482b22a6d2b72b440bfe9b429 100644 (file)
--- 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;
        }