Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:11434 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 95005 invoked by uid 1010); 21 Jul 2004 15:58:01 -0000 Delivered-To: ezmlm-scan-internals@lists.php.net Delivered-To: ezmlm-internals@lists.php.net Received: (qmail 94887 invoked from network); 21 Jul 2004 15:57:59 -0000 Received: from unknown (HELO mgkyb2.nw.wakwak.com) (211.9.231.193) by pb1.pair.com with SMTP; 21 Jul 2004 15:57:59 -0000 Received: from vckyb4.nw.wakwak.com (postfix@vckyb4.nw.wakwak.com [211.9.231.145]) by mgkyb2.nw.wakwak.com (8.12.11/8.12.11/2004-03-24) with SMTP id i6LFvwA8005190; Thu, 22 Jul 2004 00:57:58 +0900 (JST) (envelope-from moriyoshi@at.wakwak.com) Received: from at.wakwak.com (at.wakwak.com [211.9.230.135]) by vckyb4.nw.wakwak.com (Postfix) with ESMTP id AEDC33FE02; Thu, 22 Jul 2004 00:57:58 +0900 (JST) Received: from [192.168.0.219] (newcycle.as.wakwak.ne.jp [218.225.209.145]) (pbs=gmp5u7) by at.wakwak.com (8.12.11/8.12.11/2004-06-29) with ESMTP/inet id i6LFvw7f045036; Thu, 22 Jul 2004 00:57:58 +0900 (JST) (envelope-from moriyoshi@at.wakwak.com) In-Reply-To: <40FE90DC.80108@php.net> References: <40FE90DC.80108@php.net> Mime-Version: 1.0 (Apple Message framework v618) Content-Type: text/plain; charset=US-ASCII; delsp=yes; format=flowed Message-ID: Content-Transfer-Encoding: 7bit Cc: internals@lists.php.net Date: Thu, 22 Jul 2004 00:57:40 +0900 To: Stefan Esser X-Mailer: Apple Mail (2.618) Subject: Re: [PHP-DEV] 4.3.8 patches not yet applied to PHP_4_3 ? From: moriyoshi@at.wakwak.com (Moriyoshi Koizumi) On 2004/07/22, at 0:50, Stefan Esser wrote: > What patches are you speaking about? Those which are likely intended for CAN-2004-0594. For instance, hallmark:~/Documents/Sources/php-src-4 moriyoshi$ cvs diff -r 1.512.2.53.2.1 main/main.c Index: main/main.c =================================================================== RCS file: /repository/php-src/main/main.c,v retrieving revision 1.512.2.53.2.1 retrieving revision 1.512.2.53 diff -u -r1.512.2.53.2.1 -r1.512.2.53 --- main/main.c 13 Jul 2004 13:15:31 -0000 1.512.2.53.2.1 +++ main/main.c 9 Feb 2004 04:05:56 -0000 1.512.2.53 @@ -18,7 +18,7 @@ +---------------------------------------------------------------------- + */ -/* $Id: main.c,v 1.512.2.53.2.1 2004/07/13 13:15:31 iliaa Exp $ */ +/* $Id: main.c,v 1.512.2.53 2004/02/09 04:05:56 iliaa Exp $ */ /* {{{ includes */ @@ -1369,7 +1369,6 @@ int _gpc_flags[5] = {0, 0, 0, 0, 0}; zend_bool have_variables_order; zval *dummy_track_vars_array = NULL; - zval *env_vars = NULL; zend_bool initialized_dummy_track_vars_array=0; int i; char *variables_order; @@ -1402,10 +1401,9 @@ } else { variables_order = PG(gpc_order); have_variables_order=0; - ALLOC_ZVAL(env_vars); - array_init(env_vars); - INIT_PZVAL(env_vars); - PG(http_globals)[TRACK_VARS_ENV] = env_vars; + ALLOC_ZVAL(PG(http_globals)[TRACK_VARS_ENV]); + array_init(PG(http_globals)[TRACK_VARS_ENV]); + INIT_PZVAL(PG(http_globals)[TRACK_VARS_ENV]); php_import_environment_variables(PG(http_globals)[TRACK_VARS_ENV] TSRMLS_CC); if (PG(register_globals)) {