File tree Expand file tree Collapse file tree 2 files changed +4
-8
lines changed Expand file tree Collapse file tree 2 files changed +4
-8
lines changed Original file line number Diff line number Diff line change @@ -594,7 +594,6 @@ extension RequestBag.StateMachine {
594
594
enum FailAction {
595
595
case failTask( Error , HTTPRequestScheduler ? , HTTPRequestExecutor ? )
596
596
case cancelExecutor( HTTPRequestExecutor )
597
- case propagateCancellation
598
597
case none
599
598
}
600
599
@@ -625,11 +624,8 @@ extension RequestBag.StateMachine {
625
624
self . state = . finished( error: error)
626
625
return . failTask( error, nil , nil )
627
626
case . finished( . none) :
628
- if ( error as? HTTPClientError ) == . cancelled {
629
- return . propagateCancellation
630
- } else {
631
- return . none
632
- }
627
+ // An error occurred after the request has finished. Ignore...
628
+ return . none
633
629
case . deadlineExceededWhileQueued:
634
630
let realError : Error = {
635
631
if ( error as? HTTPClientError ) == . cancelled {
Original file line number Diff line number Diff line change @@ -361,6 +361,8 @@ final class RequestBag<Delegate: HTTPClientResponseDelegate> {
361
361
let action = self . state. fail ( error)
362
362
363
363
self . executeFailAction0 ( action)
364
+
365
+ self . redirectTask? . cancel ( )
364
366
}
365
367
366
368
private func executeFailAction0( _ action: RequestBag < Delegate > . StateMachine . FailAction ) {
@@ -371,8 +373,6 @@ final class RequestBag<Delegate: HTTPClientResponseDelegate> {
371
373
self . failTask0 ( error)
372
374
case . cancelExecutor( let executor) :
373
375
executor. cancelRequest ( self )
374
- case . propagateCancellation:
375
- self . redirectTask? . cancel ( )
376
376
case . none:
377
377
break
378
378
}
You can’t perform that action at this time.
0 commit comments