aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2012-06-15 03:28:18 -0400
committerRoger Dingledine <arma@torproject.org>2012-06-15 03:28:18 -0400
commit5625812f9abc5f13dbaa12e89553ac636e23794d (patch)
tree580baf4b76eb4d9dc586941020adb4c0c9f15cdf
parent427d4dd1480b00f443e211377bf8c9d12a759876 (diff)
downloadtor-5625812f9abc5f13dbaa12e89553ac636e23794d.tar.gz
tor-5625812f9abc5f13dbaa12e89553ac636e23794d.zip
tab-man returneth (this time using the name 'rob')
-rw-r--r--src/or/main.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/or/main.c b/src/or/main.c
index 5c5dbf1609..d9d64ced4b 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -849,11 +849,12 @@ conn_close_if_marked(int i)
(int)conn->s));
conn->timestamp_lastwritten = now; /* reset so we can flush more */
} else if (sz == 0) { /* retval is also 0 */
- /* Connection must flush before closing, but it's being rate-limited.
- Let's remove from Libevent, and mark it as blocked on bandwidth so it
- will be re-added on next token bucket refill. Prevents busy Libevent
- loops where we keep ending up here and returning 0 until we are no
- longer blocked on bandwidth. */
+ /* Connection must flush before closing, but it's being rate-limited.
+ * Let's remove from Libevent, and mark it as blocked on bandwidth
+ * so it will be re-added on next token bucket refill. Prevents
+ * busy Libevent loops where we keep ending up here and returning
+ * 0 until we are no longer blocked on bandwidth.
+ */
if (connection_is_writing(conn)) {
conn->write_blocked_on_bw = 1;
connection_stop_writing(conn);