diff options
| author | Roger Dingledine <arma@torproject.org> | 2005-01-04 11:26:08 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2005-01-04 11:26:08 +0000 |
| commit | 814dd946f0fcc6f34ca2e92c2b970cb641e770c3 (patch) | |
| tree | e9348eadb97034d88386e435dbc026433f64847b /src/or/dns.c | |
| parent | ba8690373adffdcac1106bcd298e7deb00329186 (diff) | |
| download | tor-814dd946f0fcc6f34ca2e92c2b970cb641e770c3.tar.gz tor-814dd946f0fcc6f34ca2e92c2b970cb641e770c3.zip | |
fix duplicate dns_cancel_pending_resolve reported by Giorgos Pallas
svn:r3293
Diffstat (limited to 'src/or/dns.c')
| -rw-r--r-- | src/or/dns.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/or/dns.c b/src/or/dns.c index ac24de2433..e70b277c36 100644 --- a/src/or/dns.c +++ b/src/or/dns.c @@ -568,7 +568,10 @@ int connection_dns_finished_flushing(connection_t *conn) { int connection_dns_reached_eof(connection_t *conn) { log_fn(LOG_WARN,"Read eof. Worker died unexpectedly."); if (conn->state == DNSWORKER_STATE_BUSY) { - dns_cancel_pending_resolve(conn->address); + /* don't cancel the resolve here -- it would be cancelled in + * connection_about_to_close_connection(), since conn is still + * in state BUSY + */ num_dnsworkers_busy--; } num_dnsworkers--; |