diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2019-10-08 12:09:46 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-10-08 12:10:06 +0200 |
| commit | d6fdc17f7fea5a4c4bfaf801f44d8b0a531428da (patch) | |
| tree | 8d635befa5dcadca0f2b02f0a1716cdea7bdc2f0 /ext | |
| parent | 26f45cb4bbd25f0ac4e32f31bf2fc9241521c39e (diff) | |
| parent | 195c2008e8f25040130e597f46cd652829c84dba (diff) | |
| download | php-git-d6fdc17f7fea5a4c4bfaf801f44d8b0a531428da.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #78642: Wrong libiconv version displayed
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/iconv/iconv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c index 24aefcbba7..a152187e6c 100644 --- a/ext/iconv/iconv.c +++ b/ext/iconv/iconv.c @@ -284,7 +284,7 @@ PHP_MINIT_FUNCTION(miconv) { static char buf[16]; snprintf(buf, sizeof(buf), "%d.%d", - ((_libiconv_version >> 8) & 0x0f), (_libiconv_version & 0x0f)); + _libiconv_version >> 8, _libiconv_version & 0xff); version = buf; } #elif HAVE_GLIBC_ICONV |