revert it

diff --git a/NEWS b/NEWS
index 3383f536a3311aea7ab57c0cd992639cd24f73f4..2d1944ed5d49bada64853a4b50a0da18401c79c0 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -33,8 +33,6 @@ PHP 4                                                                      NEWS
 - Fixed bug #30281 (Prevent non-wbmp images from being detected as such).
   (Ilia)
 - Fixed bug #30276 (Possible crash in ctype_digit on large numbers). (Ilia)
-- Fixed bug #30232 (session_start() sends Set-Cookie header only if the 
-  cookie isn't set). (Tony)
 - Fixed bug #30229 (imagerectangle and imagefilledrectangle do work well
   with alpha channel, corners are drawn twice). (Pierre)
 - Fixed bug #30224 (Sybase date strings are sometimes not null terminated).

diff --git a/ext/session/session.c b/ext/session/session.c
index a8b97888e891ef1fba77478d873557ace3053f3a..e8c894644eb192fec5780212555fcc7a1fb3064a 100644 (file)
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -946,8 +946,9 @@ static void php_session_reset_id(TSRMLS_D)
 {
        int module_number = PS(module_number);
        
-       if (PS(use_cookies)) {
+       if (PS(use_cookies) && PS(send_cookie)) {
                php_session_send_cookie(TSRMLS_C);
+               PS(send_cookie) = 0;
        }
 
        /* if the SID constant exists, destroy it. */