cvs: php4 /ext/session session.c
| From: | Sascha Schumann | Date: | Wed, 06 Mar 2002 11:41:18 +0000 |
| Subject: | cvs: php4 /ext/session session.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-9725@lists.php.net to get a copy of this message | ||
sas Wed Mar 6 06:41:18 2002 EDT
Modified files:
/php4/ext/session session.c
Log:
Always initialize the track-vars
Index: php4/ext/session/session.c
diff -u php4/ext/session/session.c:1.288 php4/ext/session/session.c:1.289
--- php4/ext/session/session.c:1.288 Wed Mar 6 04:02:31 2002
+++ php4/ext/session/session.c Wed Mar 6 06:41:17 2002
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: session.c,v 1.288 2002/03/06 09:02:31 sas Exp $ */
+/* $Id: session.c,v 1.289 2002/03/06 11:41:17 sas Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -487,7 +487,6 @@
static void php_session_decode(const char *val, int vallen TSRMLS_DC)
{
- php_session_track_init(TSRMLS_C);
if (PS(serializer)->decode(val, vallen TSRMLS_CC) == FAILURE) {
php_session_destroy(TSRMLS_C);
php_error(E_WARNING, "Failed to decode session object. Session has been destroyed.");
@@ -554,6 +553,7 @@
php_error(E_ERROR, "Failed to initialize session module");
return;
}
+ php_session_track_init(TSRMLS_C);
if (PS(mod)->read(&PS(mod_data), PS(id), &val, &vallen) == SUCCESS) {
php_session_decode(val, vallen TSRMLS_CC);
efree(val);