mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-10 13:13:44 +01:00
Merge remote-tracking branch 'public/bug9731b' into maint-0.2.4
This commit is contained in:
commit
db2c2a6909
3
changes/bug9731
Normal file
3
changes/bug9731
Normal file
@ -0,0 +1,3 @@
|
||||
o Major bugfixes:
|
||||
- Do not apply connection_consider_empty_read/write_buckets to
|
||||
cpuworker connections.
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user