Skip to content

OpenSSL: Improve non-blocking eof test #3809

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

OpenSSL: Improve non-blocking eof test #3809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 19 additions & 4 deletions ext/openssl/tests/ServerClientTestCase.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ function phpt_notify($worker = WORKER_DEFAULT_NAME)
ServerClientTestCase::getInstance()->notify($worker);
}

function phpt_wait($worker = WORKER_DEFAULT_NAME)
function phpt_wait($worker = WORKER_DEFAULT_NAME, $timeout = null)
{
ServerClientTestCase::getInstance()->wait($worker);
ServerClientTestCase::getInstance()->wait($worker, $timeout);
}

/**
Expand Down Expand Up @@ -121,9 +121,24 @@ class ServerClientTestCase
}
}

public function wait($worker)
public function wait($worker, $timeout = null)
{
fgets($this->isWorker ? STDIN : $this->workerStdOut[$worker]);
$handle = $this->isWorker ? STDIN : $this->workerStdOut[$worker];
if ($timeout === null) {
fgets($handle);
return true;
}

stream_set_blocking($handle, false);
$read = [$handle];
$result = stream_select($read, $write, $except, $timeout);
if (!$result) {
return false;
}

fgets($handle);
stream_set_blocking($handle, true);
return true;
}

public function notify($worker)
Expand Down
24 changes: 16 additions & 8 deletions ext/openssl/tests/bug77390.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,21 @@ $clientCode = <<<'CODE'

$read = [$fp];
$buf = '';
$printed = false;
$warmedUp = false;
while (stream_select($read, $write, $except, 1000)) {
$chunk = stream_get_contents($fp, 4096);
if ($chunk !== "") {
var_dump($chunk);
$buf .= $chunk;
} elseif (!$printed) {
$printed = true;
var_dump($chunk);
$buf .= $chunk;
phpt_notify('proxy');
if (!$warmedUp) {
if ($buf !== 'warmup') {
continue;
}
$warmedUp = true;
$buf = '';
phpt_notify('server');
continue;
}
var_dump($chunk);
if ($buf === 'hello, world') {
break;
}
Expand All @@ -51,6 +56,8 @@ $serverCode = <<<'CODE'
phpt_notify();

$conn = stream_socket_accept($fp);
fwrite($conn, 'warmup');
phpt_wait();
fwrite($conn, 'hello, world');

phpt_wait();
Expand Down Expand Up @@ -82,7 +89,7 @@ $proxyCode = <<<'CODE'
$parts = str_split($data, (int) ceil(strlen($data) / 3));
foreach ($parts as $part) {
fwrite($conn, $part);
usleep(1000);
phpt_wait(null, 1);
}
} else {
fwrite($conn, $data);
Expand Down Expand Up @@ -116,4 +123,5 @@ ServerClientTestCase::getInstance()->run($clientCode, [
?>
--EXPECT--
string(0) ""
string(0) ""
string(12) "hello, world"