Merge branch 'PHP-7.1'

This commit is contained in:
Jakub Zelenka 2017-03-17 18:13:05 +00:00
commit 40d04784bb

View file

@ -14,7 +14,21 @@ $serverCode = <<<'CODE'
$fp = stream_socket_server("ssl://127.0.0.1:10011", $errornum, $errorstr, $flags, $context); $fp = stream_socket_server("ssl://127.0.0.1:10011", $errornum, $errorstr, $flags, $context);
phpt_notify(); phpt_notify();
$conn = stream_socket_accept($fp); $conn = stream_socket_accept($fp);
fread($conn, 100000); $total = 100000;
$result = fread($conn, $total);
stream_set_blocking($conn, false);
usleep(50000);
$read = [$conn];
while (stream_select($read, $write, $except, 180)) {
$result = fread($conn, 100000);
if (!$result) {
break;
}
$total += strlen($result);
if ($total >= 4000000) {
break;
}
}
phpt_wait(); phpt_wait();
CODE; CODE;
@ -23,13 +37,16 @@ $clientCode = <<<'CODE'
phpt_wait(); phpt_wait();
$fp = stream_socket_client("ssl://127.0.0.1:10011", $errornum, $errorstr, 3000, STREAM_CLIENT_CONNECT, $context); $fp = stream_socket_client("ssl://127.0.0.1:10011", $errornum, $errorstr, 3000, STREAM_CLIENT_CONNECT, $context);
stream_set_blocking($fp, 0); stream_set_blocking($fp, false);
function blocking_fwrite($fp, $buf) { function blocking_fwrite($fp, $buf) {
$write = [$fp]; $write = [$fp];
$total = 0; $total = 0;
while (stream_select($read, $write, $except, 180)) { while (stream_select($read, $write, $except, 180)) {
$result = fwrite($fp, $buf); $result = fwrite($fp, $buf);
if (!$result) {
break;
}
$total += $result; $total += $result;
if ($total >= strlen($buf)) { if ($total >= strlen($buf)) {
return $total; return $total;
@ -37,7 +54,7 @@ $clientCode = <<<'CODE'
$buf = substr($buf, $total); $buf = substr($buf, $total);
} }
} }
$str1 = str_repeat("a", 3000000); $str1 = str_repeat("a", 4000000);
blocking_fwrite($fp, $str1); blocking_fwrite($fp, $str1);
phpt_notify(); phpt_notify();
echo "done"; echo "done";