diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2016-10-10 18:44:17 +0300 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2016-10-10 18:44:17 +0300 |
| commit | 844c78556bc93343dd1c3c9236b5c16f4e2eac39 (patch) | |
| tree | b3649cec59d23ca71d1d169ca3c4cc46e3265eaa /src/http/ngx_http_core_module.c | |
| parent | 9f6e8673f40f7532bf3059bda41e05b545520dd3 (diff) | |
| download | nginx-844c78556bc93343dd1c3c9236b5c16f4e2eac39.tar.gz nginx-844c78556bc93343dd1c3c9236b5c16f4e2eac39.zip | |
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.
Diffstat (limited to 'src/http/ngx_http_core_module.c')
| -rw-r--r-- | src/http/ngx_http_core_module.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c index 2daea1013..9da5d109e 100644 --- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c @@ -3760,10 +3760,8 @@ ngx_http_core_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) ngx_conf_merge_value(conf->sendfile, prev->sendfile, 0); ngx_conf_merge_size_value(conf->sendfile_max_chunk, prev->sendfile_max_chunk, 0); -#if (NGX_HAVE_FILE_AIO || NGX_THREADS) ngx_conf_merge_value(conf->aio, prev->aio, NGX_HTTP_AIO_OFF); ngx_conf_merge_value(conf->aio_write, prev->aio_write, 0); -#endif #if (NGX_THREADS) ngx_conf_merge_ptr_value(conf->thread_pool, prev->thread_pool, NULL); ngx_conf_merge_ptr_value(conf->thread_pool_value, prev->thread_pool_value, |