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

Conflicts:
	ext/standard/tests/streams/bug70198.phpt

diff --cc ext/standard/tests/streams/bug70198.phpt
index ea93d51647e9585de11edb5b7f8c43fb41be0da3,85292d8961dd5ae1a09332b475e740deabe04f9e..bfba808769d21ac3e6b5db917fcc8d405dd03523
--- 1/ext/standard/tests/streams/bug70198.phpt
--- 2/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;
- $fp = stream_socket_client($srv_addr, $errno, $errstr, 1);
 +/* wait a bit for the server startup */
 +sleep(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;
        }