Ignore register_globals for $argc and $argv under CLI SAPI.

diff --git a/main/main.c b/main/main.c
index 296b2d687ea18317c29b29f18463edde79981357..e6844cc9416bed45c62b69a65fd7da3472e483fe 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -1251,7 +1251,7 @@ static void php_build_argv(char *s, zval *track_vars_array TSRMLS_DC)
        Z_TYPE_P(argc) = IS_LONG;
        INIT_PZVAL(argc);
 
-       if (PG(register_globals)) {
+       if (PG(register_globals) || SG(request_info).argc) {
                arr->refcount++;
                argc->refcount++;
                zend_hash_update(&EG(symbol_table), "argv", sizeof("argv"), &arr, sizeof(zval *), NULL);