Merge branch 'hotfix/175'

Close #175
Fixes #172

Author: weierophinney

CHANGELOG.md

@@ -33,6 +33,9 @@ All notable changes to this project will be documented in this file, in reverse
   response serialization always provides a `\r\n\r\n` sequence following the
   headers, even when no message body is present, to ensure it conforms with RFC
   7230.
+- [#175](https://github.com/zendframework/zend-diactoros/pull/175) updates the
+  `Request` class to set the `Host` header from the URI host if no header is
+  already present. (Ensures conformity with PSR-7 specification.)
 
 ## 1.3.5 - 2016-03-17
 

src/RequestTrait.php

@@ -69,6 +69,13 @@ private function initialize($uri = null, $method = null, $body = 'php://memory',
         list($this->headerNames, $headers) = $this->filterHeaders($headers);
         $this->assertHeaders($headers);
         $this->headers = $headers;
+
+        // per PSR-7: attempt to set the Host header from a provided URI if no
+        // Host header is provided
+        if (! $this->hasHeader('Host') && $this->uri->getHost()) {
+            $this->headerNames['host'] = 'Host';
+            $this->headers['Host'] = [$this->getHostFromUri()];
+        }
     }
 
     /**

test/RequestTest.php

@@ -395,6 +395,19 @@ public function testGetHostHeaderLineReturnsEmptyStringIfUriDoesNotContainHost()
         $this->assertEmpty($request->getHeaderLine('host'));
     }
 
+    public function testHostHeaderSetFromUriOnCreationIfNoHostHeaderSpecified()
+    {
+        $request = new Request('http://www.example.com');
+        $this->assertTrue($request->hasHeader('Host'));
+        $this->assertEquals('www.example.com', $request->getHeaderLine('host'));
+    }
+
+    public function testHostHeaderNotSetFromUriOnCreationIfHostHeaderSpecified()
+    {
+        $request = new Request('http://www.example.com', null, 'php://memory', ['Host' => 'www.test.com']);
+        $this->assertEquals('www.test.com', $request->getHeaderLine('host'));
+    }
+
     public function testPassingPreserveHostFlagWhenUpdatingUriDoesNotUpdateHostHeader()
     {
         $request = (new Request())