Merge branch 'master' of github.com:Vinelab/http

Vinelab · Jul 11, 2016 · 30b6f71 · 30b6f71
2 parents 007c539 + 26974a6
commit 30b6f71
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Vinelab/Http/Response.php b/src/Vinelab/Http/Response.php
@@ -122,7 +122,7 @@ protected function parseHeaders($response, $headerSize)
         foreach (explode("\r\n", $headers) as $header) {
             if (strpos($header, ':')) {
                 $nestedHeader = explode(':', $header);
-                $parsedHeaders[$nestedHeader[0]] = trim($nestedHeader[1]);
+                $parsedHeaders[array_shift($nestedHeader)] = trim(implode(':', $nestedHeader));
             }
         }
 

diff --git a/tests/ClientTest.php b/tests/ClientTest.php
@@ -29,7 +29,7 @@ public function testHeaders()
         $headers = $this->client->get($request)->headers();
 
         $this->assertArrayHasKey('Host', $headers, 'Headers must have Host');
-        $this->assertEquals(static::$serverHost, $headers['Host']);
+        $this->assertEquals(static::$serverHost.':'.static::$serverPort, $headers['Host']);
 
         // custom headers
         $request['url'] = 'http://'.static::serverUrl().'/content_type.php';