From: Maxim Dounin Date: Sat, 30 Mar 2024 02:06:59 +0000 (+0300) Subject: Request body: explicit handling of NGX_AGAIN. X-Git-Tag: release-1.31.9~13 X-Git-Url: https://git.kaiwu.me/virtual_hosts.html?a=commitdiff_plain;h=2b129b9363f07d7642bf7203c9c4d8796d19c8fa;p=nginx.git Request body: explicit handling of NGX_AGAIN. Request body reading indirectly uses the "do { c->recv() } while (c->read->ready)" form, which is not really correct, as for example with SSL c->read->ready may be still set when c->recv() returns NGX_AGAIN due to SSL_ERROR_WANT_WRITE (see 7351:2b5528023f6b), and therefore this form might be an infinite loop. Added explicit NGX_AGAIN handling for the sake of correctness. Signed-off-by: Elijah Zupancic Origin: --- diff --git a/src/http/ngx_http_request_body.c b/src/http/ngx_http_request_body.c index d9d0c22e3..5bd965b2c 100644 --- a/src/http/ngx_http_request_body.c +++ b/src/http/ngx_http_request_body.c @@ -307,6 +307,7 @@ ngx_http_do_read_client_request_body(ngx_http_request_t *r) c = r->connection; rb = r->request_body; flush = 1; + n = NGX_AGAIN; ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http read client request body"); @@ -432,7 +433,7 @@ ngx_http_do_read_client_request_body(ngx_http_request_t *r) break; } - if (!c->read->ready || rb->rest == 0) { + if (n == NGX_AGAIN || !c->read->ready || rb->rest == 0) { clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); ngx_add_timer(c->read, clcf->client_body_timeout);