@@ -87,8 +87,6 @@ extension HTTPClient {
87
87
88
88
/// Represent HTTP request.
89
89
public struct Request {
90
- /// Request HTTP version, defaults to `HTTP/1.1`.
91
- public let version : HTTPVersion
92
90
/// Request HTTP method, defaults to `GET`.
93
91
public let method : HTTPMethod
94
92
/// Remote URL.
@@ -115,12 +113,12 @@ extension HTTPClient {
115
113
/// - `emptyScheme` if URL does not contain HTTP scheme.
116
114
/// - `unsupportedScheme` if URL does contains unsupported HTTP scheme.
117
115
/// - `emptyHost` if URL does not contains a host.
118
- public init ( url: String , version : HTTPVersion = HTTPVersion ( major : 1 , minor : 1 ) , method: HTTPMethod = . GET, headers: HTTPHeaders = HTTPHeaders ( ) , body: Body ? = nil ) throws {
116
+ public init ( url: String , method: HTTPMethod = . GET, headers: HTTPHeaders = HTTPHeaders ( ) , body: Body ? = nil ) throws {
119
117
guard let url = URL ( string: url) else {
120
118
throw HTTPClientError . invalidURL
121
119
}
122
120
123
- try self . init ( url: url, version : version , method: method, headers: headers, body: body)
121
+ try self . init ( url: url, method: method, headers: headers, body: body)
124
122
}
125
123
126
124
/// Create an HTTP `Request`.
@@ -135,7 +133,7 @@ extension HTTPClient {
135
133
/// - `emptyScheme` if URL does not contain HTTP scheme.
136
134
/// - `unsupportedScheme` if URL does contains unsupported HTTP scheme.
137
135
/// - `emptyHost` if URL does not contains a host.
138
- public init ( url: URL , version : HTTPVersion = HTTPVersion ( major : 1 , minor : 1 ) , method: HTTPMethod = . GET, headers: HTTPHeaders = HTTPHeaders ( ) , body: Body ? = nil ) throws {
136
+ public init ( url: URL , method: HTTPMethod = . GET, headers: HTTPHeaders = HTTPHeaders ( ) , body: Body ? = nil ) throws {
139
137
guard let scheme = url. scheme? . lowercased ( ) else {
140
138
throw HTTPClientError . emptyScheme
141
139
}
@@ -148,7 +146,6 @@ extension HTTPClient {
148
146
throw HTTPClientError . emptyHost
149
147
}
150
148
151
- self . version = version
152
149
self . method = method
153
150
self . url = url
154
151
self . scheme = scheme
@@ -444,10 +441,10 @@ internal class TaskHandler<T: HTTPClientResponseDelegate>: ChannelInboundHandler
444
441
self . state = . idle
445
442
let request = unwrapOutboundIn ( data)
446
443
447
- var head = HTTPRequestHead ( version: request . version , method: request. method, uri: request. url. uri)
444
+ var head = HTTPRequestHead ( version: HTTPVersion ( major : 1 , minor : 1 ) , method: request. method, uri: request. url. uri)
448
445
var headers = request. headers
449
446
450
- if request . version . major == 1 , request . version . minor == 1 , !request. headers. contains ( name: " Host " ) {
447
+ if !request. headers. contains ( name: " Host " ) {
451
448
headers. add ( name: " Host " , value: request. host)
452
449
}
453
450
@@ -680,7 +677,7 @@ internal struct RedirectHandler<T> {
680
677
}
681
678
682
679
do {
683
- let newRequest = try HTTPClient . Request ( url: redirectURL, version : originalRequest . version , method: method, headers: headers, body: body)
680
+ let newRequest = try HTTPClient . Request ( url: redirectURL, method: method, headers: headers, body: body)
684
681
return self . execute ( newRequest) . futureResult. cascade ( to: promise)
685
682
} catch {
686
683
return promise. fail ( error)
0 commit comments