Merge remote-tracking branch 'origin/ohmy'

igorw · igorw · commit af0214f1c621 · 2014-08-23T13:11:34.000+02:00
* origin/ohmy:
  Async connect
  Let's not block the process
diff --git a/src/Query/Executor.php b/src/Query/Executor.php
@@ -99,7 +99,8 @@ protected function generateId()
 
     protected function createConnection($nameserver, $transport)
     {
-        $fd = stream_socket_client("$transport://$nameserver");
+        $fd = stream_socket_client("$transport://$nameserver", $errno, $errstr, 0, STREAM_CLIENT_CONNECT | STREAM_CLIENT_ASYNC_CONNECT);
+        stream_set_blocking($fd, 0);
         $conn = new Connection($fd, $this->loop);
 
         return $conn;

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,8 @@ protected function generateId()`
`99`	`99`
`100`	`100`	`protected function createConnection($nameserver, $transport)`
`101`	`101`	`{`
`102`		`- $fd = stream_socket_client("$transport://$nameserver");`
	`102`	`+ $fd = stream_socket_client("$transport://$nameserver", $errno, $errstr, 0, STREAM_CLIENT_CONNECT \| STREAM_CLIENT_ASYNC_CONNECT);`
	`103`	`+ stream_set_blocking($fd, 0);`
`103`	`104`	`$conn = new Connection($fd, $this->loop);`
`104`	`105`
`105`	`106`	`return $conn;`