diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-10-31 14:09:18 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-10-31 14:09:18 -0400 |
| commit | 702c0502cf3121e2e698963cf53adb00ae2d136d (patch) | |
| tree | 74f650cab5dc988b44f2ac51289d7b5b24f45e70 /src/or/connection.c | |
| parent | 8676a08362a192f17f2850359b16933c2a5786dd (diff) | |
| parent | 9205552daab22aaa5178f2abbe169bb79f0cf8e3 (diff) | |
| download | tor-702c0502cf3121e2e698963cf53adb00ae2d136d.tar.gz tor-702c0502cf3121e2e698963cf53adb00ae2d136d.zip | |
Merge remote-tracking branch 'public/bug9731'
Diffstat (limited to 'src/or/connection.c')
| -rw-r--r-- | src/or/connection.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/or/connection.c b/src/or/connection.c index 96d1c482a8..43ec43f43b 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -2696,6 +2696,9 @@ connection_consider_empty_read_buckets(connection_t *conn) } else return; /* all good, no need to stop it */ + if (!connection_is_rate_limited(conn)) + return; /* Always okay. */ + LOG_FN_CONN(conn, (LOG_DEBUG, LD_NET, "%s", reason)); conn->read_blocked_on_bw = 1; connection_stop_reading(conn); @@ -2720,6 +2723,9 @@ connection_consider_empty_write_buckets(connection_t *conn) } else return; /* all good, no need to stop it */ + if (!connection_is_rate_limited(conn)) + return; /* Always okay. */ + LOG_FN_CONN(conn, (LOG_DEBUG, LD_NET, "%s", reason)); conn->write_blocked_on_bw = 1; connection_stop_writing(conn); |