mirror
/
nginx
mirror of https://github.com/nginx/nginx
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Proxy: cache support for HTTP/2.

This commit is contained in:
Zhidao HONG 2025-11-30 16:35:31 +00:00 committed by Roman Arutyunyan
parent 17fd964f99
commit 61690b5dc0
1 changed files with 52 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
src/http/modules/ngx_http_proxy_v2_module.c
View File

@ -213,10 +213,13 @@ static u_char ngx_http_proxy_v2_connection_start[] =
ngx_int_t ngx_int_t
ngx_http_proxy_v2_handler(ngx_http_request_t *r) ngx_http_proxy_v2_handler(ngx_http_request_t *r)
{ {
ngx_int_t rc; ngx_int_t rc;
ngx_http_upstream_t *u; ngx_http_upstream_t *u;
ngx_http_proxy_v2_ctx_t *ctx; ngx_http_proxy_v2_ctx_t *ctx;
ngx_http_proxy_loc_conf_t *plcf; ngx_http_proxy_loc_conf_t *plcf;
#if (NGX_HTTP_CACHE)
ngx_http_proxy_main_conf_t *pmcf;
#endif
if (ngx_http_upstream_create(r) != NGX_OK) { if (ngx_http_upstream_create(r) != NGX_OK) {
return NGX_HTTP_INTERNAL_SERVER_ERROR; return NGX_HTTP_INTERNAL_SERVER_ERROR;
@ -258,6 +261,13 @@ ngx_http_proxy_v2_handler(ngx_http_request_t *r)
u->conf = &plcf->upstream; u->conf = &plcf->upstream;
#if (NGX_HTTP_CACHE)
pmcf = ngx_http_get_module_main_conf(r, ngx_http_proxy_module);
u->caches = &pmcf->caches;
u->create_key = ngx_http_proxy_create_key;
#endif
u->create_request = ngx_http_proxy_v2_create_request; u->create_request = ngx_http_proxy_v2_create_request;
u->reinit_request = ngx_http_proxy_v2_reinit_request; u->reinit_request = ngx_http_proxy_v2_reinit_request;
u->process_header = ngx_http_proxy_v2_process_header; u->process_header = ngx_http_proxy_v2_process_header;
@ -330,7 +340,11 @@ ngx_http_proxy_v2_create_request(ngx_http_request_t *r)
plcf = ngx_http_get_module_loc_conf(r, ngx_http_proxy_module); plcf = ngx_http_get_module_loc_conf(r, ngx_http_proxy_module);
#if (NGX_HTTP_CACHE)
headers = u->cacheable ? &plcf->headers_cache : &plcf->headers;
#else
headers = &plcf->headers; headers = &plcf->headers;
#endif
if (u->method.len) { if (u->method.len) {
/* HEAD was changed to GET to cache response */ /* HEAD was changed to GET to cache response */
@ -1389,9 +1403,27 @@ ngx_http_proxy_v2_process_header(ngx_http_request_t *r)
/* frame payload */ /* frame payload */
if (ctx->type == NGX_HTTP_V2_RST_STREAM_FRAME) { if (u->peer.connection) {
rc = ngx_http_proxy_v2_parse_rst_stream(r, ctx, b); if (ctx->type == NGX_HTTP_V2_RST_STREAM_FRAME) {
rc = ngx_http_proxy_v2_parse_rst_stream(r, ctx, b);
if (rc == NGX_AGAIN) {
return NGX_AGAIN;
}
if (rc == NGX_ERROR) {
return NGX_HTTP_UPSTREAM_INVALID_HEADER;
}
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
"upstream rejected request with error %ui",
ctx->error);
return NGX_HTTP_UPSTREAM_INVALID_HEADER;
}
rc = ngx_http_proxy_v2_process_control_frame(r, ctx, b);
if (rc == NGX_AGAIN) { if (rc == NGX_AGAIN) {
return NGX_AGAIN; return NGX_AGAIN;
@ -1401,25 +1433,9 @@ ngx_http_proxy_v2_process_header(ngx_http_request_t *r)
return NGX_HTTP_UPSTREAM_INVALID_HEADER; return NGX_HTTP_UPSTREAM_INVALID_HEADER;
} }
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, if (rc == NGX_OK) {
"upstream rejected request with error %ui", continue;
ctx->error); }
return NGX_HTTP_UPSTREAM_INVALID_HEADER;
}
rc = ngx_http_proxy_v2_process_control_frame(r, ctx, b);
if (rc == NGX_AGAIN) {
return NGX_AGAIN;
}
if (rc == NGX_ERROR) {
return NGX_HTTP_UPSTREAM_INVALID_HEADER;
}
if (rc == NGX_OK) {
continue;
} }
if (ctx->type != NGX_HTTP_V2_HEADERS_FRAME if (ctx->type != NGX_HTTP_V2_HEADERS_FRAME
@ -4052,6 +4068,15 @@ ngx_http_proxy_v2_get_connection_data(ngx_http_request_t *r,
c = pc->connection; c = pc->connection;
if (c == NULL) {
ctx->connection = ngx_palloc(r->pool, sizeof(ngx_http_proxy_v2_conn_t));
if (ctx->connection == NULL) {
return NGX_ERROR;
}
goto done;
}
if (pc->cached) { if (pc->cached) {
/* /*
@ -4090,6 +4115,8 @@ ngx_http_proxy_v2_get_connection_data(ngx_http_request_t *r,
cln->handler = ngx_http_proxy_v2_cleanup; cln->handler = ngx_http_proxy_v2_cleanup;
ctx->connection = cln->data; ctx->connection = cln->data;
done:
ctx->connection->init_window = NGX_HTTP_V2_DEFAULT_WINDOW; ctx->connection->init_window = NGX_HTTP_V2_DEFAULT_WINDOW;
ctx->connection->send_window = NGX_HTTP_V2_DEFAULT_WINDOW; ctx->connection->send_window = NGX_HTTP_V2_DEFAULT_WINDOW;
ctx->connection->recv_window = NGX_HTTP_V2_MAX_WINDOW; ctx->connection->recv_window = NGX_HTTP_V2_MAX_WINDOW;