summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-02-12 15:10:50 -0500
committerNick Mathewson <nickm@torproject.org>2013-02-13 11:41:11 -0500
commit5623e803713507daec7e7109fbc573729c90501e (patch)
treefe718afdb16fa5975faf44e30abad1bdf1296085
parent74e52db45d35b89997266b9657f36a4f022697d1 (diff)
downloadlibevent-5623e803713507daec7e7109fbc573729c90501e.tar.gz
Make event_remove_timer behave correctly with persistent timers
-rw-r--r--event.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/event.c b/event.c
index fb20f696..b5d9e7b8 100644
--- a/event.c
+++ b/event.c
@@ -2207,6 +2207,7 @@ event_remove_timer_nolock_(struct event *ev)
/* If it's not pending on a timeout, we don't need to do anything. */
if (ev->ev_flags & EVLIST_TIMEOUT) {
event_queue_remove_timeout(base, ev);
+ evutil_timerclear(&ev->ev_.ev_io.ev_timeout);
}
return (0);