Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

workaround Foundation.URL behavior changes #777

Merged
merged 1 commit into from
Oct 3, 2024
Merged

workaround Foundation.URL behavior changes #777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Sources/AsyncHTTPClient/AsyncAwait/HTTPClientRequest+Prepared.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ extension HTTPClientRequest {
@available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *)
extension HTTPClientRequest.Prepared {
init(_ request: HTTPClientRequest, dnsOverride: [String: String] = [:]) throws {
guard let url = URL(string: request.url) else {
guard !request.url.isEmpty, let url = URL(string: request.url) else {
throw HTTPClientError.invalidURL
}

Expand Down
30 changes: 30 additions & 0 deletions Sources/AsyncHTTPClient/DeconstructedURL.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,16 @@ extension DeconstructedURL {

switch scheme {
case .http, .https:
#if !canImport(Darwin) && compiler(>=6.0)
guard let urlHost = url.host, !urlHost.isEmpty else {
throw HTTPClientError.emptyHost
}
let host = urlHost.trimIPv6Brackets()
#else
guard let host = url.host, !host.isEmpty else {
throw HTTPClientError.emptyHost
}
#endif
self.init(
scheme: scheme,
connectionTarget: .init(remoteHost: host, port: url.port ?? scheme.defaultPort),
Expand Down Expand Up @@ -81,3 +88,26 @@ extension DeconstructedURL {
}
}
}

#if !canImport(Darwin) && compiler(>=6.0)
extension String {
@inlinable internal func trimIPv6Brackets() -> String {
var utf8View = self.utf8[...]

var modified = false
if utf8View.first == UInt8(ascii: "[") {
utf8View = utf8View.dropFirst()
modified = true
}
if utf8View.last == UInt8(ascii: "]") {
utf8View = utf8View.dropLast()
modified = true
}

if modified {
return String(Substring(utf8View))
}
return self
}
}
#endif
6 changes: 5 additions & 1 deletion Tests/AsyncHTTPClientTests/HTTPClientTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,12 @@ final class HTTPClientTests: XCTestCaseHTTPClientTestsBaseClass {
XCTAssertEqual(request2.url.path, "")

let request3 = try Request(url: "unix:///tmp/file")
XCTAssertNil(request3.url.host)
XCTAssertEqual(request3.host, "")
#if os(Linux) && compiler(>=6.0)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same note here.

XCTAssertEqual(request3.url.host, "")
#else
XCTAssertNil(request3.url.host)
#endif
XCTAssertEqual(request3.url.path, "/tmp/file")
XCTAssertEqual(request3.port, 80)
XCTAssertFalse(request3.useTLS)
Expand Down