archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.3' into PHP-7.4

Browse source
This commit is contained in:
Jakub Zelenka 2019-03-10 16:36:55 +00:00
commit bc57efb78f
6 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
ext/openssl/tests/ServerClientTestCase.inc
View file

@ -14,6 +14,18 @@ function phpt_wait($worker = WORKER_DEFAULT_NAME, $timeout = null)
ServerClientTestCase::getInstance()->wait($worker, $timeout); ServerClientTestCase::getInstance()->wait($worker, $timeout);
} }
function phpt_has_sslv3() {
static $result = null;
if (!is_null($result)) {
return $result;
}
$server = @stream_socket_server('sslv3://127.0.0.1:10013');
if ($result = !!$server) {
fclose($server);
}
return $result;
}
/** /**
* This is a singleton to let the wait/notify functions work * This is a singleton to let the wait/notify functions work
* I know it's horrible, but it's a means to an end * I know it's horrible, but it's a means to an end

2
ext/openssl/tests/tls_min_v1.0_max_v1.1_wrapper.phpt
View file

@ -18,7 +18,7 @@ $serverCode = <<<'CODE'
$server = stream_socket_server('tls://127.0.0.1:64321', $errno, $errstr, $flags, $ctx); $server = stream_socket_server('tls://127.0.0.1:64321', $errno, $errstr, $flags, $ctx);
phpt_notify(); phpt_notify();
for ($i=0; $i < 6; $i++) { for ($i=0; $i < (phpt_has_sslv3() ? 6 : 5); $i++) {
@stream_socket_accept($server, 3); @stream_socket_accept($server, 3);
} }
CODE; CODE;

2
ext/openssl/tests/tls_wrapper.phpt
View file

@ -16,7 +16,7 @@ $serverCode = <<<'CODE'
$server = stream_socket_server('tls://127.0.0.1:64321', $errno, $errstr, $flags, $ctx); $server = stream_socket_server('tls://127.0.0.1:64321', $errno, $errstr, $flags, $ctx);
phpt_notify(); phpt_notify();
for ($i=0; $i < 6; $i++) { for ($i = 0; $i < (phpt_has_sslv3() ? 6 : 5); $i++) {
@stream_socket_accept($server, 3); @stream_socket_accept($server, 3);
} }
CODE; CODE;

2
ext/openssl/tests/tlsv1.0_wrapper.phpt
View file

@ -16,7 +16,7 @@ $serverCode = <<<'CODE'
$server = stream_socket_server('tlsv1.0://127.0.0.1:64321', $errno, $errstr, $flags, $ctx); $server = stream_socket_server('tlsv1.0://127.0.0.1:64321', $errno, $errstr, $flags, $ctx);
phpt_notify(); phpt_notify();
for ($i=0; $i < 3; $i++) { for ($i = 0; $i < (phpt_has_sslv3() ? 3 : 2); $i++) {
@stream_socket_accept($server, 3); @stream_socket_accept($server, 3);
} }
CODE; CODE;

2
ext/openssl/tests/tlsv1.1_wrapper.phpt
View file

@ -16,7 +16,7 @@ $serverCode = <<<'CODE'
$server = stream_socket_server('tlsv1.1://127.0.0.1:64321', $errno, $errstr, $flags, $ctx); $server = stream_socket_server('tlsv1.1://127.0.0.1:64321', $errno, $errstr, $flags, $ctx);
phpt_notify(); phpt_notify();
for ($i=0; $i < 3; $i++) { for ($i = 0; $i < (phpt_has_sslv3() ? 3 : 2); $i++) {
@stream_socket_accept($server, 3); @stream_socket_accept($server, 3);
} }
CODE; CODE;

2
ext/openssl/tests/tlsv1.2_wrapper.phpt
View file

@ -16,7 +16,7 @@ $serverCode = <<<'CODE'
$server = stream_socket_server('tlsv1.2://127.0.0.1:64321', $errno, $errstr, $flags, $ctx); $server = stream_socket_server('tlsv1.2://127.0.0.1:64321', $errno, $errstr, $flags, $ctx);
phpt_notify(); phpt_notify();
for ($i=0; $i < 3; $i++) { for ($i = 0; $i < (phpt_has_sslv3() ? 3 : 2); $i++) {
@stream_socket_accept($server, 3); @stream_socket_accept($server, 3);
} }
CODE; CODE;