sniper Tue Feb 24 03:47:37 2004 EDT
Modified files:
/php-src/ext/session session.c
Log:
Fix bug #26005 (Random "cannot change the session ini settings" errors)
http://cvs.php.net/diff.php/php-src/ext/session/session.c?r1=1.384&r2=1.385&ty=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.384 php-src/ext/session/session.c:1.385
--- php-src/ext/session/session.c:1.384 Wed Feb 18 20:54:21 2004
+++ php-src/ext/session/session.c Tue Feb 24 03:47:35 2004
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: session.c,v 1.384 2004/02/19 01:54:21 sniper Exp $ */
+/* $Id: session.c,v 1.385 2004/02/24 08:47:35 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1726,14 +1726,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, NULL TSRMLS_CC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
