Forward-port: Fix bug 893: check AP connections for markedness before expiring them.

svn:r18299

diff --git a/ChangeLog b/ChangeLog
index e14200571e0fdb96c7e78d35f501e574b40202b9..a3f5b748dc36d51e161c2b273772403c6f83198f 100644 (file)
--- 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 5454e33228ac78f5eda325f489491a169ff9c5df..3cfac78c3b2ef127872ff3136821bda1dd4d8243 100644 (file)
--- 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. */