Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Fixed arginfo
This commit is contained in:
Xinchen Hui 2016-07-20 18:07:18 +08:00
commit e4af29b0b7

View file

@ -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