Correctly include port in host header

src/reqwest_impls.rs

@@ -20,7 +20,13 @@ impl RequestLike for reqwest::Request {
 
 impl ClientRequestLike for reqwest::Request {
     fn host(&self) -> Option<String> {
-        self.url().host_str().map(Into::into)
+        let host = self.url().host_str();
+        let port = self.url().port();
+
+        host.map(|host| match port {
+            Some(port) => format!("{}:{}", host, port),
+            None => host.into(),
+        })
     }
     fn compute_digest(&mut self, digest: &dyn HttpDigest) -> Option<String> {
         self.body()?.as_bytes().map(|b| digest.http_digest(b))
@@ -52,7 +58,13 @@ impl RequestLike for reqwest::blocking::Request {
 
 impl ClientRequestLike for reqwest::blocking::Request {
     fn host(&self) -> Option<String> {
-        self.url().host_str().map(Into::into)
+        let host = self.url().host_str();
+        let port = self.url().port();
+
+        host.map(|host| match port {
+            Some(port) => format!("{}:{}", host, port),
+            None => host.into(),
+        })
     }
     fn compute_digest(&mut self, digest: &dyn HttpDigest) -> Option<String> {
         let bytes_to_digest = self.body_mut().as_mut()?.buffer().ok()?;
@@ -102,6 +114,29 @@ mod tests {
         );
     }
 
+    #[test]
+    fn sets_host_header_with_port_correctly() {
+        let config = SigningConfig::new_default("test_key", "abcdefgh".as_bytes());
+        let client = reqwest::Client::new();
+
+        let without_sig = client
+            .post("http://localhost:8080/foo/bar")
+            .header(CONTENT_TYPE, "application/json")
+            .header(
+                DATE,
+                Utc.ymd(2014, 7, 8)
+                    .and_hms(9, 10, 11)
+                    .format("%a, %d %b %Y %T GMT")
+                    .to_string(),
+            )
+            .body(&br#"{ "x": 1, "y": 2}"#[..])
+            .build()
+            .unwrap();
+
+        let with_sig = without_sig.signed(&config).unwrap();
+        assert_eq!(with_sig.headers().get("host").unwrap(), "localhost:8080");
+    }
+
     #[test]
     #[ignore]
     fn it_can_talk_to_reference_integration() {