cvs: /php4/ext/session session.c
| From: | Sascha Schumann | Date: | Sat, 04 Dec 1999 18:40:07 +0000 |
| Subject: | cvs: /php4/ext/session session.c | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-7408@lists.php.net to get a copy of this message | ||
sas Sat Dec 4 13:40:07 1999 EDT
Modified files:
/php4/ext/session session.c
Log:
ZTS fixes
Index: php4/ext/session/session.c
diff -u php4/ext/session/session.c:1.71 php4/ext/session/session.c:1.72
--- php4/ext/session/session.c:1.71 Sat Dec 4 12:05:45 1999
+++ php4/ext/session/session.c Sat Dec 4 13:40:06 1999
@@ -142,9 +142,8 @@
#define ENCODE_VARS \
char *key; \
ulong num_key; \
- zval **struc \
- PSLS_FETCH(); \
- ELS_FETCH();
+ zval **struc; \
+ ELS_FETCH()
#define ENCODE_LOOP(code) \
for(zend_hash_internal_pointer_reset(&PS(vars)); \
@@ -189,7 +188,7 @@
{
zval *buf;
char strbuf[MAX_STR + 1];
- ENCODE_VARS
+ ENCODE_VARS;
buf = ecalloc(sizeof(*buf), 1);
buf->type = IS_STRING;
@@ -252,7 +251,7 @@
PS_SERIALIZER_ENCODE_FUNC(wddx)
{
wddx_packet *packet;
- ENCODE_VARS
+ ENCODE_VARS;
packet = _php_wddx_constructor();
if(!packet) return FAILURE;
@@ -343,6 +342,8 @@
static void _php_session_decode(const char *val, int vallen PSLS_DC)
{
+ PLS_FETCH();
+
if (PG(track_vars))
php_session_track_init();
PS(serializer)->decode(val, vallen PSLS_CC);