cvs: php-src(PHP_5_2) / NEWS /main php_variables.c

From: Date: Sat, 20 Jan 2007 22:16:25 +0000
Subject: cvs: php-src(PHP_5_2) / NEWS /main php_variables.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-42838@lists.php.net to get a copy of this message
iliaa Sat Jan 20 22:16:25 2007 UTC Modified files: (Branch: PHP_5_2) /php-src NEWS /php-src/main php_variables.c Log: Fixed bug #39450 (getenv() fills other super-globals). http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.504&r2=1.2027.2.547.2.505&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.504 php-src/NEWS:1.2027.2.547.2.505 --- php-src/NEWS:1.2027.2.547.2.504 Fri Jan 19 15:38:50 2007 +++ php-src/NEWS Sat Jan 20 22:16:24 2007 @@ -3,6 +3,7 @@ ?? Jan 2007, PHP 5.2.1RC4 - Fixed bug #40169 (CURLOPT_TCP_NODELAY only available in curl >= 7.11.2). (Tony) +- Fixed bug #39450 (getenv() fills other super-globals). (Ilia, Tony) 18 Jan 2007, PHP 5.2.1RC3 - Added read-timeout context option "timeout" for HTTP streams. (Hannes, http://cvs.php.net/viewvc.cgi/php-src/main/php_variables.c?r1=1.104.2.10.2.3&r2=1.104.2.10.2.4&diff_format=u Index: php-src/main/php_variables.c diff -u php-src/main/php_variables.c:1.104.2.10.2.3 php-src/main/php_variables.c:1.104.2.10.2.4 --- php-src/main/php_variables.c:1.104.2.10.2.3 Mon Jan 1 09:36:11 2007 +++ php-src/main/php_variables.c Sat Jan 20 22:16:24 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_variables.c,v 1.104.2.10.2.3 2007/01/01 09:36:11 sebastian Exp $ */ +/* $Id: php_variables.c,v 1.104.2.10.2.4 2007/01/20 22:16:24 iliaa Exp $ */ #include <stdio.h> #include "php.h" @@ -621,8 +621,6 @@ { char *p; unsigned char _gpc_flags[5] = {0, 0, 0, 0, 0}; - zval *dummy_track_vars_array = NULL; - zend_bool initialized_dummy_track_vars_array=0; zend_bool jit_initialization = (PG(auto_globals_jit) && !PG(register_globals) && !PG(register_long_arrays)); struct auto_global_record { char *name; @@ -713,15 +711,9 @@ continue; } 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; + ALLOC_ZVAL(PG(http_globals)[i]); + array_init(PG(http_globals)[i]); + INIT_PZVAL(PG(http_globals)[i]); } PG(http_globals)[i]->refcount++;

« previous php.cvs (#42838) next »