Mercurial > hg > nginx
comparison src/http/ngx_http_core_module.c @ 8889:61d0fa67b55e quic
Merged with the default branch.
author | Sergey Kandaurov <pluknet@nginx.com> |
---|---|
date | Wed, 03 Nov 2021 11:22:07 +0300 |
parents | d514f88053e5 e3dbd9449b14 |
children | 33226ac61076 |
comparison
equal
deleted
inserted
replaced
8888:6d1488b62dc5 | 8889:61d0fa67b55e |
---|---|
3718 ngx_conf_merge_value(conf->client_body_in_single_buffer, | 3718 ngx_conf_merge_value(conf->client_body_in_single_buffer, |
3719 prev->client_body_in_single_buffer, 0); | 3719 prev->client_body_in_single_buffer, 0); |
3720 ngx_conf_merge_value(conf->internal, prev->internal, 0); | 3720 ngx_conf_merge_value(conf->internal, prev->internal, 0); |
3721 ngx_conf_merge_value(conf->sendfile, prev->sendfile, 0); | 3721 ngx_conf_merge_value(conf->sendfile, prev->sendfile, 0); |
3722 ngx_conf_merge_size_value(conf->sendfile_max_chunk, | 3722 ngx_conf_merge_size_value(conf->sendfile_max_chunk, |
3723 prev->sendfile_max_chunk, 0); | 3723 prev->sendfile_max_chunk, 2 * 1024 * 1024); |
3724 ngx_conf_merge_size_value(conf->subrequest_output_buffer_size, | 3724 ngx_conf_merge_size_value(conf->subrequest_output_buffer_size, |
3725 prev->subrequest_output_buffer_size, | 3725 prev->subrequest_output_buffer_size, |
3726 (size_t) ngx_pagesize); | 3726 (size_t) ngx_pagesize); |
3727 ngx_conf_merge_value(conf->aio, prev->aio, NGX_HTTP_AIO_OFF); | 3727 ngx_conf_merge_value(conf->aio, prev->aio, NGX_HTTP_AIO_OFF); |
3728 ngx_conf_merge_value(conf->aio_write, prev->aio_write, 0); | 3728 ngx_conf_merge_value(conf->aio_write, prev->aio_write, 0); |