Merge branch 'hotfix/2636'

Close zendframework/zendframework#2636
zendframework · Oct 2, 2012 · 9acc850 · 9acc850
commit 9acc850
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/Client/Adapter/Curl.php b/src/Client/Adapter/Curl.php
@@ -204,11 +204,15 @@ public function connect($host, $port = 80, $secure = false)
             curl_setopt($this->curl, CURLOPT_PORT, intval($port));
         }
 
-        // Set timeout
-        curl_setopt($this->curl, CURLOPT_CONNECTTIMEOUT, $this->config['timeout']);
+        if (isset($this->config['timeout'])) {
+            // Set timeout
+            curl_setopt($this->curl, CURLOPT_CONNECTTIMEOUT, $this->config['timeout']);
+        }
 
-        // Set Max redirects
-        curl_setopt($this->curl, CURLOPT_MAXREDIRS, $this->config['maxredirects']);
+        if (isset($this->config['maxredirects'])) {
+            // Set Max redirects
+            curl_setopt($this->curl, CURLOPT_MAXREDIRS, $this->config['maxredirects']);
+        }
 
         if (!$this->curl) {
             $this->close();