diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2018-09-03 19:34:02 +0300 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2018-09-03 19:34:02 +0300 |
| commit | b540af619bb77e522dc435fa7872674f56f0883a (patch) | |
| tree | 82701b695e23c8f5ea4372c13981a11486ad35b4 /src | |
| parent | 4c86fceffd2f3d0e713ce349f71d3b04118a3298 (diff) | |
| download | nginx-b540af619bb77e522dc435fa7872674f56f0883a.tar.gz nginx-b540af619bb77e522dc435fa7872674f56f0883a.tar.bz2 | |
gRPC: disabled keepalive when sending control frames was blocked.
If sending request body was not completed (u->request_body_sent is not set),
the upstream keepalive module won't save such a connection. However, it
is theoretically possible (though highly unlikely) that sending of some
control frames can be blocked after the request body was sent. The
ctx->output_blocked flag introduced to disable keepalive in such cases.
Diffstat (limited to 'src')
| -rw-r--r-- | src/http/modules/ngx_http_grpc_module.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/http/modules/ngx_http_grpc_module.c b/src/http/modules/ngx_http_grpc_module.c index a2cf055de..62b33fd2a 100644 --- a/src/http/modules/ngx_http_grpc_module.c +++ b/src/http/modules/ngx_http_grpc_module.c @@ -112,6 +112,7 @@ typedef struct { unsigned header_sent:1; unsigned output_closed:1; + unsigned output_blocked:1; unsigned parsing_headers:1; unsigned end_stream:1; unsigned done:1; @@ -1076,6 +1077,7 @@ ngx_http_grpc_reinit_request(ngx_http_request_t *r) ctx->state = 0; ctx->header_sent = 0; ctx->output_closed = 0; + ctx->output_blocked = 0; ctx->parsing_headers = 0; ctx->end_stream = 0; ctx->done = 0; @@ -1413,6 +1415,13 @@ ngx_http_grpc_body_output_filter(void *data, ngx_chain_t *in) rc = NGX_AGAIN; } + if (rc == NGX_AGAIN) { + ctx->output_blocked = 1; + + } else { + ctx->output_blocked = 0; + } + if (ctx->done) { /* @@ -1427,6 +1436,7 @@ ngx_http_grpc_body_output_filter(void *data, ngx_chain_t *in) if (ctx->in == NULL && ctx->out == NULL && ctx->output_closed + && !ctx->output_blocked && ctx->state == ngx_http_grpc_st_start) { u->keepalive = 1; @@ -1777,6 +1787,7 @@ ngx_http_grpc_process_header(ngx_http_request_t *r) if (ctx->in == NULL && ctx->out == NULL && ctx->output_closed + && !ctx->output_blocked && b->last == b->pos) { u->keepalive = 1; @@ -1879,6 +1890,7 @@ ngx_http_grpc_filter(void *data, ssize_t bytes) if (ctx->in == NULL && ctx->output_closed + && !ctx->output_blocked && ctx->state == ngx_http_grpc_st_start) { u->keepalive = 1; |