iliaa Sun Jul 29 14:43:30 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src NEWS
/php-src/ext/session session.c
Log:
Fixed bug #42135 (Second call of session_start() causes creation of SID)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.863&r2=1.2027.2.547.2.864&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.863 php-src/NEWS:1.2027.2.547.2.864
--- php-src/NEWS:1.2027.2.547.2.863 Sat Jul 28 08:35:09 2007
+++ php-src/NEWS Sun Jul 29 14:43:30 2007
@@ -70,6 +70,8 @@
- Fixed PECL bug #11216 (crash in ZipArchive::addEmptyDir when a directory
already exists). (Pierre)
+- Fixed bug #42135 (Second call of session_start() causes creation of SID).
+ (Ilia)
- Fixed Bug #42112 (deleting a node produces memory corruption). (Rob)
- Fixed Bug #42107 (sscanf broken when using %2$s format parameters). (Jani)
- Fixed bug #42090 (json_decode causes segmentation fault). (Hannes)
http://cvs.php.net/viewvc.cgi/php-src/ext/session/session.c?r1=1.417.2.8.2.38&r2=1.417.2.8.2.39&diff_format=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.417.2.8.2.38
php-src/ext/session/session.c:1.417.2.8.2.39
--- php-src/ext/session/session.c:1.417.2.8.2.38 Sun Jun 17 14:25:46 2007
+++ php-src/ext/session/session.c Sun Jul 29 14:43:30 2007
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: session.c,v 1.417.2.8.2.38 2007/06/17 14:25:46 iliaa Exp $ */
+/* $Id: session.c,v 1.417.2.8.2.39 2007/07/29 14:43:30 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1221,10 +1221,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;
@@ -1241,6 +1238,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
