Changed to only output port when it is not 80 or 443

Also added test

Author: adam-fowler

Diff for: Sources/AsyncHTTPClient/HTTPHandler.swift

@@ -253,11 +253,6 @@ extension HTTPClient {
             return self.scheme == "https" || self.scheme == "https+unix"
         }
 
-        /// Specified port.
-        var specifiedPort: Int? {
-            return self.url.port
-        }
-
         /// Resolved port.
         public var port: Int {
             return self.url.port ?? (self.useTLS ? 443 : 80)
@@ -777,7 +772,9 @@ extension TaskHandler: ChannelDuplexHandler {
         var headers = request.headers
 
         if !request.headers.contains(name: "Host") {
-            headers.add(name: "Host", value: "\(request.host)\(request.specifiedPort.map { ":\($0)" } ?? "")")
+            let port = request.port
+            let host = (port != 80 && port != 443) ? "\(request.host):\(port)" : request.host
+            headers.add(name: "Host", value: host)
         }
 
         do {

Diff for: Tests/AsyncHTTPClientTests/HTTPClientInternalTests+XCTest.swift

@@ -27,6 +27,7 @@ extension HTTPClientInternalTests {
         return [
             ("testHTTPPartsHandler", testHTTPPartsHandler),
             ("testBadHTTPRequest", testBadHTTPRequest),
+            ("testHostPort", testHostPort),
             ("testHTTPPartsHandlerMultiBody", testHTTPPartsHandlerMultiBody),
             ("testProxyStreaming", testProxyStreaming),
             ("testProxyStreamingFailure", testProxyStreamingFailure),

Diff for: Tests/AsyncHTTPClientTests/HTTPClientInternalTests.swift

@@ -90,6 +90,37 @@ class HTTPClientInternalTests: XCTestCase {
         }
     }
 
+    func testHostPort() throws {
+        let channel = EmbeddedChannel()
+        let recorder = RecordingHandler<HTTPClientResponsePart, HTTPClientRequestPart>()
+        let task = Task<Void>(eventLoop: channel.eventLoop, logger: HTTPClient.loggingDisabled)
+
+        try channel.pipeline.addHandler(recorder).wait()
+        try channel.pipeline.addHandler(TaskHandler(task: task,
+                                                    kind: .host,
+                                                    delegate: TestHTTPDelegate(),
+                                                    redirectHandler: nil,
+                                                    ignoreUncleanSSLShutdown: false,
+                                                    logger: HTTPClient.loggingDisabled)).wait()
+
+        let request1 = try Request(url: "http://localhost:80/get")
+        XCTAssertNoThrow(try channel.writeOutbound(request1))
+        let request2 = try Request(url: "https://localhost/get")
+        XCTAssertNoThrow(try channel.writeOutbound(request2))
+        let request3 = try Request(url: "http://localhost:8080/get")
+        XCTAssertNoThrow(try channel.writeOutbound(request3))
+
+        var head1 = HTTPRequestHead(version: HTTPVersion(major: 1, minor: 1), method: .GET, uri: "/get")
+        head1.headers.add(name: "Host", value: "localhost")
+        XCTAssertEqual(HTTPClientRequestPart.head(head1), recorder.writes[0])
+        var head2 = HTTPRequestHead(version: HTTPVersion(major: 1, minor: 1), method: .GET, uri: "/get")
+        head2.headers.add(name: "Host", value: "localhost")
+        XCTAssertEqual(HTTPClientRequestPart.head(head2), recorder.writes[2])
+        var head3 = HTTPRequestHead(version: HTTPVersion(major: 1, minor: 1), method: .GET, uri: "/get")
+        head3.headers.add(name: "Host", value: "localhost:8080")
+        XCTAssertEqual(HTTPClientRequestPart.head(head3), recorder.writes[4])
+    }
+
     func testHTTPPartsHandlerMultiBody() throws {
         let channel = EmbeddedChannel()
         let delegate = TestHTTPDelegate()