BUG/MINOR: mux_quic: make sure to always apply offsets to now_ms in expiration

Now_ms can be zero nowadays, so it's not suitable for direct assignment to
t->expire, as there's a risk that the timer never wakes up once assigned
(TICK_ETERNITY). Let's use tick_add(now_ms, 0) for an immediate wakeup
instead. The impact looks nul since the task is also woken up, but better
not leave such tasks in the timer tree anyway.

This should be backported where it applies.

(cherry picked from commit f66bfcff96082ce5c98c635c5da7a9ba157a20af)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>

diff --git a/src/mux_quic.c b/src/mux_quic.c
index d8dcd50..d7ad45d 100644 (file)
--- a/src/mux_quic.c
+++ b/src/mux_quic.c
@@ -345,7 +345,7 @@ static void qcc_refresh_timeout(struct qcc *qcc)
                                        /* We are past the soft close window end, wake the timeout
                                         * task up immediately.
                                         */
-                                       qcc->task->expire = now_ms;
+                                       qcc->task->expire = tick_add(now_ms, 0);
                                        task_wakeup(qcc->task, TASK_WOKEN_TIMER);
                                }
                        }