main: Deprecate deriving $_SERVER['argc'] and $_SERVER['argv'] from the query string

Author: TimWolla

main/php_variables.c

@@ -676,6 +676,7 @@ PHPAPI void php_build_argv(const char *s, zval *track_vars_array)
 			}
 		}
 	} else 	if (s && *s) {
+		zend_error(E_DEPRECATED, "Deriving $_SERVER['argc'] and $_SERVER['argv'] from $_SERVER['QUERY_STRING'] is deprecated, configure register_argc_argv=0 to suppress this message and access the query parameters via $_SERVER['QUERY_STRING'] or $_GET");
 		while (1) {
 			const char *space = strchr(s, '+');
 			/* auto-type */
@@ -785,10 +786,15 @@ static void php_autoglobal_merge(HashTable *dest, HashTable *src)
 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)) {
-		php_build_argv(SG(request_info).query_string, &PG(http_globals)[TRACK_VARS_SERVER]);
+		/* Register $argc and $argv for CLI SAPIs. $_SERVER['argc'] and $_SERVER['argv']
+		 * will be registered in php_auto_globals_create_server() which clears
+		 * PG(http_globals)[TRACK_VARS_SERVER] anyways, making registration at this point
+		 * useless.
+		 */
+		php_build_argv(NULL, NULL);
 	}
+	zend_activate_auto_globals();
 	return SUCCESS;
 }
 /* }}} */