diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-10-31 14:08:28 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-10-31 14:08:28 -0400 |
| commit | db2c2a69091724037e0e6dd0c58f0b18558ce437 (patch) | |
| tree | 56aae78b3fcfc483ed2b48112cba8bf14ad97ed3 | |
| parent | 1b312f7b55bc5322f3029ad12715d9f348d44650 (diff) | |
| parent | c5532889a8e4b2788253c420af6568820483147c (diff) | |
| download | tor-db2c2a69091724037e0e6dd0c58f0b18558ce437.tar.gz tor-db2c2a69091724037e0e6dd0c58f0b18558ce437.zip | |
Merge remote-tracking branch 'public/bug9731b' into maint-0.2.4
| -rw-r--r-- | changes/bug9731 | 3 | ||||
| -rw-r--r-- | src/or/connection.c | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/changes/bug9731 b/changes/bug9731 new file mode 100644 index 0000000000..828496af3f --- /dev/null +++ b/changes/bug9731 @@ -0,0 +1,3 @@ + o Major bugfixes: + - Do not apply connection_consider_empty_read/write_buckets to + cpuworker connections. diff --git a/src/or/connection.c b/src/or/connection.c index 6e754a0f7a..78cc31e894 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -2483,6 +2483,9 @@ connection_consider_empty_read_buckets(connection_t *conn) } else return; /* all good, no need to stop it */ + if (conn->type == CONN_TYPE_CPUWORKER) + return; /* Always okay. */ + LOG_FN_CONN(conn, (LOG_DEBUG, LD_NET, "%s", reason)); conn->read_blocked_on_bw = 1; connection_stop_reading(conn); @@ -2507,6 +2510,9 @@ connection_consider_empty_write_buckets(connection_t *conn) } else return; /* all good, no need to stop it */ + if (conn->type == CONN_TYPE_CPUWORKER) + return; /* Always okay. */ + LOG_FN_CONN(conn, (LOG_DEBUG, LD_NET, "%s", reason)); conn->write_blocked_on_bw = 1; connection_stop_writing(conn); |