sniper Tue Feb 24 03:49:42 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src NEWS
/php-src/ext/session session.c
Log:
MFH: - Fixed bug #26005 (Random "cannot change the session ini settings" errors).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.575&r2=1.1247.2.576&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.575 php-src/NEWS:1.1247.2.576
--- php-src/NEWS:1.1247.2.575 Mon Feb 23 14:50:46 2004
+++ php-src/NEWS Tue Feb 24 03:49:38 2004
@@ -11,6 +11,8 @@
reference). (Ilia)
- Fixed bug #26753 (zend_fetch_list_dtor_id() doesn't check NULL strings).
(Jani, Markus dot Lidel at shadowconnect dot com)
+- Fixed bug #26005 (Random "cannot change the session ini settings" errors).
+ (Jani, jsnajdr at kerio dot com)
16 Feb 2004, Version 4.3.5RC3
- Fixed zero bytes memory allocation when no extra ini files are found in the
http://cvs.php.net/diff.php/php-src/ext/session/session.c?r1=1.336.2.33&r2=1.336.2.34&ty=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.336.2.33
php-src/ext/session/session.c:1.336.2.34
--- php-src/ext/session/session.c:1.336.2.33 Wed Feb 18 21:13:39 2004
+++ php-src/ext/session/session.c Tue Feb 24 03:49:41 2004
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: session.c,v 1.336.2.33 2004/02/19 02:13:39 sniper Exp $ */
+/* $Id: session.c,v 1.336.2.34 2004/02/24 08:49:41 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1612,14 +1612,26 @@
}
/* }}} */
+static void php_minit_session_globals(php_ps_globals *ps_globals)
+{
+ ps_globals->save_path = NULL;
+ ps_globals->session_name = NULL;
+ ps_globals->id = NULL;
+ ps_globals->mod = NULL;
+ ps_globals->mod_data = NULL;
+ ps_globals->session_status = php_session_none;
+ ps_globals->http_session_vars = NULL;
+}
PHP_MINIT_FUNCTION(session)
{
#ifdef ZTS
php_ps_globals *ps_globals;
- ts_allocate_id(&ps_globals_id, sizeof(php_ps_globals), NULL, NULL);
+ ts_allocate_id(&ps_globals_id, sizeof(php_ps_globals), (ts_allocate_ctor)
php_minit_session_globals, NULL);
ps_globals = ts_resource(ps_globals_id);
+#else
+ php_minit_session_globals(&ps_globals);
#endif
zend_register_auto_global("_SESSION", sizeof("_SESSION")-1 TSRMLS_CC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
