Correcctly implemented proxy-handling, Fixes #6.

Author: Johannes Weberhofer

src/org/jsonrpcphp/JsonRPCClient.php

@@ -38,7 +38,7 @@ class JsonRPCClient
      *
      * @var boolean
      */
-    private $debug;
+    private $debug = false;
 
     /**
      * The server URL
@@ -47,6 +47,13 @@ class JsonRPCClient
      */
     private $url;
 
+    /**
+     * Proxy to be used
+     *
+     * @var string
+     */
+    private $proxy = null;
+
     /**
      * The request id
      *
@@ -74,15 +81,13 @@ class JsonRPCClient
      *
      * @param string $url
      * @param boolean $debug
+     * @param string $proxy
      */
-    public function __construct($url, $debug = false)
+    public function __construct($url, $debug = false, $proxy = null)
     {
-        // server URL
         $this->url = $url;
-        // proxy
-        empty($proxy) ? $this->proxy = '' : $this->proxy = $proxy;
-        // debug state
-        empty($debug) ? $this->debug = false : $this->debug = true;
+        $this->proxy = $proxy;
+        $this->debug = ($this->debug === true);
         // message id
         $this->id = 1;
     }
@@ -150,6 +155,9 @@ public function __call($method, $params)
             curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
             curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 5);
             curl_setopt($ch, CURLOPT_POSTFIELDS, $request);
+            if ($this->proxy !== null && trim($this->proxy) !== '') {
+                curl_setopt($ch, CURLOPT_PROXY, $this->proxy);
+            }
             $response = curl_exec($ch);
             if ($response === false) {
                 throw new \Exception('Unable to connect to ' . $this->url);