From 1d55b069028e2ca8dd8cd7c270b8e08a5daa9d1f Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Wed, 28 Jan 2009 16:29:58 +0000 Subject: Fix bug 893: check AP connections for markedness before expiring them. svn:r18298 --- ChangeLog | 4 +++- src/or/connection_edge.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4106848d1a..dd30a3dad0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,9 @@ Changes in version 0.2.0.34 - 2009-??-?? o Minor bugfixes: - - Fix compilation on systems where time-t is a 64-bit integer. + - Fix compilation on systems where time_t is a 64-bit integer. Patch from Matthias Drochner. + - Don't consider consider expiring already-closed client connections. + Fixes bug 893. Bugfix on 0.0.2pre20. Changes in version 0.2.0.33 - 2009-01-21 diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 6044d6b877..ccb26a5156 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -361,7 +361,7 @@ connection_ap_expire_beginning(void) SMARTLIST_FOREACH(conns, connection_t *, c, { - if (c->type != CONN_TYPE_AP) + if (c->type != CONN_TYPE_AP || c->marked_for_close) continue; conn = TO_EDGE_CONN(c); /* if it's an internal linked connection, don't yell its status. */ -- cgit v1.2.3-54-g00ecf