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).
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index a415f58..8fc3042 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -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 (!u->request_body_sent) {
+ u->request_body_sent = 1;
- if (c->read->ready) {
- ngx_http_upstream_process_header(r, u);
- return;
+ 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;
+ }
}
}