diff options
author | Christoph M. Becker <cmbecker69@gmx.de> | 2018-08-13 16:01:23 +0200 |
---|---|---|
committer | Christoph M. Becker <cmbecker69@gmx.de> | 2018-08-13 16:02:13 +0200 |
commit | 8270c7d94723adf05df44267a4a04a22079577d0 (patch) | |
tree | 8ef96c5ea4faf7ee123954f8c97da71811901f69 | |
parent | fdaa540fd8340b466af950ad65a1623b345a051c (diff) | |
parent | 56abfd2798bed7d33885900f07e5f0442b079616 (diff) | |
download | php-git-8270c7d94723adf05df44267a4a04a22079577d0.tar.gz |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix arginfo for bzcompress
-rw-r--r-- | NEWS | 3 | ||||
-rw-r--r-- | ext/bz2/bz2.c | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -5,6 +5,9 @@ PHP NEWS - Core: . Fixed bug #76030 (RE2C_FLAGS rarely honoured) (Cristian RodrÃguez) +- Bz2: + . Fixed arginfo for bzcompress. (Tyson Andre) + - gettext: . Fixed bug #76517 (incorrect restoring of LDFLAGS). (sji) diff --git a/ext/bz2/bz2.c b/ext/bz2/bz2.c index 274f381c35..ad47537d21 100644 --- a/ext/bz2/bz2.c +++ b/ext/bz2/bz2.c @@ -73,7 +73,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_bzerror, 0) ZEND_ARG_INFO(0, bz) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_bzcompress, 0, 0, 2) +ZEND_BEGIN_ARG_INFO_EX(arginfo_bzcompress, 0, 0, 1) ZEND_ARG_INFO(0, source) ZEND_ARG_INFO(0, blocksize) ZEND_ARG_INFO(0, workfactor) |