Mercurial > hg > nginx-quic
comparison src/http/ngx_http_core_module.c @ 6734:0c572ed91b36
Modules compatibility: compatibility with NGX_HAVE_FILE_AIO.
With this change it is now possible to load modules compiled without
the "--with-file-aio" configure option into nginx binary compiled with it,
and vice versa, assuming both use the "--with-compat" option.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 10 Oct 2016 18:44:17 +0300 |
parents | cebf5fed00bf |
children | 92ad1c92bcf9 |
comparison
equal
deleted
inserted
replaced
6733:adc2414856b1 | 6734:0c572ed91b36 |
---|---|
3758 prev->client_body_in_single_buffer, 0); | 3758 prev->client_body_in_single_buffer, 0); |
3759 ngx_conf_merge_value(conf->internal, prev->internal, 0); | 3759 ngx_conf_merge_value(conf->internal, prev->internal, 0); |
3760 ngx_conf_merge_value(conf->sendfile, prev->sendfile, 0); | 3760 ngx_conf_merge_value(conf->sendfile, prev->sendfile, 0); |
3761 ngx_conf_merge_size_value(conf->sendfile_max_chunk, | 3761 ngx_conf_merge_size_value(conf->sendfile_max_chunk, |
3762 prev->sendfile_max_chunk, 0); | 3762 prev->sendfile_max_chunk, 0); |
3763 #if (NGX_HAVE_FILE_AIO || NGX_THREADS) | |
3764 ngx_conf_merge_value(conf->aio, prev->aio, NGX_HTTP_AIO_OFF); | 3763 ngx_conf_merge_value(conf->aio, prev->aio, NGX_HTTP_AIO_OFF); |
3765 ngx_conf_merge_value(conf->aio_write, prev->aio_write, 0); | 3764 ngx_conf_merge_value(conf->aio_write, prev->aio_write, 0); |
3766 #endif | |
3767 #if (NGX_THREADS) | 3765 #if (NGX_THREADS) |
3768 ngx_conf_merge_ptr_value(conf->thread_pool, prev->thread_pool, NULL); | 3766 ngx_conf_merge_ptr_value(conf->thread_pool, prev->thread_pool, NULL); |
3769 ngx_conf_merge_ptr_value(conf->thread_pool_value, prev->thread_pool_value, | 3767 ngx_conf_merge_ptr_value(conf->thread_pool_value, prev->thread_pool_value, |
3770 NULL); | 3768 NULL); |
3771 #endif | 3769 #endif |