From 517a443636daa1e8085cb4e5325524a54e8a8fd7 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 17 Oct 2023 11:30:23 +0200 Subject: Merging upstream version 1.43.0. Signed-off-by: Daniel Baumann --- web/server/web_client.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'web/server/web_client.c') diff --git a/web/server/web_client.c b/web/server/web_client.c index 456de6892..b378bb772 100644 --- a/web/server/web_client.c +++ b/web/server/web_client.c @@ -50,6 +50,7 @@ static inline int web_client_cork_socket(struct web_client *w __maybe_unused) { return 0; } +#ifdef ENABLE_HTTPS static inline void web_client_enable_wait_from_ssl(struct web_client *w) { if (w->ssl.ssl_errno == SSL_ERROR_WANT_READ) web_client_enable_ssl_wait_receive(w); @@ -60,6 +61,7 @@ static inline void web_client_enable_wait_from_ssl(struct web_client *w) { web_client_disable_ssl_wait_send(w); } } +#endif static inline int web_client_uncork_socket(struct web_client *w __maybe_unused) { #ifdef TCP_CORK @@ -928,6 +930,8 @@ const char *web_response_code_to_string(int code) { return "Request Header Fields Too Large"; case 451: return "Unavailable For Legal Reasons"; + case 499: // nginx's extension to the standard + return "Client Closed Request"; case 500: return "Internal Server Error"; @@ -2437,7 +2441,7 @@ inline bool web_client_timeout_checkpoint_and_check(struct web_client *w, usec_t if (since_reception_ut >= w->timings.timeout_ut) { buffer_flush(w->response.data); buffer_strcat(w->response.data, "Query timeout exceeded"); - w->response.code = HTTP_RESP_BACKEND_FETCH_FAILED; + w->response.code = HTTP_RESP_GATEWAY_TIMEOUT; return true; } -- cgit v1.2.3