Mercurial > hg > nginx
changeset 7260:08f114ed5449
Upstream: fixed u->conf->preserve_output (ticket #1519).
Previously, ngx_http_upstream_process_header() might be called after
we've finished reading response headers and switched to a different read
event handler, leading to errors with gRPC proxying. Additionally,
the u->conf->read_timeout timer might be re-armed during reading response
headers (while this is expected to be a single timeout on reading
the whole response header).
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Thu, 05 Apr 2018 16:56:12 +0300 |
parents | 8ce771bf9260 |
children | 051e5fa03b92 |
files | src/http/ngx_http_upstream.c |
diffstat | 1 files changed, 13 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/ngx_http_upstream.c Thu Apr 05 16:53:27 2018 +0300 +++ b/src/http/ngx_http_upstream.c Thu Apr 05 16:56:12 2018 +0300 @@ -2013,8 +2013,6 @@ /* rc == NGX_OK */ - u->request_body_sent = 1; - if (c->write->timer_set) { ngx_del_timer(c->write); } @@ -2041,11 +2039,19 @@ return; } - ngx_add_timer(c->read, u->conf->read_timeout); - - if (c->read->ready) { - ngx_http_upstream_process_header(r, u); - return; + if (!u->request_body_sent) { + u->request_body_sent = 1; + + if (u->header_sent) { + return; + } + + ngx_add_timer(c->read, u->conf->read_timeout); + + if (c->read->ready) { + ngx_http_upstream_process_header(r, u); + return; + } } }