cvs: php4 /main main.c

zeev Tue Sep 5 13:50:41 2000 EDT Modified files: /php4/main main.c Log: broken logic fixed. I'm getting old Index: php4/main/main.c diff -u php4/main/main.c:1.312 php4/main/main.c:1.313 --- php4/main/main.c:1.312 Tue Sep 5 12:06:29 2000 +++ php4/main/main.c Tue Sep 5 13:50:41 2000 @@ -19,7 +19,7 @@ */ -/* $Id: main.c,v 1.312 2000/09/05 19:06:29 zeev Exp $ */ +/* $Id: main.c,v 1.313 2000/09/05 20:50:41 zeev Exp $ */ #include <stdio.h> @@ -1029,13 +1029,15 @@ } for (i=0; i<6; i++) { - if (!PG(http_globals)[i] && !initialized_dummy_track_vars_array) { - ALLOC_ZVAL(dummy_track_vars_array); - array_init(dummy_track_vars_array); - INIT_PZVAL(dummy_track_vars_array); - initialized_dummy_track_vars_array = 1; - } else { - dummy_track_vars_array->refcount++; + if (!PG(http_globals)[i]) { + if (!initialized_dummy_track_vars_array) { + ALLOC_ZVAL(dummy_track_vars_array); + array_init(dummy_track_vars_array); + INIT_PZVAL(dummy_track_vars_array); + initialized_dummy_track_vars_array = 1; + } else { + dummy_track_vars_array->refcount++; + } PG(http_globals)[i] = dummy_track_vars_array; } zend_hash_update(&EG(symbol_table), track_vars_names[i], track_vars_names_length[i], &PG(http_globals)[i], sizeof(zval *), NULL);