getopt() doesn't work if variables_order does not include "S" because it

only looks in $_SERVER for argv.  So, if we don't find argv in $_SERVER
fall back to looking in the global symbol table where register_argc_argv
would have put it.

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index e2bb00abbedc319d8d5044911d3aa2bc07caeb9c..46ec37f640842bf6722a9ad286c90bc5d080c779 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -1405,8 +1405,8 @@ PHP_FUNCTION(getopt)
         * in order to be on the safe side, even though it is also available
         * from the symbol table.
         */
-       if (zend_hash_find(HASH_OF(PG(http_globals)[TRACK_VARS_SERVER]), "argv", sizeof("argv"),
-                                          (void **) &args) != FAILURE) {
+       if (zend_hash_find(HASH_OF(PG(http_globals)[TRACK_VARS_SERVER]), "argv", sizeof("argv"), (void **) &args) != FAILURE ||
+               zend_hash_find(&EG(symbol_table), "argv", sizeof("argv"), (void **) &args) != FAILURE) {
                int pos = 0;
                zval **arg;