[or-cvs] r10387: Merge an evdns fix from libevent r357: "evdns_shutdown fix f (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-05-29 10:41:16 -0400 (Tue, 29 May 2007)
New Revision: 10387

Modified:
   tor/trunk/
   tor/trunk/src/or/eventdns.c
Log:
 r13019 at catbus:  nickm | 2007-05-27 12:32:55 -0400
 Merge an evdns fix from libevent r357: "evdns_shutdown fix from adam langley.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r13019] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/src/or/eventdns.c
===================================================================
--- tor/trunk/src/or/eventdns.c	2007-05-29 10:00:10 UTC (rev 10386)
+++ tor/trunk/src/or/eventdns.c	2007-05-29 14:41:16 UTC (rev 10387)
@@ -3016,6 +3016,8 @@
 		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)