Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix mysqli ssl test for tls1.3

Author: nikic

ext/mysqli/tests/bug55283.phpt

@@ -62,17 +62,17 @@ $link->close();
 
 	echo "done\n";
 ?>
---EXPECT--
+--EXPECTF--
 array(2) {
   [0]=>
   string(10) "Ssl_cipher"
   [1]=>
-  string(10) "AES256-SHA"
+  string(%d) "%rAES256-SHA|TLS_AES_256_GCM_SHA384%r"
 }
 array(2) {
   [0]=>
   string(10) "Ssl_cipher"
   [1]=>
-  string(10) "AES256-SHA"
+  string(%d) "%rAES256-SHA|TLS_AES_256_GCM_SHA384%r"
 }
 done