From 3742868ab54c82bc77686f8f89f3cae7191a2fe1 Mon Sep 17 00:00:00 2001
From: Niels Provos <provos@gmail.com>
Date: Mon, 12 Nov 2007 06:54:35 +0000
Subject: [PATCH] We do not need to specially remove a timeout before calling
 event_del; patch from Christopher Layne.

svn:r519
---
 ChangeLog | 1 +
 event.c   | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 68382680..57b6d171 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -49,3 +49,4 @@ Changes in current version:
  o Remove a bash-ism in autogen.sh
  o When calling event_del on a signal, restore the signal handler's previous value rather than setting it to SIG_DFL. Patch from Christopher Layne.
  o Make the logic for active events work better with internal events; patch from Christopher Layne.
+ o We do not need to specially remove a timeout before calling event_del; patch from Christopher Layne.
diff --git a/event.c b/event.c
index f24b4748..6fc82dbb 100644
--- a/event.c
+++ b/event.c
@@ -815,7 +815,6 @@ timeout_process(struct event_base *base)
 	while ((ev = min_heap_top(&base->timeheap))) {
 		if (evutil_timercmp(&ev->ev_timeout, &now, >))
 			break;
-		event_queue_remove(base, ev, EVLIST_TIMEOUT);
 
 		/* delete this event from the I/O queues */
 		event_del(ev);