main: Ignore register_argc_argv when SG(request_info).argc is available

Author: TimWolla

ext/standard/tests/general_functions/bug43293_1.phpt

@@ -21,4 +21,5 @@ array(3) {
   [2]=>
   int(3)
 }
-bool(false)
+array(0) {
+}

main/php_variables.c

@@ -786,7 +786,7 @@ PHPAPI zend_result php_hash_environment(void)
 {
 	memset(PG(http_globals), 0, sizeof(PG(http_globals)));
 	zend_activate_auto_globals();
-	if (PG(register_argc_argv)) {
+	if (PG(register_argc_argv) || SG(request_info).argc) {
 		php_build_argv(SG(request_info).query_string, &PG(http_globals)[TRACK_VARS_SERVER]);
 	}
 	return SUCCESS;
@@ -875,19 +875,17 @@ static bool php_auto_globals_create_server(zend_string *name)
 	if (PG(variables_order) && (strchr(PG(variables_order),'S') || strchr(PG(variables_order),'s'))) {
 		php_register_server_variables();
 
-		if (PG(register_argc_argv)) {
-			if (SG(request_info).argc) {
-				zval *argc, *argv;
+		if (SG(request_info).argc) {
+			zval *argc, *argv;
 
-				if ((argc = zend_hash_find_ex_ind(&EG(symbol_table), ZSTR_KNOWN(ZEND_STR_ARGC), 1)) != NULL &&
-					(argv = zend_hash_find_ex_ind(&EG(symbol_table), ZSTR_KNOWN(ZEND_STR_ARGV), 1)) != NULL) {
-					Z_ADDREF_P(argv);
-					zend_hash_update(Z_ARRVAL(PG(http_globals)[TRACK_VARS_SERVER]), ZSTR_KNOWN(ZEND_STR_ARGV), argv);
-					zend_hash_update(Z_ARRVAL(PG(http_globals)[TRACK_VARS_SERVER]), ZSTR_KNOWN(ZEND_STR_ARGC), argc);
-				}
-			} else {
-				php_build_argv(SG(request_info).query_string, &PG(http_globals)[TRACK_VARS_SERVER]);
+			if ((argc = zend_hash_find_ex_ind(&EG(symbol_table), ZSTR_KNOWN(ZEND_STR_ARGC), 1)) != NULL &&
+				(argv = zend_hash_find_ex_ind(&EG(symbol_table), ZSTR_KNOWN(ZEND_STR_ARGV), 1)) != NULL) {
+				Z_ADDREF_P(argv);
+				zend_hash_update(Z_ARRVAL(PG(http_globals)[TRACK_VARS_SERVER]), ZSTR_KNOWN(ZEND_STR_ARGV), argv);
+				zend_hash_update(Z_ARRVAL(PG(http_globals)[TRACK_VARS_SERVER]), ZSTR_KNOWN(ZEND_STR_ARGC), argc);
 			}
+		} else if (PG(register_argc_argv)) {
+			php_build_argv(SG(request_info).query_string, &PG(http_globals)[TRACK_VARS_SERVER]);
 		}
 
 	} else {

tests/basic/012_register_argc_argv_disabled.phpt

@@ -0,0 +1,49 @@
+--TEST--
+Testing $argc and $argv handling (cli, register_argc_argv=0)
+--INI--
+register_argc_argv=0
+variables_order=GPS
+--ARGS--
+ab cd ef 123 test
+--FILE--
+<?php
+
+var_dump(
+    $argc,
+    $argv,
+    $_SERVER['argc'],
+    $_SERVER['argv'],
+);
+
+?>
+--EXPECTF--
+int(6)
+array(6) {
+  [0]=>
+  string(%d) "%s"
+  [1]=>
+  string(2) "ab"
+  [2]=>
+  string(2) "cd"
+  [3]=>
+  string(2) "ef"
+  [4]=>
+  string(3) "123"
+  [5]=>
+  string(4) "test"
+}
+int(6)
+array(6) {
+  [0]=>
+  string(%d) "%s"
+  [1]=>
+  string(2) "ab"
+  [2]=>
+  string(2) "cd"
+  [3]=>
+  string(2) "ef"
+  [4]=>
+  string(3) "123"
+  [5]=>
+  string(4) "test"
+}