Merge pull request daviddesberg#164 from connyay/issue160

Fixes daviddesberg#160

Thanks Connor!

Author: PeeHaa

src/OAuth/Common/Http/Client/StreamClient.php

@@ -43,7 +43,13 @@ public function retrieveResponse(
             $extraHeaders['Content-type'] = 'Content-type: application/x-www-form-urlencoded';
         }
 
-        $extraHeaders['Host']       = 'Host: '.$endpoint->getHost();
+        $host = 'Host: '.$endpoint->getHost();
+        // Append port to Host if it has been specified
+        if ($endpoint->hasExplicitPortSpecified()) {
+            $host .= ':'.$endpoint->getPort();
+        }
+
+        $extraHeaders['Host']       = $host;
         $extraHeaders['Connection'] = 'Connection: close';
 
         if (is_array($requestBody)) {

src/OAuth/Common/Http/Uri/Uri.php

@@ -397,4 +397,12 @@ public function hasExplicitTrailingHostSlash()
     {
         return $this->explicitTrailingHostSlash;
     }
+
+    /**
+     * @return bool
+     */
+    public function hasExplicitPortSpecified()
+    {
+        return $this->explicitPortSpecified;
+    }
 }

src/OAuth/Common/Http/Uri/UriInterface.php

@@ -125,4 +125,9 @@ public function getRelativeUri();
      * @return bool
      */
     public function hasExplicitTrailingHostSlash();
+
+    /**
+     * @return bool
+     */
+    public function hasExplicitPortSpecified();
 }

tests/Unit/Common/Http/Uri/UriTest.php

@@ -871,4 +871,28 @@ public function testHasExplicitTrailingHostSlashFalse()
 
         $this->assertFalse($uri->hasExplicitTrailingHostSlash());
     }
+
+    /**
+     * @covers OAuth\Common\Http\Uri\Uri::__construct
+     * @covers OAuth\Common\Http\Uri\Uri::parseUri
+     * @covers OAuth\Common\Http\Uri\Uri::hasExplicitPortSpecified
+     */
+    public function testHasExplicitPortSpecifiedTrue()
+    {
+        $uri = new Uri('http://example.com:8080');
+
+        $this->assertTrue($uri->hasExplicitPortSpecified());
+    }
+
+    /**
+     * @covers OAuth\Common\Http\Uri\Uri::__construct
+     * @covers OAuth\Common\Http\Uri\Uri::parseUri
+     * @covers OAuth\Common\Http\Uri\Uri::hasExplicitPortSpecified
+     */
+    public function testHasExplicitPortSpecifiedFalse()
+    {
+        $uri = new Uri('http://example.com');
+
+        $this->assertFalse($uri->hasExplicitPortSpecified());
+    }
 }