From: Antony Dovgal <tony2001@php.net>
Date: Tue, 7 Dec 2004 08:21:38 +0000 (+0000)
Subject: fix bug #30232 (session_start() sends Set-Cookie header only if the cookie is not... 
X-Git-Tag: php-4.3.10RC2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2381aecca9817d14b5747c47aa249f26fa6091c8;p=php

fix bug #30232 (session_start() sends Set-Cookie header only if the cookie is not set yet)
# looks like somebody fixed it in HEAD and forgot to MFH it..
---

diff --git a/NEWS b/NEWS
index 5af1bb8871..11c68eb944 100644
--- 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 e8c894644e..a8b97888e8 100644
--- 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. */