diff options
author | Sergey Kandaurov <pluknet@nginx.com> | 2025-06-23 14:55:32 +0400 |
---|---|---|
committer | pluknet <pluknet@nginx.com> | 2025-06-23 20:12:21 +0400 |
commit | cdf7a9c6cb7f344efc80d790fbacdc1c94ab16e3 (patch) | |
tree | 3542c37c2cf3f27b3a38c636bfb3bd4564477f50 /src/http/modules/ngx_http_grpc_module.c | |
parent | 4eaecc5e8aa7bbaf9e58bf56560a8b1e67d0a8b7 (diff) | |
download | nginx-cdf7a9c6cb7f344efc80d790fbacdc1c94ab16e3.tar.gz nginx-cdf7a9c6cb7f344efc80d790fbacdc1c94ab16e3.zip |
Upstream: fixed reinit request with gRPC and Early Hints.
The gRPC module context has connection specific state, which can be lost
after request reinitialization when it comes to processing early hints.
The fix is to do only a portion of u->reinit_request() implementation
required after processing early hints, now inlined in modules.
Now NGX_HTTP_UPSTREAM_EARLY_HINTS is returned from u->process_header()
for early hints. When reading a cached response, this code is mapped
to NGX_HTTP_UPSTREAM_INVALID_HEADER to indicate invalid header format.
Diffstat (limited to 'src/http/modules/ngx_http_grpc_module.c')
-rw-r--r-- | src/http/modules/ngx_http_grpc_module.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/http/modules/ngx_http_grpc_module.c b/src/http/modules/ngx_http_grpc_module.c index d74b17708..4c95525b4 100644 --- a/src/http/modules/ngx_http_grpc_module.c +++ b/src/http/modules/ngx_http_grpc_module.c @@ -1928,6 +1928,17 @@ ngx_http_grpc_process_header(ngx_http_request_t *r) ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, "grpc header done"); + if (u->headers_in.status_n == NGX_HTTP_EARLY_HINTS) { + if (ctx->end_stream) { + ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, + "upstream prematurely closed stream"); + return NGX_HTTP_UPSTREAM_INVALID_HEADER; + } + + ctx->status = 0; + return NGX_HTTP_UPSTREAM_EARLY_HINTS; + } + if (ctx->end_stream) { u->headers_in.content_length_n = 0; |