9 changed files with 96 additions and 42 deletions
@ -0,0 +1,47 @@ |
|||
From 0bb4737b520e5d4edd0dd50e48f747fff90b8df2 Mon Sep 17 00:00:00 2001 |
|||
Message-Id: <0bb4737b520e5d4edd0dd50e48f747fff90b8df2.1601374253.git.nicolas@videolabs.io> |
|||
In-Reply-To: <4b80ba0cb27cadee99cf18b8f13fd7d16f19066b.1601374253.git.nicolas@videolabs.io> |
|||
References: <4b80ba0cb27cadee99cf18b8f13fd7d16f19066b.1601374253.git.nicolas@videolabs.io> |
|||
From: Francois Cartegnie <fcvlcdev@free.fr> |
|||
Date: Mon, 28 Sep 2020 17:52:16 +0200 |
|||
Subject: [PATCH 8/8] httpd: update activity time before processing timeout |
|||
(#25151) |
|||
|
|||
as connection state handling block has moved in |
|||
67cdaeea58641d6d515728596f8b194f52538e2b |
|||
sockets can now timeout when still active. |
|||
---
|
|||
src/network/httpd.c | 10 +++++----- |
|||
1 file changed, 5 insertions(+), 5 deletions(-) |
|||
|
|||
diff --git a/src/network/httpd.c b/src/network/httpd.c
|
|||
index 3197fb2ec9..d9c19c2c29 100644
|
|||
--- a/src/network/httpd.c
|
|||
+++ b/src/network/httpd.c
|
|||
@@ -1730,6 +1730,11 @@ static void httpdLoop(httpd_host_t *host)
|
|||
break; |
|||
} |
|||
|
|||
+ if (val == 0) {
|
|||
+ cl->i_activity_date = now;
|
|||
+ delay = 0;
|
|||
+ }
|
|||
+
|
|||
if (cl->i_ref < 0 || (cl->i_ref == 0 && |
|||
(cl->i_state == HTTPD_CLIENT_DEAD || |
|||
(cl->i_activity_timeout > 0 && |
|||
@@ -1740,11 +1745,6 @@ static void httpdLoop(httpd_host_t *host)
|
|||
continue; |
|||
} |
|||
|
|||
- if (val == 0) {
|
|||
- cl->i_activity_date = now;
|
|||
- delay = 0;
|
|||
- }
|
|||
-
|
|||
struct pollfd *pufd = ufd + nfd; |
|||
assert (pufd < ufd + (sizeof (ufd) / sizeof (ufd[0]))); |
|||
|
|||
--
|
|||
2.25.1 |
|||
|
|||
Loading…
Reference in new issue