mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-25 01:40:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.3' into PHP-7.4

Browse Source
This commit is contained in:
Nikita Popov 2019-02-20 12:12:11 +01:00
commit 4f2b46dbaf
2 changed files with 35 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ext/openssl/tests/ServerClientTestCase.inc
View File

@ -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);
}
/**
@ -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)

24
ext/openssl/tests/bug77390.phpt
View File

@ -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;
}
@ -51,6 +56,8 @@ $serverCode = <<<'CODE'
phpt_notify();
$conn = stream_socket_accept($fp);
fwrite($conn, 'warmup');
phpt_wait();
fwrite($conn, 'hello, world');
phpt_wait();
@ -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);
@ -116,4 +123,5 @@ ServerClientTestCase::getInstance()->run($clientCode, [
?>
--EXPECT--
string(0) ""
string(0) ""
string(12) "hello, world"