summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXinchen Hui <laruence@gmail.com>2016-07-20 18:07:18 +0800
committerAnatol Belski <ab@php.net>2016-07-20 14:17:28 +0200
commit9d582eba7448f1495fae62b13d95d2844ce6b28a (patch)
tree811aed476fbf04dbf3bc776eb890435d28c40e57
parent729121df819be8f9c3957e77bb71bc223c48ceae (diff)
downloadphp-git-PHP-7.0.9.tar.gz
Merge branch 'PHP-5.6' into PHP-7.0php-7.0.9PHP-7.0.9
* PHP-5.6: Fixed arginfo (cherry picked from commit e4af29b0b7633cad56a46bbffafae079a0cd882c)
-rw-r--r--ext/standard/basic_functions.c3
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