commit b1891068f1cd1513e8ffba0be6d5ca7050f5e689
parent 0ba05092ad16c37ef12db37816b06f160e4cfcb8
Author: Nick Mathewson <nickm@torproject.org>
Date: Wed, 17 Oct 2018 13:02:23 -0400
Merge branch 'maint-0.3.4'
Diffstat:
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/changes/ticket28089 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/core/mainloop/connection.c b/src/core/mainloop/connection.c
@@ -3308,7 +3308,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();
}