tony2001 Tue Dec 7 09:01:57 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src NEWS
/php-src/ext/session session.c
Log:
revert it
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.765&r2=1.1247.2.766&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.765 php-src/NEWS:1.1247.2.766
--- php-src/NEWS:1.1247.2.765 Tue Dec 7 03:42:50 2004
+++ php-src/NEWS Tue Dec 7 09:01:55 2004
@@ -33,8 +33,6 @@
- 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).
http://cvs.php.net/diff.php/php-src/ext/session/session.c?r1=1.336.2.44&r2=1.336.2.45&ty=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.336.2.44
php-src/ext/session/session.c:1.336.2.45
--- php-src/ext/session/session.c:1.336.2.44 Tue Dec 7 03:21:38 2004
+++ php-src/ext/session/session.c Tue Dec 7 09:01:56 2004
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: session.c,v 1.336.2.44 2004/12/07 08:21:38 tony2001 Exp $ */
+/* $Id: session.c,v 1.336.2.45 2004/12/07 14:01:56 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -946,8 +946,9 @@
{
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. */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
