From 9aee302f6c4c66d95c715e898d9d10b59a13afb3 Mon Sep 17 00:00:00 2001 From: Lorenz Stechauner Date: Sun, 2 Jul 2023 00:14:39 +0200 Subject: [PATCH] Rename timeout to http_timeout --- src/lib/proxy.c | 4 ++-- src/lib/proxy.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/proxy.c b/src/lib/proxy.c index 67db2b8..1acca75 100644 --- a/src/lib/proxy.c +++ b/src/lib/proxy.c @@ -352,7 +352,7 @@ static int proxy_connect(proxy_ctx_t *proxy, host_config_t *conf, http_res *res, proxy->initialized = 1; proxy->cnx_s = clock_micros(); proxy->host = conf->name; - proxy->timeout = 0; + proxy->http_timeout = 0; info(BLUE_STR "Established new connection with " BLD_STR "[%s]:%i", addr_buf, conf->proxy.port); @@ -372,7 +372,7 @@ int proxy_init(proxy_ctx_t **proxy_ptr, http_req *req, http_res *res, http_statu errno = 0; if (!proxy->initialized || sock_has_pending(&proxy->proxy) != 0 || - (proxy->timeout != 0 && (clock_micros() - proxy->proxy.ts_last) > proxy->timeout)) + (proxy->http_timeout != 0 && (clock_micros() - proxy->proxy.ts_last) > proxy->http_timeout)) { if (proxy->initialized) proxy_close(proxy); diff --git a/src/lib/proxy.h b/src/lib/proxy.h index 8b5844d..0351257 100644 --- a/src/lib/proxy.h +++ b/src/lib/proxy.h @@ -22,7 +22,7 @@ typedef struct { unsigned char initialized:1, in_use:1; sock proxy; long cnx_s, cnx_e; - long timeout; + long http_timeout; char *host; void *client; } proxy_ctx_t;