Permalink
Browse files

from trunk: do not delete uninitialized timeout event in evdns

svn:r698
  • Loading branch information...
1 parent f817b5f commit 937230a8bdd7d8f266fbb58463261351fe09a236 @provos provos committed Mar 31, 2008
Showing with 3 additions and 1 deletion.
  1. +1 −0 ChangeLog
  2. +2 −1 evdns.c
View
@@ -5,6 +5,7 @@ Changes in 1.4.3-stable:
o make event_rpcgen.py generate code include event-config.h; reported by Sam Banks.
o make event methods static so that they are not exported; from Andrei Nigmatulin
o make RPC replies use application/octet-stream as mime type
+ o do not delete uninitialized timeout event in evdns
Changes in 1.4.2-rc:
o remove pending timeouts on event_base_free()
View
@@ -2020,7 +2020,8 @@ evdns_clear_nameservers_and_suspend(void)
while (1) {
struct nameserver *next = server->next;
(void) event_del(&server->event);
- (void) evtimer_del(&server->timeout_event);
+ if (evtimer_initialized(&server->timeout_event))
+ (void) evtimer_del(&server->timeout_event);
if (server->socket >= 0)
CLOSE_SOCKET(server->socket);
free(server);

0 comments on commit 937230a

Please sign in to comment.