diff options
| author | Nick Mathewson <nickm@torproject.org> | 2007-05-29 14:41:16 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2007-05-29 14:41:16 +0000 |
| commit | d509efb9b789817d3222ef6fdad33e7e1fb61339 (patch) | |
| tree | c60de4a7ab1a6a7da5a51a031904d6a00b303d71 /src/or/eventdns.c | |
| parent | 3425f2c11f3d550f241514eebfa5e1ecbb835e89 (diff) | |
| download | tor-d509efb9b789817d3222ef6fdad33e7e1fb61339.tar.gz tor-d509efb9b789817d3222ef6fdad33e7e1fb61339.zip | |
r13019@catbus: nickm | 2007-05-27 12:32:55 -0400
Merge an evdns fix from libevent r357: "evdns_shutdown fix from adam langley.
svn:r10387
Diffstat (limited to 'src/or/eventdns.c')
| -rw-r--r-- | src/or/eventdns.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/eventdns.c b/src/or/eventdns.c index 582dc8b071..a3bb3bf245 100644 --- a/src/or/eventdns.c +++ b/src/or/eventdns.c @@ -3016,6 +3016,8 @@ evdns_shutdown(int fail_requests) if (server->socket >= 0) CLOSE_SOCKET(server->socket); (void) event_del(&server->event); + if (server->state == 0) + (void) event_del(&server->timeout_event); CLEAR(server); free(server); if (server_next == server_head) |