diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-10-17 13:02:23 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-10-17 13:02:23 -0400 |
| commit | 8400bccb165d6786085566fd1fbe5e65505298f3 (patch) | |
| tree | 1fad58b6ba90868c8e90f24a51fca14ea9963063 | |
| parent | f8aad4a5486b3adb53d07eb74e912f9c92d63b00 (diff) | |
| parent | 2000d04cb67fa1ee88105e61666dceba40b8c368 (diff) | |
| download | tor-8400bccb165d6786085566fd1fbe5e65505298f3.tar.gz tor-8400bccb165d6786085566fd1fbe5e65505298f3.zip | |
Merge branch 'maint-0.3.4' into release-0.3.4
| -rw-r--r-- | changes/ticket28089 | 6 | ||||
| -rw-r--r-- | src/or/connection.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/changes/ticket28089 b/changes/ticket28089 new file mode 100644 index 0000000000..a900ec18f5 --- /dev/null +++ b/changes/ticket28089 @@ -0,0 +1,6 @@ + o Major bugfixes (relay): + - When our write bandwidth limit is exhausted, stop writing on the + connection. Previously, we had a typo in the code that would make us stop + reading leading to relay connections being stuck indefinitely. Fixes bug + 28089; bugfix on 0.3.4.1-alpha. + diff --git a/src/or/connection.c b/src/or/connection.c index 7283a81043..0a2a635096 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -3111,7 +3111,7 @@ connection_write_bw_exhausted(connection_t *conn, bool is_global_bw) { (void)is_global_bw; conn->write_blocked_on_bw = 1; - connection_stop_reading(conn); + connection_stop_writing(conn); reenable_blocked_connection_schedule(); } |