Description:
------------
After upgrading iconv 1.15 -> 1.16 phpinfo() shows iconv version being 1.0.

/usr/local/include/iconv.h snippet:
[...]
23:#define _LIBICONV_VERSION 0x0110    /* version number: (major<<8) + minor */
[...]

And how php parses the version:
285:#if HAVE_LIBICONV
286:        {
287:                static char buf[16];
288:                snprintf(buf, sizeof(buf), "%d.%d",
289:                    ((_libiconv_version >> 8) & 0x0f), (_libiconv_version & 0x0f));
290:                version = buf;
291:        }

Till the 1.15 was all fine, as the version string was: 0x010F, after it went to 0x0110, the minor version became 0 due to the "_libiconv_version & 0x0f".

Suggested change:
#if HAVE_LIBICONV
        {
                static char buf[16];
                snprintf(buf, sizeof(buf), "%d.%d",
                    _libiconv_version >> 8, _libiconv_version & 0xff);
                version = buf;
        }

Attaching suggested patch.



Expected result:
----------------
Expected result iconv version 1.16

Actual result:
--------------
Actual result iconv version 1.0