diff options
| author | Sergey Kandaurov <pluknet@nginx.com> | 2021-11-03 11:22:07 +0300 |
|---|---|---|
| committer | Sergey Kandaurov <pluknet@nginx.com> | 2021-11-03 11:22:07 +0300 |
| commit | bbd05ae252bce1907173d13c6e48d1bed71cd9ea (patch) | |
| tree | 6bca56a91f1d0a0b1c3ad4ac0d3c3ba2b4122468 /src/http/ngx_http_core_module.c | |
| parent | 8f8cb92e9229d75ea5816f35c6b4bfdfb253a486 (diff) | |
| parent | 3334585539168947650a37d74dd32973ab451d70 (diff) | |
| download | nginx-bbd05ae252bce1907173d13c6e48d1bed71cd9ea.tar.gz nginx-bbd05ae252bce1907173d13c6e48d1bed71cd9ea.zip | |
Merged with the default branch.
Diffstat (limited to 'src/http/ngx_http_core_module.c')
| -rw-r--r-- | src/http/ngx_http_core_module.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c index c19020dfd..19bc75136 100644 --- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c @@ -3720,7 +3720,7 @@ ngx_http_core_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) ngx_conf_merge_value(conf->internal, prev->internal, 0); ngx_conf_merge_value(conf->sendfile, prev->sendfile, 0); ngx_conf_merge_size_value(conf->sendfile_max_chunk, - prev->sendfile_max_chunk, 0); + prev->sendfile_max_chunk, 2 * 1024 * 1024); ngx_conf_merge_size_value(conf->subrequest_output_buffer_size, prev->subrequest_output_buffer_size, (size_t) ngx_pagesize); |