Merge pull request #47 from cmfcmf/allow-curl-options

Allow to set additional Curl options.

Author: cmfcmf

Cmfcmf/OpenWeatherMap/Fetcher/CurlFetcher.php

@@ -24,16 +24,33 @@
  */
 class CurlFetcher implements FetcherInterface
 {
+    /**
+     * @var array The Curl options to use. 
+     */
+    private $curlOptions;
+
+    /**
+     * Create a new CurlFetcher instance.
+     * 
+     * @param array $curlOptions The Curl options to use. See http://php.net/manual/de/function.curl-setopt.php
+     * for a list of available options.
+     */
+    public function __construct($curlOptions = array())
+    {
+        $this->curlOptions = $curlOptions;
+    }
+    
     /**
      * {@inheritdoc}
      */
     public function fetch($url)
     {
         $ch = curl_init($url);
-        $timeout = 5;
         curl_setopt($ch, CURLOPT_URL, $url);
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-        curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $timeout);
+        curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 5);
+        curl_setopt_array($ch, $this->curlOptions);
+        
         $content = curl_exec($ch);
         curl_close($ch);