diff options
author | Aaron Piotrowski <aaron@trowski.com> | 2017-02-23 22:56:04 -0600 |
---|---|---|
committer | Aaron Piotrowski <aaron@trowski.com> | 2017-02-23 22:56:04 -0600 |
commit | 531fbb88f554346b080eb6b8fd7bc8e9d65707e5 (patch) | |
tree | 001104336d9075b7d56eca61d996e344a5beb91e | |
parent | c05c65ac806b77a8d00242a8ea9244ef3dc2e464 (diff) | |
parent | ff8a6b1232b78abe0ad7de5a44af4be2b8839728 (diff) | |
download | php-git-531fbb88f554346b080eb6b8fd7bc8e9d65707e5.tar.gz |
Merge branch 'PHP-7.0' into PHP-7.1
-rw-r--r-- | ext/openssl/tests/bug74159.phpt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/openssl/tests/bug74159.phpt b/ext/openssl/tests/bug74159.phpt index 0299cf117a..2aaa68bf70 100644 --- a/ext/openssl/tests/bug74159.phpt +++ b/ext/openssl/tests/bug74159.phpt @@ -76,7 +76,7 @@ $clientCode = <<<'CODE' $fp = stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx); stream_set_blocking($fp, false); - while (0 === ($n = stream_socket_enable_crypto($fp, true, STREAM_CRYPTO_METHOD_ANY_CLIENT))); + while (0 === ($n = stream_socket_enable_crypto($fp, true, STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT))); $data = str_repeat("a", 0xfffff); $written = 0; |