diff options
| author | Joe Watkins <krakjoe@php.net> | 2017-01-26 06:58:36 +0000 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2017-01-26 06:58:53 +0000 |
| commit | 4e3a4c119d2bdc349cb03a51dc08e2b67808dd34 (patch) | |
| tree | bfd986e2c26dfa95489a4f1cdb49a7219853df0d | |
| parent | 2eb0cb3afed296cad34d60356122fc48d5afb542 (diff) | |
| parent | 76a7470160f977e486a1c9953012241abb5c1159 (diff) | |
| download | php-git-4e3a4c119d2bdc349cb03a51dc08e2b67808dd34.tar.gz | |
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed bug #73994 incorrect arginfo for unpack
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | ext/standard/basic_functions.c | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -24,6 +24,7 @@ PHP NEWS (Anatol) . Fixed bug #73969 (segfault in debug_print_backtrace). (andrewnester) . Added PHP_OS_FAMILY constant to determine on which OS we are. (Jan Altensen) + . Fixed bug #73994 (arginfo incorrect for unpack). (krakjoe) - BCMath: . Fixed bug #46564 (bcmod truncates fractionals). (liborm85) diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index b6f81c9010..0a8a44c38e 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -1806,7 +1806,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_pack, 0, 0, 2) ZEND_ARG_VARIADIC_INFO(0, args) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO(arginfo_unpack, 0) +ZEND_BEGIN_ARG_INFO_EX(arginfo_unpack, 0, 0, 2) ZEND_ARG_INFO(0, format) ZEND_ARG_INFO(0, input) ZEND_ARG_INFO(0, offset) |