diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2019-10-08 12:10:35 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-10-08 12:10:58 +0200 |
| commit | 346be2cf591ecc5e1f673ead407b265bd834d429 (patch) | |
| tree | 9c9b4191895114a270af444569948199fd4bab20 | |
| parent | c2781dbe5e03d80163a15da0d9f65c98be6e8a41 (diff) | |
| parent | d6fdc17f7fea5a4c4bfaf801f44d8b0a531428da (diff) | |
| download | php-git-346be2cf591ecc5e1f673ead407b265bd834d429.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #78642: Wrong libiconv version displayed
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | ext/iconv/iconv.c | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -9,6 +9,10 @@ PHP NEWS . Fixed bug #78632 (method_exists() in php74 works differently from php73 in checking priv. methods). (Nikita) +- Iconv: + . Fixed bug #78642 (Wrong libiconv version displayed). (gedas at martynas, + cmb). + - Pcntl: . Fixed bug #77335 (PHP is preventing SIGALRM from specifying SA_RESTART). (Nikita) diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c index f70dcbf613..d4244b19f4 100644 --- a/ext/iconv/iconv.c +++ b/ext/iconv/iconv.c @@ -281,7 +281,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 |