diff options
| author | Nick Mathewson <nickm@torproject.org> | 2009-01-28 16:29:58 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2009-01-28 16:29:58 +0000 |
| commit | 1d55b069028e2ca8dd8cd7c270b8e08a5daa9d1f (patch) | |
| tree | 1fdc08b956fc9630920cdeabc9e8388611108a02 | |
| parent | 5e457a1f77e000c3746bba8780485107f677c78d (diff) | |
| download | tor-1d55b069028e2ca8dd8cd7c270b8e08a5daa9d1f.tar.gz tor-1d55b069028e2ca8dd8cd7c270b8e08a5daa9d1f.zip | |
Fix bug 893: check AP connections for markedness before expiring them.
svn:r18298
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | src/or/connection_edge.c | 2 |
2 files changed, 4 insertions, 2 deletions
@@ -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. */ |