Merge branch 'PHP-7.4'

cmb69 · cmb69 · commit 8548a1bdec4d · 2019-10-08T12:11:19.000+02:00
* PHP-7.4:
  Fix #78642: Wrong libiconv version displayed
diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
@@ -219,7 +219,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

Original file line number	Diff line number	Diff line change
`@@ -219,7 +219,7 @@ PHP_MINIT_FUNCTION(miconv)`
`219`	`219`	`{`
`220`	`220`	`static char buf[16];`
`221`	`221`	`snprintf(buf, sizeof(buf), "%d.%d",`
`222`		`- ((_libiconv_version >> 8) & 0x0f), (_libiconv_version & 0x0f));`
	`222`	`+ _libiconv_version >> 8, _libiconv_version & 0xff);`
`223`	`223`	`version = buf;`
`224`	`224`	`}`
`225`	`225`	`#elif HAVE_GLIBC_ICONV`