Commit db2c2a69 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Merge remote-tracking branch 'public/bug9731b' into maint-0.2.4

parents 1b312f7b c5532889

changes/bug9731

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  o Major bugfixes:

    - Do not apply connection_consider_empty_read/write_buckets to

      cpuworker connections.

src/or/connection.c

+6 −0
Original line number Diff line number Diff line
@@ -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);