com php-src: Merge branch 'master' of git.php.net:php-src: ext/standard/tests/streams/bug70198.phpt

Commit: 5a640d8aed0d7a2ff7a7b48b32c8269efc5cd2f0 Author: Xinchen Hui <laruence@php.net> Tue, 11 Aug 2015 22:31:19 +0800 Parents: faa3c9d291e7bfa3168f3efe136e9199c0963678 6608821a870b8edfbe0ff1016c6a9b69e4b86ca6 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5a640d8aed0d7a2ff7a7b48b32c8269efc5cd2f0 Log: Merge branch 'master' of git.php.net:php-src Conflicts: ext/standard/tests/streams/bug70198.phpt Bugs: https://bugs.php.net/70198 Changed paths: MM ext/standard/tests/streams/bug70198.phpt Diff: diff --cc ext/standard/tests/streams/bug70198.phpt index ea93d51,85292d8..bfba808 --- a/ext/standard/tests/streams/bug70198.phpt +++ b/ext/standard/tests/streams/bug70198.phpt @@@ -20,9 -20,10 +20,10 @@@ $srv_fl_cont = <<<SR \$socket = stream_socket_server('$srv_addr', \$errno, \$errstr); if (!\$socket) { - echo "\$errstr (\$errno)<br />\\n"; + echo "\$errstr (\$errno)\\n"; } else { - while (\$conn = stream_socket_accept(\$socket)) { + if (\$conn = stream_socket_accept(\$socket, 3)) { + sleep(1); /* just close the connection immediately after accepting, the client side will need wait a bit longer to realize it.*/ fclose(\$conn); @@@ -35,14 -37,12 +36,14 @@@ $dummy0 = $dummy1 = array() $srv_proc = proc_open(PHP_BINARY . " -n $srv_fl", $dummy0, $dummy1); $i = 0; +/* wait a bit for the server startup */ +sleep(1); - $fp = stream_socket_client($srv_addr, $errno, $errstr, 1); + $fp = stream_socket_client($srv_addr, $errno, $errstr, 2); if (!$fp) { - echo "$errstr ($errno)<br />\n"; + echo "$errstr ($errno)\n"; } else { stream_set_blocking($fp, 0); - sleep(1); + sleep(2); while (!feof($fp)) { ++$i; }