From 5ad92c0062c3ee972005b9c2b0bbb0c2d5d59fbb Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Sat, 10 Aug 2024 03:58:45 +0100
Subject: [PATCH] fix(awc): ws host req header includes port

---
 awc/CHANGES.md |  4 +++-
 awc/src/ws.rs  | 27 +++++++++++++++++++++++++--
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/awc/CHANGES.md b/awc/CHANGES.md
index 54c5e9869..9a344ceb0 100644
--- a/awc/CHANGES.md
+++ b/awc/CHANGES.md
@@ -2,11 +2,13 @@
 
 ## Unreleased
 
+- Fix WebSocket `Host` request header value when using a non-default port.
+
 ## 3.5.0
 
 - Add `rustls-0_23`, `rustls-0_23-webpki-roots`, and `rustls-0_23-native-roots` crate features.
 - Add `awc::Connector::rustls_0_23()` constructor.
-- Fix `rustls-0_22-native-roots` root store lookup
+- Fix `rustls-0_22-native-roots` root store lookup.
 - Update `brotli` dependency to `6`.
 - Minimum supported Rust version (MSRV) is now 1.72.
 
diff --git a/awc/src/ws.rs b/awc/src/ws.rs
index c3340206d..794dccbfe 100644
--- a/awc/src/ws.rs
+++ b/awc/src/ws.rs
@@ -257,8 +257,9 @@ impl WebsocketsRequest {
             return Err(e.into());
         }
 
-        // validate uri
+        // validate URI
         let uri = &self.head.uri;
+
         if uri.host().is_none() {
             return Err(InvalidUrl::MissingHost.into());
         } else if uri.scheme().is_none() {
@@ -273,9 +274,12 @@ impl WebsocketsRequest {
         }
 
         if !self.head.headers.contains_key(header::HOST) {
+            let hostname = uri.host().unwrap();
+            let port = uri.port();
+
             self.head.headers.insert(
                 header::HOST,
-                HeaderValue::from_str(uri.host().unwrap()).unwrap(),
+                HeaderValue::from_str(&Host { hostname, port }.to_string()).unwrap(),
             );
         }
 
@@ -434,6 +438,25 @@ impl fmt::Debug for WebsocketsRequest {
     }
 }
 
+/// Formatter for host (hostname+port) header values.
+struct Host<'a> {
+    hostname: &'a str,
+    port: Option<http::uri::Port<&'a str>>,
+}
+
+impl<'a> fmt::Display for Host<'a> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.write_str(self.hostname)?;
+
+        if let Some(port) = &self.port {
+            f.write_str(":")?;
+            f.write_str(port.as_str())?;
+        }
+
+        Ok(())
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;