upstream/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2026-06-09 00:42:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge 4c0119b8f4 into d44205284f

Browse source
This commit is contained in:
hongzhidao 2026-05-22 08:53:12 -07:00 committed by GitHub
commit a9f1e735c5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/http/modules/ngx_http_proxy_v2_module.c
View file

@ -160,6 +160,7 @@ static ngx_http_proxy_v2_ctx_t *
ngx_http_proxy_v2_get_ctx(ngx_http_request_t *r);
static ngx_int_t ngx_http_proxy_v2_get_connection_data(ngx_http_request_t *r,
ngx_http_proxy_v2_ctx_t *ctx, ngx_peer_connection_t *pc);
static ngx_inline ngx_int_t ngx_http_proxy_v2_cached(ngx_http_request_t *r);
static void ngx_http_proxy_v2_cleanup(void *data);
static void ngx_http_proxy_v2_abort_request(ngx_http_request_t *r);
@ -1406,7 +1407,7 @@ ngx_http_proxy_v2_process_header(ngx_http_request_t *r)
/* frame payload */
if (u->peer.connection) {
if (!ngx_http_proxy_v2_cached(r)) {
if (ctx->type == NGX_HTTP_V2_RST_STREAM_FRAME) {
rc = ngx_http_proxy_v2_parse_rst_stream(r, ctx, b);
@ -4069,9 +4070,7 @@ ngx_http_proxy_v2_get_connection_data(ngx_http_request_t *r,
ngx_connection_t *c;
ngx_pool_cleanup_t *cln;
c = pc->connection;
if (c == NULL) {
if (ngx_http_proxy_v2_cached(r)) {
ctx->connection = ngx_palloc(r->pool, sizeof(ngx_http_proxy_v2_conn_t));
if (ctx->connection == NULL) {
return NGX_ERROR;
@ -4082,6 +4081,8 @@ ngx_http_proxy_v2_get_connection_data(ngx_http_request_t *r,
goto done;
}
c = pc->connection;
if (pc->cached) {
/*
@ -4137,6 +4138,17 @@ done:
}
static ngx_inline ngx_int_t
ngx_http_proxy_v2_cached(ngx_http_request_t *r)
{
#if (NGX_HTTP_CACHE)
return r->cached;
#else
return 0;
#endif
}
static void
ngx_http_proxy_v2_cleanup(void *data)
{