preserve trailing slash in uri path (swift-server#107)

Author: artemredkin

Sources/AsyncHTTPClient/HTTPHandler.swift

@@ -385,14 +385,48 @@ extension HTTPClientResponseDelegate{
 publicfunc didReceiveError(task:HTTPClient.Task<Response>, _:Error){}
 }
 
-internalextensionURL{
+extensionURL{
+varpercentEncodedPath:String{
+ifself.path.isEmpty {
+return"/"
+}
+returnself.path.addingPercentEncoding(withAllowedCharacters:.urlPathAllowed)??self.path
+}
+
+varpathHasTrailingSlash:Bool{
+if #available(OSX 10.11, iOS 9.0, tvOS 9.0, watchOS 2.0,*){
+returnself.hasDirectoryPath
+}else{
+ // Most platforms should use `self.hasDirectoryPath`, but on older darwin platforms
+ // we have this approximation instead.
+leturl=self.absoluteString
+
+varpathEndIndex= url.index(before: url.endIndex)
+iflet queryIndex = url.firstIndex(of:"?"){
+ pathEndIndex = url.index(before: queryIndex)
+}elseiflet fragmentIndex = url.suffix(from: url.firstIndex(of:"@")?? url.startIndex).lastIndex(of:"#"){
+ pathEndIndex = url.index(before: fragmentIndex)
+}
+
+returnurl[pathEndIndex]=="/"
+}
+}
+
 varuri:String{
-leturlEncodedPath= path.addingPercentEncoding(withAllowedCharacters:.urlPathAllowed)?? path
-return path.isEmpty ?"/": urlEncodedPath +(query.map{"?"+ $0 }??"")
+varuri=self.percentEncodedPath
+ifself.pathHasTrailingSlash, uri !="/"{
+ uri +="/"
+}
+
+iflet query =self.query {
+ uri +="?"+ query
+}
+
+return uri
 }
 
 func hasTheSameOrigin(as other:URL)->Bool{
-return host == other.host && scheme == other.scheme && port == other.port
+returnself.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{
+letrequest1=tryRequest(url:"https://someserver.com:8888/some/path?foo=bar#ref")
+XCTAssertEqual(request1.url.uri,"/some/path?foo=bar")
+
+letrequest2=tryRequest(url:"https://someserver.com:8888/some/path/?foo=bar#ref")
+XCTAssertEqual(request2.url.uri,"/some/path/?foo=bar")
+
+letrequest3=tryRequest(url:"https://someserver.com:8888?foo=bar#ref")
+XCTAssertEqual(request3.url.uri,"/?foo=bar")
+
+letrequest4=tryRequest(url:"https://someserver.com:8888/?foo=bar#ref")
+XCTAssertEqual(request4.url.uri,"/?foo=bar")
+
+letrequest5=tryRequest(url:"https://someserver.com:8888/some/path")
+XCTAssertEqual(request5.url.uri,"/some/path")
+
+letrequest6=tryRequest(url:"https://someserver.com:8888/some/path/")
+XCTAssertEqual(request6.url.uri,"/some/path/")
+
+letrequest7=tryRequest(url:"https://someserver.com:8888")
+XCTAssertEqual(request7.url.uri,"/")
+
+letrequest8=tryRequest(url:"https://someserver.com:8888/")
+XCTAssertEqual(request8.url.uri,"/")
+
+letrequest9=tryRequest(url:"https://someserver.com:8888#ref")
+XCTAssertEqual(request9.url.uri,"/")
+
+letrequest10=tryRequest(url:"https://someserver.com:8888/#ref")
+XCTAssertEqual(request10.url.uri,"/")
+
+letrequest11=tryRequest(url:"https://someserver.com/some%20path")
+XCTAssertEqual(request11.url.uri,"/some%20path")
+}
 }