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