summaryrefslogtreecommitdiff
path: root/ext/mysqli
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2020-01-24 15:15:36 +0100
committerNikita Popov <nikita.ppv@gmail.com>2020-01-24 15:15:36 +0100
commit9b9436d9b0b4bd72b2997462ce74f442e3b736c1 (patch)
tree936efc6a33b4c0017682b13dfaa33a6c1e5a23cc /ext/mysqli
parentdc6ede092f98a7d0c8a11ed5b642bd33d5441f59 (diff)
parentc14df824d1a6ae58ed5778d448dce8865b8c7a23 (diff)
downloadphp-git-9b9436d9b0b4bd72b2997462ce74f442e3b736c1.tar.gz
Merge branch 'PHP-7.4'
* PHP-7.4: Fix mysqli ssl test for tls1.3
Diffstat (limited to 'ext/mysqli')
-rw-r--r--ext/mysqli/tests/bug55283.phpt6
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/mysqli/tests/bug55283.phpt b/ext/mysqli/tests/bug55283.phpt
index e70ba5f8c7..843400ff98 100644
--- a/ext/mysqli/tests/bug55283.phpt
+++ b/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