Skip to content

Commit 769d2d9

Browse files
committed
Speed up TLS wrapper tests when SSLv3 disabled
If SSLv3 is disabled in OpenSSL, then sslv3 is not available so the accept times out. This commit removes the extra accept if SSLv3 is disabled.
1 parent 9177542 commit 769d2d9

File tree

5 files changed

+16
-4
lines changed

5 files changed

+16
-4
lines changed

ext/openssl/tests/ServerClientTestCase.inc

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,18 @@ function phpt_wait($worker = WORKER_DEFAULT_NAME, $timeout = null)
1414
ServerClientTestCase::getInstance()->wait($worker, $timeout);
1515
}
1616

17+
function phpt_has_sslv3() {
18+
static $result = null;
19+
if (!is_null($result)) {
20+
return $result;
21+
}
22+
$server = @stream_socket_server('sslv3://127.0.0.1:10013');
23+
if ($result = !!$server) {
24+
fclose($server);
25+
}
26+
return $result;
27+
}
28+
1729
/**
1830
* This is a singleton to let the wait/notify functions work
1931
* I know it's horrible, but it's a means to an end

ext/openssl/tests/tls_wrapper.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ $serverCode = <<<'CODE'
1616
$server = stream_socket_server('tls://127.0.0.1:64321', $errno, $errstr, $flags, $ctx);
1717
phpt_notify();
1818
19-
for ($i=0; $i < 6; $i++) {
19+
for ($i = 0; $i < (phpt_has_sslv3() ? 6 : 5); $i++) {
2020
@stream_socket_accept($server, 3);
2121
}
2222
CODE;

ext/openssl/tests/tlsv1.0_wrapper.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ $serverCode = <<<'CODE'
1616
$server = stream_socket_server('tlsv1.0://127.0.0.1:64321', $errno, $errstr, $flags, $ctx);
1717
phpt_notify();
1818
19-
for ($i=0; $i < 3; $i++) {
19+
for ($i = 0; $i < (phpt_has_sslv3() ? 3 : 2); $i++) {
2020
@stream_socket_accept($server, 3);
2121
}
2222
CODE;

ext/openssl/tests/tlsv1.1_wrapper.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ $serverCode = <<<'CODE'
1616
$server = stream_socket_server('tlsv1.1://127.0.0.1:64321', $errno, $errstr, $flags, $ctx);
1717
phpt_notify();
1818
19-
for ($i=0; $i < 3; $i++) {
19+
for ($i = 0; $i < (phpt_has_sslv3() ? 3 : 2); $i++) {
2020
@stream_socket_accept($server, 3);
2121
}
2222
CODE;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ $serverCode = <<<'CODE'
1616
$server = stream_socket_server('tlsv1.2://127.0.0.1:64321', $errno, $errstr, $flags, $ctx);
1717
phpt_notify();
1818
19-
for ($i=0; $i < 3; $i++) {
19+
for ($i = 0; $i < (phpt_has_sslv3() ? 3 : 2); $i++) {
2020
@stream_socket_accept($server, 3);
2121
}
2222
CODE;

0 commit comments

Comments
 (0)