Mercurial > hg > nginx
changeset 7949:862f6130d357
Upstream: sendfile_max_chunk support.
Previously, connections to upstream servers used sendfile() if it was
enabled, but never honored sendfile_max_chunk. This might result
in worker monopolization for a long time if large request bodies
are allowed.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Fri, 29 Oct 2021 20:21:54 +0300 |
parents | a2613fc1bce5 |
children | e3dbd9449b14 |
files | src/core/ngx_output_chain.c src/http/ngx_http_upstream.c |
diffstat | 2 files changed, 10 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/core/ngx_output_chain.c Fri Oct 29 20:21:51 2021 +0300 +++ b/src/core/ngx_output_chain.c Fri Oct 29 20:21:54 2021 +0300 @@ -803,6 +803,10 @@ return NGX_ERROR; } + if (chain && c->write->ready) { + ngx_post_event(c->write, &ngx_posted_next_events); + } + for (cl = ctx->out; cl && cl != chain; /* void */) { ln = cl; cl = cl->next;
--- a/src/http/ngx_http_upstream.c Fri Oct 29 20:21:51 2021 +0300 +++ b/src/http/ngx_http_upstream.c Fri Oct 29 20:21:54 2021 +0300 @@ -1511,8 +1511,9 @@ static void ngx_http_upstream_connect(ngx_http_request_t *r, ngx_http_upstream_t *u) { - ngx_int_t rc; - ngx_connection_t *c; + ngx_int_t rc; + ngx_connection_t *c; + ngx_http_core_loc_conf_t *clcf; r->connection->log->action = "connecting to upstream"; @@ -1599,10 +1600,12 @@ /* init or reinit the ngx_output_chain() and ngx_chain_writer() contexts */ + clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); + u->writer.out = NULL; u->writer.last = &u->writer.out; u->writer.connection = c; - u->writer.limit = 0; + u->writer.limit = clcf->sendfile_max_chunk; if (u->request_sent) { if (ngx_http_upstream_reinit(r, u) != NGX_OK) {