lorenz.stechauner/sesimos
1
1
Fork 0
Code Issues Pull Requests Projects Releases Activity

Add first steps to honor timeout from server as proxy

Browse Source
This commit is contained in:
Lorenz Stechauner
2023-07-01 21:50:33 +02:00
parent 808ebdb0a0
commit 44e3b1332f
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/lib/proxy.c
View File

@ -352,6 +352,7 @@ static int proxy_connect(proxy_ctx_t *proxy, host_config_t *conf, http_res *res,
proxy->initialized = 1; proxy->initialized = 1;
proxy->cnx_s = clock_micros(); proxy->cnx_s = clock_micros();
proxy->host = conf->name; proxy->host = conf->name;
proxy->timeout = 0;
info(BLUE_STR "Established new connection with " BLD_STR "[%s]:%i", addr_buf, conf->proxy.port); info(BLUE_STR "Established new connection with " BLD_STR "[%s]:%i", addr_buf, conf->proxy.port);
@ -370,7 +371,9 @@ int proxy_init(proxy_ctx_t **proxy_ptr, http_req *req, http_res *res, http_statu
while (retry) { while (retry) {
errno = 0; errno = 0;
if (!proxy->initialized || sock_has_pending(&proxy->proxy) != 0) { if (!proxy->initialized || sock_has_pending(&proxy->proxy) != 0 ||
(proxy->timeout != 0 && (clock_micros() - proxy->proxy.ts_last) > proxy->timeout))
{
if (proxy->initialized) if (proxy->initialized)
proxy_close(proxy); proxy_close(proxy);
@ -533,6 +536,8 @@ int proxy_init(proxy_ctx_t **proxy_ptr, http_req *req, http_res *res, http_statu
} }
sock_recv_x(&proxy->proxy, buffer, header_len, 0); sock_recv_x(&proxy->proxy, buffer, header_len, 0);
// TODO read timeout from Keep-Alive
ret = proxy_response_header(req, res, conf); ret = proxy_response_header(req, res, conf);
if (ret != 0) { if (ret != 0) {
res->status = http_get_status(500); res->status = http_get_status(500);

1
src/lib/proxy.h
View File

@ -22,6 +22,7 @@ typedef struct {
unsigned char initialized:1, in_use:1; unsigned char initialized:1, in_use:1;
sock proxy; sock proxy;
long cnx_s, cnx_e; long cnx_s, cnx_e;
long timeout;
char *host; char *host;
void *client; void *client;
} proxy_ctx_t; } proxy_ctx_t;