diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2018-08-13 15:59:48 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2018-08-13 16:00:25 +0200 |
| commit | 56abfd2798bed7d33885900f07e5f0442b079616 (patch) | |
| tree | 7864d400dcb3cc3a074b17549c6bdcc35ebed2d8 | |
| parent | dd0fb4fd9b5bb86bf3dd622de3ce242e2c500fc2 (diff) | |
| parent | e20baee1366535f7758d8ac421821fd1e1f19e90 (diff) | |
| download | php-git-56abfd2798bed7d33885900f07e5f0442b079616.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
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 #72443 (Generate enabled extension). (petk) +- 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 6cd7823281..d30be8ae97 100644 --- a/ext/bz2/bz2.c +++ b/ext/bz2/bz2.c @@ -75,7 +75,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) |