From e422731243b17702a95fdb7cdfdfa36317b310e8 Mon Sep 17 00:00:00 2001 From: Micheal X Date: Thu, 26 Oct 2023 21:20:07 +1300 Subject: [PATCH] 5.8.4 fix 5.8.3 bug. --- code/default/lib/noarch/front_base/http1.py | 1 + code/default/lib/noarch/front_base/http_dispatcher.py | 2 +- code/default/version.txt | 2 +- code/default/x_tunnel/local/seley_front/config.py | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/default/lib/noarch/front_base/http1.py b/code/default/lib/noarch/front_base/http1.py index 0a56b390e1..88f29c7e9e 100644 --- a/code/default/lib/noarch/front_base/http1.py +++ b/code/default/lib/noarch/front_base/http1.py @@ -137,6 +137,7 @@ def request_task(self, task): timeout = task.timeout self.request_onway = True start_time = time.time() + self.last_recv_time = start_time self.record_active("request") task.set_state("h1_req") diff --git a/code/default/lib/noarch/front_base/http_dispatcher.py b/code/default/lib/noarch/front_base/http_dispatcher.py index 34991d36a7..0f7bbc3f89 100644 --- a/code/default/lib/noarch/front_base/http_dispatcher.py +++ b/code/default/lib/noarch/front_base/http_dispatcher.py @@ -213,7 +213,7 @@ def _remove_life_end_workers(self): if not worker.is_life_end(): continue - if worker.version == "1.1": + if worker.version == "1.1" and not worker.request_onway: to_close.append(worker) continue diff --git a/code/default/version.txt b/code/default/version.txt index f05e61d963..ee108f47ac 100644 --- a/code/default/version.txt +++ b/code/default/version.txt @@ -1 +1 @@ -5.8.3 \ No newline at end of file +5.8.4 \ No newline at end of file diff --git a/code/default/x_tunnel/local/seley_front/config.py b/code/default/x_tunnel/local/seley_front/config.py index 41fda3c31d..d12142ffcb 100644 --- a/code/default/x_tunnel/local/seley_front/config.py +++ b/code/default/x_tunnel/local/seley_front/config.py @@ -20,7 +20,7 @@ def __init__(self, fn): # http1 self.set_var("http1_first_ping_wait", 0) self.set_var("http1_ping_interval", 0) - self.set_var("http1_idle_time", 59) + self.set_var("http1_idle_time", 240) self.set_var("http1_max_process_tasks", 999999) self.set_var("http2_max_process_tasks", 999999) self.set_var("http2_status_to_close", [404])