Merge branch 'master' into fix_handler_error_after_error

Author: artemredkin

Sources/AsyncHTTPClient/HTTPHandler.swift

@@ -562,7 +562,7 @@ extension HTTPClient {
         var connection: Connection?
         var cancelled: Bool
         let lock: Lock
-        let logger: Logger // We are okay to store the logger here because a Task is for only ond request.
+        let logger: Logger // We are okay to store the logger here because a Task is for only one request.
 
         init(eventLoop: EventLoop, logger: Logger) {
             self.eventLoop = eventLoop

Tests/AsyncHTTPClientTests/HTTPClientInternalTests+XCTest.swift

@@ -46,6 +46,7 @@ extension HTTPClientInternalTests {
             ("testConnectErrorCalloutOnCorrectEL", testConnectErrorCalloutOnCorrectEL),
             ("testInternalRequestURI", testInternalRequestURI),
             ("testBodyPartStreamStateChangedBeforeNotification", testBodyPartStreamStateChangedBeforeNotification),
+            ("testHandlerDoubleError", testHandlerDoubleError),
         ]
     }
 }

Tests/AsyncHTTPClientTests/HTTPClientInternalTests.swift

@@ -1091,7 +1091,7 @@ class HTTPClientInternalTests: XCTestCase {
                 self.count += 1
             }
 
-            func didFinishRequest(task: HTTPClient.Task<Void>) throws -> Void {
+            func didFinishRequest(task: HTTPClient.Task<Void>) throws {
                 return ()
             }
         }

Tests/AsyncHTTPClientTests/HTTPClientTests+XCTest.swift

@@ -122,6 +122,7 @@ extension HTTPClientTests {
             ("testContentLengthTooShortFails", testContentLengthTooShortFails),
             ("testBodyUploadAfterEndFails", testBodyUploadAfterEndFails),
             ("testNoBytesSentOverBodyLimit", testNoBytesSentOverBodyLimit),
+            ("testDoubleError", testDoubleError),
         ]
     }
 }

Tests/AsyncHTTPClientTests/HTTPClientTests.swift

@@ -2625,6 +2625,6 @@ class HTTPClientTests: XCTestCase {
 
         // We specify a deadline of 2 ms co that request will be timed out before all chunks are writtent,
         // we need to verify that second error on write after timeout does not lead to double-release.
-        XCTAssertThrowsError(try defaultClient.execute(request: request, deadline: .now() + .milliseconds(2)).wait())
+        XCTAssertThrowsError(try self.defaultClient.execute(request: request, deadline: .now() + .milliseconds(2)).wait())
     }
 }