diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2017-12-01 01:35:47 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2017-12-01 01:35:47 +0300 |
| commit | 7cc6f601345ea59b5a6a20b45e72328489a48336 (patch) | |
| tree | 624e47a2ca5771b72570e2c825d5c3f75df48489 /ext/standard/basic_functions.c | |
| parent | 64c5e38adf165d5bc2b4293d4c3c264e76122886 (diff) | |
| download | php-git-7cc6f601345ea59b5a6a20b45e72328489a48336.tar.gz | |
Added "argv" and "argc" as known strings.
Fixed incorrect "argc" update and corresponding phpdbg test.
Diffstat (limited to 'ext/standard/basic_functions.c')
| -rw-r--r-- | ext/standard/basic_functions.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 7cc3b0a0d5..0b5262487b 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -4361,8 +4361,8 @@ PHP_FUNCTION(getopt) * in order to be on the safe side, even though it is also available * from the symbol table. */ if ((Z_TYPE(PG(http_globals)[TRACK_VARS_SERVER]) == IS_ARRAY || zend_is_auto_global_str(ZEND_STRL("_SERVER"))) && - ((args = zend_hash_str_find_ind(Z_ARRVAL_P(&PG(http_globals)[TRACK_VARS_SERVER]), "argv", sizeof("argv")-1)) != NULL || - (args = zend_hash_str_find_ind(&EG(symbol_table), "argv", sizeof("argv")-1)) != NULL) + ((args = zend_hash_find_ind(Z_ARRVAL_P(&PG(http_globals)[TRACK_VARS_SERVER]), ZSTR_KNOWN(ZEND_STR_ARGV))) != NULL || + (args = zend_hash_find_ind(&EG(symbol_table), ZSTR_KNOWN(ZEND_STR_ARGV))) != NULL) ) { int pos = 0; zval *entry; |