Skip to content

Commit 7a1d625

Browse files
committed
remove init with HTTPVersion
1 parent 5993903 commit 7a1d625

File tree

2 files changed

+7
-24
lines changed

2 files changed

+7
-24
lines changed

Diff for: Sources/AsyncHTTPClient/HTTPClient.swift

+1-22
Original file line numberDiff line numberDiff line change
@@ -618,35 +618,14 @@ public class HTTPClient {
618618
proxy: Proxy? = nil,
619619
ignoreUncleanSSLShutdown: Bool = false,
620620
decompression: Decompression = .disabled
621-
) {
622-
self.init(
623-
tlsConfiguration: tlsConfiguration,
624-
redirectConfiguration: redirectConfiguration,
625-
timeout: timeout, connectionPool: connectionPool,
626-
proxy: proxy,
627-
ignoreUncleanSSLShutdown: ignoreUncleanSSLShutdown,
628-
decompression: decompression,
629-
httpVersion: .automatic
630-
)
631-
}
632-
633-
internal init(
634-
tlsConfiguration: TLSConfiguration? = nil,
635-
redirectConfiguration: RedirectConfiguration? = nil,
636-
timeout: Timeout = Timeout(),
637-
connectionPool: ConnectionPool = ConnectionPool(),
638-
proxy: Proxy? = nil,
639-
ignoreUncleanSSLShutdown: Bool = false,
640-
decompression: Decompression = .disabled,
641-
httpVersion: HTTPVersion
642621
) {
643622
self.tlsConfiguration = tlsConfiguration
644623
self.redirectConfiguration = redirectConfiguration ?? RedirectConfiguration()
645624
self.timeout = timeout
646625
self.connectionPool = connectionPool
647626
self.proxy = proxy
648627
self.decompression = decompression
649-
self.httpVersion = httpVersion
628+
self.httpVersion = .automatic
650629
}
651630

652631
public init(tlsConfiguration: TLSConfiguration? = nil,

Diff for: Tests/AsyncHTTPClientTests/HTTP2ConnectionTests.swift

+6-2
Original file line numberDiff line numberDiff line change
@@ -250,10 +250,12 @@ class TestConnectionCreator {
250250

251251
var tlsConfiguration = TLSConfiguration.makeClientConfiguration()
252252
tlsConfiguration.certificateVerification = .none
253+
var config = HTTPClient.Configuration()
254+
config.httpVersion = .automatic
253255
let factory = HTTPConnectionPool.ConnectionFactory(
254256
key: .init(request),
255257
tlsConfiguration: tlsConfiguration,
256-
clientConfiguration: .init(httpVersion: .automatic),
258+
clientConfiguration: config,
257259
sslContextCache: .init()
258260
)
259261

@@ -291,10 +293,12 @@ class TestConnectionCreator {
291293

292294
var tlsConfiguration = TLSConfiguration.makeClientConfiguration()
293295
tlsConfiguration.certificateVerification = .none
296+
var config = HTTPClient.Configuration()
297+
config.httpVersion = .automatic
294298
let factory = HTTPConnectionPool.ConnectionFactory(
295299
key: .init(request),
296300
tlsConfiguration: tlsConfiguration,
297-
clientConfiguration: .init(httpVersion: .automatic),
301+
clientConfiguration: config,
298302
sslContextCache: .init()
299303
)
300304

0 commit comments

Comments
 (0)