Merge branch 'release/0.1.1' into develop

Author: repejota

src/Connection.php

@@ -146,15 +146,19 @@ private function receive($len = null)
     /**
      * Returns an stream socket to the desired server.
      *
-     * @param string $address Server url string.
-     *
+     * @param string  $address Server url string.
+     * @param integer $timeout Number of seconds until the connect() system call should timeout.
      * @return resource
+     * @throws \Exception Exception raised if connection fails.
      */
-    private function getStream($address)
+    private function getStream($address, $timeout = null)
     {
-        $fp = stream_socket_client($address, $errno, $errstr, STREAM_CLIENT_CONNECT);
+        if (is_null($timeout)) {
+            $timeout = intval(ini_get('default_socket_timeout'));
+        }
+        $fp = stream_socket_client($address, $errno, $errstr, $timeout, STREAM_CLIENT_CONNECT);
         if (!$fp) {
-            echo '!!!!!!! '.$errstr.' - '.$errno;
+            throw new \Exception($errstr, $errno);
         }
         //stream_set_blocking($fp, 0);
         return $fp;
@@ -173,11 +177,13 @@ public function isConnected()
     /**
      * Connect to server.
      *
+     * @param integer $timeout Number of seconds until the connect() system call should timeout.
+     * @throws \Exception Exception raised if connection fails.
      * @return void
      */
-    public function connect()
+    public function connect($timeout = null)
     {
-        $this->streamSocket = $this->getStream($this->options->getAddress());
+        $this->streamSocket = $this->getStream($this->options->getAddress(), $timeout);
         $msg = 'CONNECT '.$this->options;
         $this->send($msg);
     }
@@ -268,7 +274,7 @@ private function handleMSG($line)
         } else {
             return new \Exception('not callable');
         }
-
+        
         return;
     }