diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-12-06 14:37:53 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-12-06 14:37:53 -0500 |
| commit | d4ca18573ccd0164f4d867e41a8f453119ce421f (patch) | |
| tree | 2ef137677c12499c7fe4e88bb6b5c47c761f8da3 /src/or | |
| parent | 779e4b9dcf850770a7c30104f714f4a59c2955a8 (diff) | |
| parent | 1a55a5ff06f9022a115943248b0eeb9d3c67c6c8 (diff) | |
| download | tor-d4ca18573ccd0164f4d867e41a8f453119ce421f.tar.gz tor-d4ca18573ccd0164f4d867e41a8f453119ce421f.zip | |
Merge remote-tracking branch 'dgoulet/bug24502_032_01' into maint-0.3.2
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/scheduler_kist.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/or/scheduler_kist.c b/src/or/scheduler_kist.c index fea92705d4..3d8f553ac2 100644 --- a/src/or/scheduler_kist.c +++ b/src/or/scheduler_kist.c @@ -606,9 +606,12 @@ kist_scheduler_run(void) * fails leading to the channel to be closed which triggers a release * and free its entry in the socket table. And because of a engineering * design issue, the error is not propagated back so we don't get an - * error at this poin. So before we continue, make sure the channel is + * error at this point. So before we continue, make sure the channel is * open and if not just ignore it. See #23751. */ if (!CHANNEL_IS_OPEN(chan)) { + /* Channel isn't open so we put it back in IDLE mode. It is either + * renegotiating its TLS session or about to be released. */ + chan->scheduler_state = SCHED_CHAN_IDLE; continue; } /* flush_result has the # cells flushed */ |