php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-27 18:23:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git.php.net:php-src

Browse Source 
Conflicts:
	ext/standard/tests/streams/bug70198.phpt
This commit is contained in:
Xinchen Hui
2015-08-11 22:31:19 +08:00
parent faa3c9d291 6608821a87
commit 5a640d8aed
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/standard/tests/streams/bug70198.phpt
+3 -2
View File
@@ -23,6 +23,7 @@ if (!\$socket) {
echo "\$errstr (\$errno)\\n";
} else {
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);
@@ -37,12 +38,12 @@ $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)\n";
} else {
stream_set_blocking($fp, 0);
sleep(1);
sleep(2);
while (!feof($fp)) {
++$i;
}