diff options
| author | Nick Mathewson <nickm@torproject.org> | 2009-01-28 16:30:06 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2009-01-28 16:30:06 +0000 |
| commit | 8027c8c6dd20ab285684db7aa0738cd5898e2aef (patch) | |
| tree | d5528a303e93914e1ce8864cfc1b2369fb4332d0 | |
| parent | ef001cf85d07039ebacf6dadb4cb81dc58a30620 (diff) | |
| download | tor-8027c8c6dd20ab285684db7aa0738cd5898e2aef.tar.gz tor-8027c8c6dd20ab285684db7aa0738cd5898e2aef.zip | |
Forward-port: Fix bug 893: check AP connections for markedness before expiring them.
svn:r18299
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | src/or/connection_edge.c | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -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. */ |