From 61442c339f96b67312adbeb18cd025b08e4db150 Mon Sep 17 00:00:00 2001 From: Antony Dovgal Date: Tue, 7 Dec 2004 14:01:56 +0000 Subject: [PATCH] revert it --- NEWS | 2 -- ext/session/session.c | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index 3383f536a3..2d1944ed5d 100644 --- 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 a8b97888e8..e8c894644e 100644 --- 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. */ -- 2.50.1