Merge pull request #11 from bradjones1/httpClient-fix

Properly pass options to HttpClient
ivan-novakov · May 24, 2016 · 723a7e7 · 723a7e7
2 parents 6458beb + c0e9f07
commit 723a7e7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/InoOicClient/Oic/AbstractHttpRequestDispatcher.php b/src/InoOicClient/Oic/AbstractHttpRequestDispatcher.php
@@ -139,6 +139,7 @@ public function setJsonCoder(Coder $jsonCoder)
     public function sendHttpRequest(Http\Request $httpRequest)
     {
         $this->setLastHttpRequest($httpRequest);
+        $this->httpClient->setOptions($this->options->get(self::OPT_HTTP_OPTIONS, array()));
 
         try {
             $httpResponse = $this->httpClient->send($httpRequest);

diff --git a/src/InoOicClient/Oic/Token/Dispatcher.php b/src/InoOicClient/Oic/Token/Dispatcher.php
@@ -30,7 +30,7 @@ class Dispatcher extends AbstractHttpRequestDispatcher
     public function getHttpRequestBuilder()
     {
         if (! $this->httpRequestBuilder instanceof HttpRequestBuilder) {
-            $this->httpRequestBuilder = new HttpRequestBuilder($this->options->get(self::OPT_HTTP_OPTIONS, array()));
+            $this->httpRequestBuilder = new HttpRequestBuilder();
         }
         return $this->httpRequestBuilder;
     }