[nginx] Upstream: u->conf->preserve_output flag.
Maxim Dounin
mdounin at mdounin.ru
Sat Mar 17 20:08:25 UTC 2018
details: http://hg.nginx.org/nginx/rev/a7ed15573ae9
branches:
changeset: 7232:a7ed15573ae9
user: Maxim Dounin <mdounin at mdounin.ru>
date: Sat Mar 17 23:04:23 2018 +0300
description:
Upstream: u->conf->preserve_output flag.
The flag can be used to continue sending request body even after we've
got a response from the backend. In particular, this is needed for gRPC
proxying of bidirectional streaming RPCs, and also to send control frames
in other forms of RPCs.
diffstat:
src/http/ngx_http_upstream.c | 6 ++++--
src/http/ngx_http_upstream.h | 1 +
2 files changed, 5 insertions(+), 2 deletions(-)
diffs (34 lines):
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -2031,7 +2031,9 @@ ngx_http_upstream_send_request(ngx_http_
c->tcp_nopush = NGX_TCP_NOPUSH_UNSET;
}
- u->write_event_handler = ngx_http_upstream_dummy_handler;
+ if (!u->conf->preserve_output) {
+ u->write_event_handler = ngx_http_upstream_dummy_handler;
+ }
if (ngx_handle_write_event(c->write, 0) != NGX_OK) {
ngx_http_upstream_finalize_request(r, u,
@@ -2193,7 +2195,7 @@ ngx_http_upstream_send_request_handler(n
#endif
- if (u->header_sent) {
+ if (u->header_sent && !u->conf->preserve_output) {
u->write_event_handler = ngx_http_upstream_dummy_handler;
(void) ngx_handle_write_event(c->write, 0);
diff --git a/src/http/ngx_http_upstream.h b/src/http/ngx_http_upstream.h
--- a/src/http/ngx_http_upstream.h
+++ b/src/http/ngx_http_upstream.h
@@ -223,6 +223,7 @@ typedef struct {
unsigned intercept_404:1;
unsigned change_buffering:1;
unsigned pass_trailers:1;
+ unsigned preserve_output:1;
#if (NGX_HTTP_SSL || NGX_COMPAT)
ngx_ssl_t *ssl;
More information about the nginx-devel
mailing list