From 9d582eba7448f1495fae62b13d95d2844ce6b28a Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Wed, 20 Jul 2016 18:07:18 +0800 Subject: Merge branch 'PHP-5.6' into PHP-7.0 * PHP-5.6: Fixed arginfo (cherry picked from commit e4af29b0b7633cad56a46bbffafae079a0cd882c) --- ext/standard/basic_functions.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 -- cgit v1.2.1