diff options
| author | Xinchen Hui <laruence@gmail.com> | 2016-07-20 18:07:18 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2016-07-20 18:07:18 +0800 |
| commit | e4af29b0b7633cad56a46bbffafae079a0cd882c (patch) | |
| tree | d8e44ee76e3680380504646f4ccdd81b4fd98d63 | |
| parent | 1dafa806a940a3c4e09a9a837b33839e54600eee (diff) | |
| parent | 9ebc96116b609cd3c969c2d5a460aaa904c2afec (diff) | |
| download | php-git-e4af29b0b7633cad56a46bbffafae079a0cd882c.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fixed arginfo
| -rw-r--r-- | ext/standard/basic_functions.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index c4505886d6..99a8837869 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -632,8 +632,9 @@ ZEND_BEGIN_ARG_INFO(arginfo_long2ip, 0) ZEND_ARG_INFO(0, proper_address) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO(arginfo_getenv, 0) +ZEND_BEGIN_ARG_INFO_EX(arginfo_getenv, 0, 0, 1) ZEND_ARG_INFO(0, varname) + ZEND_ARG_INFO(0, local_only) ZEND_END_ARG_INFO() #ifdef HAVE_PUTENV |