preserve trailing slash in uri path

Package.swift

@@ -17,6 +17,7 @@ import PackageDescription
 
 let package = Package(
     name: "async-http-client",
+    platforms: [.macOS(.v10_11), .iOS(.v9), .tvOS(.v9), .watchOS(.v2)],
     products: [
         .library(name: "AsyncHTTPClient", targets: ["AsyncHTTPClient"]),
     ],

Sources/AsyncHTTPClient/HTTPHandler.swift

@@ -385,14 +385,29 @@ extension HTTPClientResponseDelegate {
     public func didReceiveError(task: HTTPClient.Task<Response>, _: Error) {}
 }
 
-internal extension URL {
+extension URL {
+    var percentEncodedPath: String {
+        if self.path.isEmpty {
+            return "/"
+        }
+        return self.path.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? self.path
+    }
+
     var uri: String {
-        let urlEncodedPath = path.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? path
-        return path.isEmpty ? "/" : urlEncodedPath + (query.map { "?" + $0 } ?? "")
+        var uri = self.percentEncodedPath
+        if self.hasDirectoryPath, uri != "/" {
+            uri += "/"
+        }
+
+        if let query = self.query {
+            uri += "?" + query
+        }
+
+        return uri
     }
 
     func hasTheSameOrigin(as other: URL) -> Bool {
-        return host == other.host && scheme == other.scheme && port == other.port
+        return self.host == other.host && self.scheme == other.scheme && self.port == other.port
     }
 }
 

Tests/AsyncHTTPClientTests/HTTPClientInternalTests+XCTest.swift

@@ -30,6 +30,7 @@ extension HTTPClientInternalTests {
             ("testProxyStreaming", testProxyStreaming),
             ("testProxyStreamingFailure", testProxyStreamingFailure),
             ("testUploadStreamingBackpressure", testUploadStreamingBackpressure),
+            ("testRequestURITrailingSlash", testRequestURITrailingSlash),
         ]
     }
 }

Tests/AsyncHTTPClientTests/HTTPClientInternalTests.swift

@@ -193,4 +193,39 @@ class HTTPClientInternalTests: XCTestCase {
 
         XCTAssertEqual(delegate.reads, 3)
     }
+
+    func testRequestURITrailingSlash() throws {
+        let request1 = try Request(url: "https://someserver.com:8888/some/path?foo=bar#ref")
+        XCTAssertEqual(request1.url.uri, "/some/path?foo=bar")
+
+        let request2 = try Request(url: "https://someserver.com:8888/some/path/?foo=bar#ref")
+        XCTAssertEqual(request2.url.uri, "/some/path/?foo=bar")
+
+        let request3 = try Request(url: "https://someserver.com:8888?foo=bar#ref")
+        XCTAssertEqual(request3.url.uri, "/?foo=bar")
+
+        let request4 = try Request(url: "https://someserver.com:8888/?foo=bar#ref")
+        XCTAssertEqual(request4.url.uri, "/?foo=bar")
+
+        let request5 = try Request(url: "https://someserver.com:8888/some/path")
+        XCTAssertEqual(request5.url.uri, "/some/path")
+
+        let request6 = try Request(url: "https://someserver.com:8888/some/path/")
+        XCTAssertEqual(request6.url.uri, "/some/path/")
+
+        let request7 = try Request(url: "https://someserver.com:8888")
+        XCTAssertEqual(request7.url.uri, "/")
+
+        let request8 = try Request(url: "https://someserver.com:8888/")
+        XCTAssertEqual(request8.url.uri, "/")
+
+        let request9 = try Request(url: "https://someserver.com:8888#ref")
+        XCTAssertEqual(request9.url.uri, "/")
+
+        let request10 = try Request(url: "https://someserver.com:8888/#ref")
+        XCTAssertEqual(request10.url.uri, "/")
+
+        let request11 = try Request(url: "https://someserver.com/some%20path")
+        XCTAssertEqual(request11.url.uri, "/some%20path")
+    }
 }