cvs: php-src /ext/session session.c

rasmus Fri Feb 10 07:42:00 2006 UTC Modified files: /php-src/ext/session session.c Log: (Missing patch from the PHP 4 tree that got lost in the shuffle) See: http://cvs.php.net/viewcvs.cgi/php-src/ext/session/session.c?r1=1.336.2.39&r2=1.336.2.40 - fix logic. if the client already sent us the cookie, we don't need to send it again. if the id has been changed, we need to update the client side. http://cvs.php.net/viewcvs.cgi/php-src/ext/session/session.c?r1=1.427&r2=1.428&diff_format=u Index: php-src/ext/session/session.c diff -u php-src/ext/session/session.c:1.427 php-src/ext/session/session.c:1.428 --- php-src/ext/session/session.c:1.427 Sat Jan 28 06:16:45 2006 +++ php-src/ext/session/session.c Fri Feb 10 07:41:59 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: session.c,v 1.427 2006/01/28 06:16:45 fmk Exp $ */ +/* $Id: session.c,v 1.428 2006/02/10 07:41:59 rasmus Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1090,8 +1090,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. */ @@ -1487,6 +1488,7 @@ PS(id) = PS(mod)->s_create_sid(&PS(mod_data), NULL TSRMLS_CC); + PS(send_cookie) = 1; php_session_reset_id(TSRMLS_C); RETURN_TRUE;