upstream/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2026-02-03 20:29:27 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge 195cde59d1 into 86e5930e76

Browse source
This commit is contained in:
Roman Arutyunyan 2026-02-03 11:10:42 -08:00 committed by GitHub
commit 061b5509c3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/http/modules/ngx_http_grpc_module.c
View file

@ -591,6 +591,8 @@ ngx_http_grpc_handler(ngx_http_request_t *r)
}
}
u->preserve_output = 1;
u->output.tag = (ngx_buf_tag_t) &ngx_http_grpc_module;
u->conf = &glcf->upstream;
@ -4430,7 +4432,6 @@ ngx_http_grpc_create_loc_conf(ngx_conf_t *cf)
conf->upstream.force_ranges = 0;
conf->upstream.pass_trailers = 1;
conf->upstream.pass_early_hints = 1;
conf->upstream.preserve_output = 1;
conf->headers_source = NGX_CONF_UNSET_PTR;

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

@ -236,8 +236,6 @@ ngx_http_proxy_v2_handler(ngx_http_request_t *r)
plcf = ngx_http_get_module_loc_conf(r, ngx_http_proxy_module);
plcf->upstream.preserve_output = 1;
u = r->upstream;
if (plcf->proxy_lengths == NULL) {
@ -257,6 +255,8 @@ ngx_http_proxy_v2_handler(ngx_http_request_t *r)
ngx_str_set(&u->ssl_alpn_protocol, NGX_HTTP_V2_ALPN_PROTO);
#endif
u->preserve_output = 1;
u->output.tag = (ngx_buf_tag_t) &ngx_http_proxy_v2_module;
u->conf = &plcf->upstream;

6
src/http/ngx_http_upstream.c
View file

@ -2228,7 +2228,7 @@ ngx_http_upstream_send_request(ngx_http_request_t *r, ngx_http_upstream_t *u,
c->tcp_nopush = NGX_TCP_NOPUSH_UNSET;
}
if (!u->conf->preserve_output) {
if (!u->preserve_output) {
u->write_event_handler = ngx_http_upstream_dummy_handler;
}
@ -2400,7 +2400,7 @@ ngx_http_upstream_send_request_handler(ngx_http_request_t *r,
#endif
if (u->header_sent && !u->conf->preserve_output) {
if (u->header_sent && !u->preserve_output) {
u->write_event_handler = ngx_http_upstream_dummy_handler;
(void) ngx_handle_write_event(c->write, 0);
@ -3282,7 +3282,7 @@ ngx_http_upstream_send_response(ngx_http_request_t *r, ngx_http_upstream_t *u)
if (r->request_body && r->request_body->temp_file
&& r == r->main && !r->preserve_body
&& !u->conf->preserve_output)
&& !u->preserve_output)
{
ngx_pool_run_cleanup_file(r->pool, r->request_body->temp_file->file.fd);
r->request_body->temp_file->file.fd = NGX_INVALID_FILE;

2
src/http/ngx_http_upstream.h
View file

@ -235,7 +235,6 @@ typedef struct {
signed store:2;
unsigned intercept_404:1;
unsigned change_buffering:1;
unsigned preserve_output:1;
#if (NGX_HTTP_SSL || NGX_COMPAT)
ngx_ssl_t *ssl;
@ -412,6 +411,7 @@ struct ngx_http_upstream_s {
unsigned request_body_sent:1;
unsigned request_body_blocked:1;
unsigned header_sent:1;
unsigned preserve_output:1;
};