Merge remote-tracking branch 'origin/master' into stream

igorw · igorw · commit 42300bfadfb8 · 2012-07-06T21:14:41.000+02:00
* origin/master: [Socket] Suppress notice when binding to a port, fixes #45
diff --git a/Server.php b/Server.php
@@ -17,9 +17,10 @@ public function __construct(LoopInterface $loop)
 
     public function listen($port, $host = '127.0.0.1')
     {
-        $this->master = stream_socket_server("tcp://$host:$port", $errno, $errstr);
+        $this->master = @stream_socket_server("tcp://$host:$port", $errno, $errstr);
         if (false === $this->master) {
-            throw new ConnectionException($errstr, $errno);
+            $message = "Could not bind to tcp://$host:$port: $errstr";
+            throw new ConnectionException($message, $errno);
         }
         stream_set_blocking($this->master, 0);
 

Original file line number	Diff line number	Diff line change
`@@ -17,9 +17,10 @@ public function __construct(LoopInterface $loop)`
`17`	`17`
`18`	`18`	`public function listen($port, $host = '127.0.0.1')`
`19`	`19`	`{`
`20`		`- $this->master = stream_socket_server("tcp://$host:$port", $errno, $errstr);`
	`20`	`+ $this->master = @stream_socket_server("tcp://$host:$port", $errno, $errstr);`
`21`	`21`	`if (false === $this->master) {`
`22`		`- throw new ConnectionException($errstr, $errno);`
	`22`	`+ $message = "Could not bind to tcp://$host:$port: $errstr";`
	`23`	`+ throw new ConnectionException($message, $errno);`
`23`	`24`	`}`
`24`	`25`	`stream_set_blocking($this->master, 0);`
`25`	`26`