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

Merge branch 'maint-0.2.8' into maint-0.2.9

parents eaaa1108 f7151387
Loading
Loading
Loading
Loading

changes/bug24167

0 → 100644
+7 −0
Original line number Diff line number Diff line
  o Minor bugfixes (network layer):
    - When closing a connection via close_connection_immediately(), we
      mark it as "not blocked on bandwidth", to prevent later calls
      from trying to unblock it, and give it permission to read. This
      fixes a backtrace warning that can happen on relays under various
      circumstances. Fixes bug 24167; bugfix on 0.1.0.1-rc.
+4 −0
Original line number Diff line number Diff line
@@ -752,6 +752,10 @@ connection_close_immediate(connection_t *conn)

  connection_unregister_events(conn);

  /* Prevent the event from getting unblocked. */
  conn->read_blocked_on_bw =
    conn->write_blocked_on_bw = 0;

  if (SOCKET_OK(conn->s))
    tor_close_socket(conn->s);
  conn->s = TOR_INVALID_SOCKET;