[vlc-devel] [PATCH] httpd: update activity time before processing timeout (#25151)

Francois Cartegnie fcvlcdev at free.fr
Mon Sep 28 17:56:06 CEST 2020


as connection state handling block has moved in
67cdaeea58641d6d515728596f8b194f52538e2b
sockets can now timeout when still active.
---
 src/network/httpd.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/network/httpd.c b/src/network/httpd.c
index 37ba36007d..5a90d19eb8 100644
--- a/src/network/httpd.c
+++ b/src/network/httpd.c
@@ -1736,6 +1736,9 @@ static void httpdLoop(httpd_host_t *host)
                 break;
         }
 
+        if (val == 0)
+            cl->i_activity_date = now;
+
         if (cl->i_ref < 0 || (cl->i_ref == 0 &&
                     (cl->i_state == HTTPD_CLIENT_DEAD ||
                       (cl->i_activity_timeout > 0 &&
@@ -1746,9 +1749,6 @@ static void httpdLoop(httpd_host_t *host)
             continue;
         }
 
-        if (val == 0)
-            cl->i_activity_date = now;
-
         struct pollfd *pufd = ufd + nfd;
         assert (pufd < ufd + (sizeof (ufd) / sizeof (ufd[0])));
 
-- 
2.25.4



More information about the vlc-devel mailing list