pgsql: oauth: Remove expired timers from the multiplexer

From: Jacob Champion <jchampion(at)postgresql(dot)org>
To: pgsql-committers(at)lists(dot)postgresql(dot)org
Subject: pgsql: oauth: Remove expired timers from the multiplexer
Date: 2025-08-08 16:07:27
Message-ID: [email protected]
Views: Whole Thread | Raw Message | Download mbox | Resend email
Thread:
Lists: pgsql-committers

oauth: Remove expired timers from the multiplexer

In a case similar to the previous commit, an expired timer can remain
permanently readable if Curl does not remove the timeout itself. Since
that removal isn't guaranteed to happen in real-world situations,
implement drain_timer_events() to reset the timer before calling into
drive_request().

Moving to drain_timer_events() happens to fix a logic bug in the
previous caller of timer_expired(), which treated an error condition as
if the timer were expired instead of bailing out.

The previous implementation of timer_expired() gave differing results
for epoll and kqueue if the timer was reset. (For epoll, a reset timer
was considered to be expired, and for kqueue it was not.) This didn't
previously cause problems, since timer_expired() was only called while
the timer was known to be set, but both implementations now use the
kqueue logic.

Reviewed-by: Thomas Munro <thomas(dot)munro(at)gmail(dot)com>
Backpatch-through: 18
Discussion: https://postgr.es/m/CAOYmi+nDZxJHaWj9_jRSyf8uMToCADAmOfJEggsKW-kY7aUwHA@mail.gmail.com

Branch
------
master

Details
-------
https://git.postgresql.org/pg/commitdiff/1749a12f0d2005ba23236089f0a32e6c6c1533f0

Modified Files
--------------
src/interfaces/libpq-oauth/oauth-curl.c | 108 ++++++++++++++++++++------------
1 file changed, 68 insertions(+), 40 deletions(-)

Browse pgsql-committers by date

  From Date Subject
Next Message Jacob Champion 2025-08-08 16:34:57 Re: pgsql: oauth: Add unit tests for multiplexer handling
Previous Message Thomas Munro 2025-08-08 13:46:57 pgsql: Remove obsolete comment.