summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--src/or/connection_edge.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e14200571e..a3f5b748dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,8 @@ Changes in version 0.2.1.12-alpha - 2009-02-??
platforms. Bugfix on 0.2.1.1-alpha.
- Fix code so authorities _actually_ send back X-Descriptor-Not-New
headers. Bugfix on 0.2.0.10-alpha.
+ - Don't consider consider expiring already-closed client connections.
+ Fixes bug 893. Bugfix on 0.0.2pre20.
o Minor features:
- Support platforms where time_t is 64 bits long. (Congratulations,
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 5454e33228..3cfac78c3b 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -401,7 +401,7 @@ connection_ap_expire_beginning(void)
smartlist_t *conns = get_connection_array();
SMARTLIST_FOREACH_BEGIN(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. */