diff options
| author | Jakub Zelenka <bukka@php.net> | 2017-03-20 16:08:16 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2017-03-20 16:08:16 +0000 |
| commit | 7dd52cbcddbd2af7ea64edc4a3cb337aa68cefe9 (patch) | |
| tree | 7ff527f5eba9a95bc215791ec5c856f827d3d85b | |
| parent | f2c35fdda809ef1e4d0151e2564422ec3be319a0 (diff) | |
| parent | 6d066dc421e839027805da63aa66d2db892fe386 (diff) | |
| download | php-git-7dd52cbcddbd2af7ea64edc4a3cb337aa68cefe9.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
| -rw-r--r-- | ext/openssl/tests/bug72333.phpt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/openssl/tests/bug72333.phpt b/ext/openssl/tests/bug72333.phpt index fac59853f9..a7b1c93b15 100644 --- a/ext/openssl/tests/bug72333.phpt +++ b/ext/openssl/tests/bug72333.phpt @@ -19,7 +19,7 @@ $serverCode = <<<'CODE' stream_set_blocking($conn, false); usleep(50000); $read = [$conn]; - while (stream_select($read, $write, $except, 180)) { + while (stream_select($read, $write, $except, 1)) { $result = fread($conn, 100000); if (!$result) { break; @@ -42,7 +42,7 @@ $clientCode = <<<'CODE' function blocking_fwrite($fp, $buf) { $write = [$fp]; $total = 0; - while (stream_select($read, $write, $except, 180)) { + while (stream_select($read, $write, $except, 1)) { $result = fwrite($fp, $buf); if (!$result) { break; |