[nginx] Simplified sendfile_max_chunk handling.

[Maxim Dounin]

details:   https://hg.nginx.org/nginx/rev/51a260276425
branches:  
changeset: 7947:51a260276425
user:      Maxim Dounin <mdounin at mdounin.ru>
date:      Fri Oct 29 20:21:48 2021 +0300
description:
Simplified sendfile_max_chunk handling.

Previously, it was checked that sendfile_max_chunk was enabled and
almost whole sendfile_max_chunk was sent (see e67ef50c3176), to avoid
delaying connections where sendfile_max_chunk wasn't reached (for example,
when sending responses smaller than sendfile_max_chunk).  Now we instead
check if there are unsent data, and the connection is still ready for writing.
Additionally we also check c->write->delayed to ignore connections already
delayed by limit_rate.

This approach is believed to be more robust, and correctly handles
not only sendfile_max_chunk, but also internal limits of c->send_chain(),
such as sendfile() maximum supported length (ticket #1870).

diffstat:

 src/http/ngx_http_write_filter_module.c |  6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diffs (21 lines):

diff -r 61e9c078ee3d -r 51a260276425 src/http/ngx_http_write_filter_module.c
--- a/src/http/ngx_http_write_filter_module.c	Fri Oct 29 20:21:43 2021 +0300
+++ b/src/http/ngx_http_write_filter_module.c	Fri Oct 29 20:21:48 2021 +0300
@@ -321,16 +321,12 @@ ngx_http_write_filter(ngx_http_request_t
         delay = (ngx_msec_t) ((nsent - sent) * 1000 / r->limit_rate);
 
         if (delay > 0) {
-            limit = 0;
             c->write->delayed = 1;
             ngx_add_timer(c->write, delay);
         }
     }
 
-    if (limit
-        && c->write->ready
-        && c->sent - sent >= limit - (off_t) (2 * ngx_pagesize))
-    {
+    if (chain && c->write->ready && !c->write->delayed) {
         ngx_post_event(c->write, &ngx_posted_next_events);
     }