Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Make iconv errno support test pass on Solaris.

Author: nikic

ext/iconv/config.m4

@@ -92,7 +92,7 @@ int main() {
 
 int main() {
   iconv_t cd;
-  cd = iconv_open( "*blahblah*", "*blahblah*" );
+  cd = iconv_open( "*blahblah*", "*blahblahblah*" );
   if (cd == (iconv_t)(-1)) {
     if (errno == EINVAL) {
       return 0;