cvs: php-src(PHP_4_3) /ext/session session.c

sas Wed Jun 23 12:29:17 2004 EDT Modified files: (Branch: PHP_4_3) /php-src/ext/session session.c Log: - 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/diff.php/php-src/ext/session/session.c?r1=1.336.2.39&r2=1.336.2.40&ty=u Index: php-src/ext/session/session.c diff -u php-src/ext/session/session.c:1.336.2.39 php-src/ext/session/session.c:1.336.2.40 --- php-src/ext/session/session.c:1.336.2.39 Sat May 8 02:01:11 2004 +++ php-src/ext/session/session.c Wed Jun 23 12:29:16 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: session.c,v 1.336.2.39 2004/05/08 06:01:11 pollita Exp $ */ +/* $Id: session.c,v 1.336.2.40 2004/06/23 16:29:16 sas Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -930,8 +930,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. */ @@ -1283,6 +1284,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;