From 9b268b6c775fd380b997d4fb11e1c00c4dce1ccb Mon Sep 17 00:00:00 2001
From: Deomid Ryabkov <rojer@cesanta.com>
Date: Sat, 21 Oct 2017 09:24:35 +0100
Subject: [PATCH] Fix timer handling
ev_timer_time may remain the same for legit reason, so to prevent looping, instead, reset it before invoking the handler.
To let user know what the initial setting was, pass it as the argument instead of current time (which is kind of pointless).
PUBLISHED_FROM=fa328009f097f9b49b5b0dd13a38ee6d6e6518de
---
mongoose.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/mongoose.c b/mongoose.c
index 8f4379baf..69c7d7b0f 100644
--- a/mongoose.c
+++ b/mongoose.c
@@ -2270,14 +2270,8 @@ MG_INTERNAL void mg_call(struct mg_connection *nc,
void mg_if_timer(struct mg_connection *c, double now) {
if (c->ev_timer_time > 0 && now >= c->ev_timer_time) {
double old_value = c->ev_timer_time;
- mg_call(c, NULL, c->user_data, MG_EV_TIMER, &now);
- /*
- * To prevent timer firing all the time, reset the timer after delivery.
- * However, in case user sets it to new value, do not reset.
- */
- if (c->ev_timer_time == old_value) {
- c->ev_timer_time = 0;
- }
+ c->ev_timer_time = 0;
+ mg_call(c, NULL, c->user_data, MG_EV_TIMER, &old_value);
}
}
--
GitLab