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)) {
-- PHP Internals - PHP Runtime Development Mailing List To unsubscribe, visit: http://www.php.net/unsub.php
