mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-07-20 11:16:38 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge 5a008467df into c52c5698cd

Browse Source
This commit is contained in:
Morten M. Neergaard 2025-07-11 17:50:07 +01:00 committed by GitHub
commit 91836483d9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/vim/syntax/nginx.vim
View File

@ -153,6 +153,7 @@ syn keyword ngxDirective contained chunked_transfer_encoding
syn keyword ngxDirective contained client_body_buffer_size syn keyword ngxDirective contained client_body_buffer_size
syn keyword ngxDirective contained client_body_in_file_only syn keyword ngxDirective contained client_body_in_file_only
syn keyword ngxDirective contained client_body_in_single_buffer syn keyword ngxDirective contained client_body_in_single_buffer
syn keyword ngxDirective contained client_body_temp_access
syn keyword ngxDirective contained client_body_temp_path syn keyword ngxDirective contained client_body_temp_path
syn keyword ngxDirective contained client_body_timeout syn keyword ngxDirective contained client_body_timeout
syn keyword ngxDirective contained client_header_buffer_size syn keyword ngxDirective contained client_header_buffer_size

10
src/http/ngx_http_core_module.c
View File

@ -373,6 +373,13 @@ static ngx_command_t ngx_http_core_commands[] = {
offsetof(ngx_http_core_loc_conf_t, client_body_temp_path), offsetof(ngx_http_core_loc_conf_t, client_body_temp_path),
NULL }, NULL },
{ ngx_string("client_body_temp_access"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE123,
ngx_conf_set_access_slot,
NGX_HTTP_LOC_CONF_OFFSET,
offsetof(ngx_http_core_loc_conf_t, client_body_temp_access),
NULL },
{ ngx_string("client_body_in_file_only"), { ngx_string("client_body_in_file_only"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
ngx_conf_set_enum_slot, ngx_conf_set_enum_slot,
@ -3628,6 +3635,7 @@ ngx_http_core_create_loc_conf(ngx_conf_t *cf)
clcf->client_max_body_size = NGX_CONF_UNSET; clcf->client_max_body_size = NGX_CONF_UNSET;
clcf->client_body_buffer_size = NGX_CONF_UNSET_SIZE; clcf->client_body_buffer_size = NGX_CONF_UNSET_SIZE;
clcf->client_body_timeout = NGX_CONF_UNSET_MSEC; clcf->client_body_timeout = NGX_CONF_UNSET_MSEC;
clcf->client_body_temp_access = NGX_CONF_UNSET_UINT;
clcf->satisfy = NGX_CONF_UNSET_UINT; clcf->satisfy = NGX_CONF_UNSET_UINT;
clcf->auth_delay = NGX_CONF_UNSET_MSEC; clcf->auth_delay = NGX_CONF_UNSET_MSEC;
clcf->if_modified_since = NGX_CONF_UNSET_UINT; clcf->if_modified_since = NGX_CONF_UNSET_UINT;
@ -3860,6 +3868,8 @@ ngx_http_core_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
NGX_HTTP_REQUEST_BODY_FILE_OFF); NGX_HTTP_REQUEST_BODY_FILE_OFF);
ngx_conf_merge_value(conf->client_body_in_single_buffer, ngx_conf_merge_value(conf->client_body_in_single_buffer,
prev->client_body_in_single_buffer, 0); prev->client_body_in_single_buffer, 0);
ngx_conf_merge_uint_value(conf->client_body_temp_access,
prev->client_body_temp_access, 0);
ngx_conf_merge_value(conf->internal, prev->internal, 0); ngx_conf_merge_value(conf->internal, prev->internal, 0);
ngx_conf_merge_value(conf->sendfile, prev->sendfile, 0); ngx_conf_merge_value(conf->sendfile, prev->sendfile, 0);
ngx_conf_merge_size_value(conf->sendfile_max_chunk, ngx_conf_merge_size_value(conf->sendfile_max_chunk,

1
src/http/ngx_http_core_module.h
View File

@ -435,6 +435,7 @@ struct ngx_http_core_loc_conf_s {
ngx_array_t *error_pages; /* error_page */ ngx_array_t *error_pages; /* error_page */
ngx_path_t *client_body_temp_path; /* client_body_temp_path */ ngx_path_t *client_body_temp_path; /* client_body_temp_path */
ngx_uint_t client_body_temp_access; /* client_body_temp_file_access */
ngx_open_file_cache_t *open_file_cache; ngx_open_file_cache_t *open_file_cache;
time_t open_file_cache_valid; time_t open_file_cache_valid;

1
src/http/ngx_http_request_body.c
View File

@ -569,6 +569,7 @@ ngx_http_write_request_body(ngx_http_request_t *r)
tf->file.fd = NGX_INVALID_FILE; tf->file.fd = NGX_INVALID_FILE;
tf->file.log = r->connection->log; tf->file.log = r->connection->log;
tf->path = clcf->client_body_temp_path; tf->path = clcf->client_body_temp_path;
tf->access = clcf->client_body_temp_access;
tf->pool = r->pool; tf->pool = r->pool;
tf->warn = "a client request body is buffered to a temporary file"; tf->warn = "a client request body is buffered to a temporary file";
tf->log_level = r->request_body_file_log_level; tf->log_level = r->request_body_file_log_level;