fix bug #30232 (session_start() sends Set-Cookie header only if the cookie is not...

# looks like somebody fixed it in HEAD and forgot to MFH it..

diff --git a/NEWS b/NEWS
index 5af1bb8871a0abdf5f804bd4f25ac6e680645ea5..11c68eb94497dc38ffda558da85bfd6f77d75ed8 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -33,6 +33,8 @@ 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 e8c894644eb192fec5780212555fcc7a1fb3064a..a8b97888e891ef1fba77478d873557ace3053f3a 100644 (file)
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -946,9 +946,8 @@ static void php_session_reset_id(TSRMLS_D)
 {
        int module_number = PS(module_number);
        
-       if (PS(use_cookies) && PS(send_cookie)) {
+       if (PS(use_cookies)) {
                php_session_send_cookie(TSRMLS_C);
-               PS(send_cookie) = 0;
        }
 
        /* if the SID constant exists, destroy it. */