Merge pull request #332 from Awnage/master

Add ability to use a proxy.

Author: willdurand

src/Geocoder/HttpAdapter/CurlHttpAdapter.php

@@ -22,12 +22,20 @@ class CurlHttpAdapter implements HttpAdapterInterface
     private $connectTimeout;
 
     private $userAgent;
+    
+    /**
+     * Array for bulk setting of curl options
+     * @see http://php.net/manual/en/curl.constants.php
+     * @var array
+     */
+    private $options;
 
-    public function __construct($timeout = null, $connectTimeout = null, $userAgent = null)
+    public function __construct($timeout = null, $connectTimeout = null, $userAgent = null, $options = array())
     {
         $this->timeout = $timeout;
         $this->connectTimeout = $connectTimeout;
         $this->userAgent = $userAgent;
+        $this->options = $options;
     }
 
     /**
@@ -55,6 +63,10 @@ public function getContent($url)
             curl_setopt($c, CURLOPT_USERAGENT, $this->userAgent);
         }
 
+        if ($this->options && is_array($this->options) && count($this->options)>0) {
+            curl_setopt_array($c, $this->options);
+        }
+
         $content = curl_exec($c);
         curl_close($c);