Merge pull request #66 from tim-massey/options

Fixes bug where supplied option for timeout was ignored in constructor.
KnpLabs · Aug 30, 2013 · e55c465 · e55c465
2 parents 5312ea5 + ac2846e
commit e55c465
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/lib/Github/HttpClient/HttpClient.php b/lib/Github/HttpClient/HttpClient.php
@@ -55,7 +55,8 @@ class HttpClient implements HttpClientInterface
     public function __construct(array $options = array(), ClientInterface $client = null)
     {
         $client = $client ?: new Curl();
-        $client->setTimeout($this->options['timeout']);
+        $timeout = isset($options['timeout']) ? $options['timeout'] : $this->options['timeout'];
+        $client->setTimeout($timeout);
         $client->setVerifyPeer(false);
 
         $this->options = array_merge($this->options, $options);