nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 15:43:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
svn:r18299
This commit is contained in:
Nick Mathewson 2009-01-28 16:30:06 +00:00
parent ef001cf85d
commit 8027c8c6dd
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -13,6 +13,8 @@ Changes in version 0.2.1.12-alpha - 2009-02-??
platforms. Bugfix on 0.2.1.1-alpha. platforms. Bugfix on 0.2.1.1-alpha.
- Fix code so authorities _actually_ send back X-Descriptor-Not-New - Fix code so authorities _actually_ send back X-Descriptor-Not-New
headers. Bugfix on 0.2.0.10-alpha. 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: o Minor features:
- Support platforms where time_t is 64 bits long. (Congratulations, - Support platforms where time_t is 64 bits long. (Congratulations,

2
src/or/connection_edge.c
View File

@ -401,7 +401,7 @@ connection_ap_expire_beginning(void)
smartlist_t *conns = get_connection_array(); smartlist_t *conns = get_connection_array();
SMARTLIST_FOREACH_BEGIN(conns, connection_t *, c) { SMARTLIST_FOREACH_BEGIN(conns, connection_t *, c) {
if (c->type != CONN_TYPE_AP) if (c->type != CONN_TYPE_AP || c->marked_for_close)
continue; continue;
conn = TO_EDGE_CONN(c); conn = TO_EDGE_CONN(c);
/* if it's an internal linked connection, don't yell its status. */ /* if it's an internal linked connection, don't yell its status. */