diff options
| author | Roger Dingledine <arma@torproject.org> | 2004-03-08 01:19:57 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2004-03-08 01:19:57 +0000 |
| commit | 416993afc1f82e3c9946950e6f5554ebe36d11bc (patch) | |
| tree | 66efa40e6b184afd39b8f5c24fe61168a29e1cff | |
| parent | 6e22801e0f36463f0d037212e1992c103f8dfc3d (diff) | |
| download | tor-416993afc1f82e3c9946950e6f5554ebe36d11bc.tar.gz tor-416993afc1f82e3c9946950e6f5554ebe36d11bc.zip | |
bugfix: only set conn->hold_open_until_flushed after marking
svn:r1245
| -rw-r--r-- | src/or/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/main.c b/src/or/main.c index 10dc270352..766fcfb6b7 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -305,8 +305,8 @@ static void run_connection_housekeeping(int i, time_t now) { log_fn(LOG_INFO,"Expiring connection to %d (%s:%d).", i,conn->address, conn->port); /* flush anything waiting, e.g. a destroy for a just-expired circ */ - conn->hold_open_until_flushed = 1; connection_mark_for_close(conn,0); + conn->hold_open_until_flushed = 1; } else { /* either a full router, or we've got a circuit. send a padding cell. */ log_fn(LOG_DEBUG,"Sending keepalive to (%s:%d)", |