jani Sun Aug 5 13:10:32 2007 UTC
Modified files:
/php-src/ext/session session.c
Log:
MFB (since Ilia is too lazy..): Fix bug #42135
http://cvs.php.net/viewvc.cgi/php-src/ext/session/session.c?r1=1.475&r2=1.476&diff_format=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.475 php-src/ext/session/session.c:1.476
--- php-src/ext/session/session.c:1.475 Fri Aug 3 01:40:05 2007
+++ php-src/ext/session/session.c Sun Aug 5 13:10:32 2007
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: session.c,v 1.475 2007/08/03 01:40:05 stas Exp $ */
+/* $Id: session.c,v 1.476 2007/08/05 13:10:32 jani Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1212,10 +1212,7 @@
PS(apply_trans_sid) = PS(use_trans_sid);
- PS(define_sid) = 1;
- PS(send_cookie) = 1;
if (PS(session_status) != php_session_none) {
-
if (PS(session_status) == php_session_disabled) {
char *value;
@@ -1231,6 +1228,9 @@
php_error(E_NOTICE, "A session had already been started -
ignoring session_start()");
return;
+ } else {
+ PS(define_sid) = 1;
+ PS(send_cookie) = 1;
}
lensess = strlen(PS(session_name));
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
