stas Tue Oct 7 04:46:17 2003 EDT Modified files: /php-src/main php_variables.c Log: Fix $_SERVER['argv'] and $_SERVER['argc'] Index: php-src/main/php_variables.c diff -u php-src/main/php_variables.c:1.69 php-src/main/php_variables.c:1.70 --- php-src/main/php_variables.c:1.69 Wed Oct 1 19:11:59 2003 +++ php-src/main/php_variables.c Tue Oct 7 04:46:16 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_variables.c,v 1.69 2003/10/01 23:11:59 andrei Exp $ */ +/* $Id: php_variables.c,v 1.70 2003/10/07 08:46:16 stas Exp $ */ #include <stdio.h> #include "php.h" @@ -438,7 +438,8 @@ argc->refcount++; zend_hash_update(&EG(symbol_table), "argv", sizeof("argv"), &arr, sizeof(zval *), NULL); zend_hash_add(&EG(symbol_table), "argc", sizeof("argc"), &argc, sizeof(zval *), NULL); - } else if (!SG(request_info).argc) { + } + if (track_vars_array) { arr->refcount++; argc->refcount++; zend_hash_update(Z_ARRVAL_P(track_vars_array), "argv", sizeof("argv"), &arr, sizeof(pval *), NULL);
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php