Mercurial > hg > nginx-quic

comparison src/http/ngx_http_core_module.c @ 3053:0d253659da12

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
directio_alignment
author Igor Sysoev <igor@sysoev.ru>
date Fri, 28 Aug 2009 08:15:55 +0000
parents 6060225e9261
children 23e6f26fb4bd
comparison
equal deleted inserted replaced
3052:6060225e9261 3053:0d253659da12
399 ngx_http_core_directio, 399 ngx_http_core_directio,
400 NGX_HTTP_LOC_CONF_OFFSET, 400 NGX_HTTP_LOC_CONF_OFFSET,
401 0, 401 0,
402 NULL }, 402 NULL },
403 403
404 { ngx_string("directio_alignment"),
405 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
406 ngx_conf_set_off_slot,
407 NGX_HTTP_LOC_CONF_OFFSET,
408 offsetof(ngx_http_core_loc_conf_t, directio_alignment),
409 NULL },
410
404 { ngx_string("tcp_nopush"), 411 { ngx_string("tcp_nopush"),
405 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, 412 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
406 ngx_conf_set_flag_slot, 413 ngx_conf_set_flag_slot,
407 NGX_HTTP_LOC_CONF_OFFSET, 414 NGX_HTTP_LOC_CONF_OFFSET,
408 offsetof(ngx_http_core_loc_conf_t, tcp_nopush), 415 offsetof(ngx_http_core_loc_conf_t, tcp_nopush),
2929 lcf->sendfile_max_chunk = NGX_CONF_UNSET_SIZE; 2936 lcf->sendfile_max_chunk = NGX_CONF_UNSET_SIZE;
2930 #if (NGX_HAVE_FILE_AIO) 2937 #if (NGX_HAVE_FILE_AIO)
2931 lcf->aio = NGX_CONF_UNSET; 2938 lcf->aio = NGX_CONF_UNSET;
2932 #endif 2939 #endif
2933 lcf->directio = NGX_CONF_UNSET; 2940 lcf->directio = NGX_CONF_UNSET;
2941 lcf->directio_alignment = NGX_CONF_UNSET;
2934 lcf->tcp_nopush = NGX_CONF_UNSET; 2942 lcf->tcp_nopush = NGX_CONF_UNSET;
2935 lcf->tcp_nodelay = NGX_CONF_UNSET; 2943 lcf->tcp_nodelay = NGX_CONF_UNSET;
2936 lcf->send_timeout = NGX_CONF_UNSET_MSEC; 2944 lcf->send_timeout = NGX_CONF_UNSET_MSEC;
2937 lcf->send_lowat = NGX_CONF_UNSET_SIZE; 2945 lcf->send_lowat = NGX_CONF_UNSET_SIZE;
2938 lcf->postpone_output = NGX_CONF_UNSET_SIZE; 2946 lcf->postpone_output = NGX_CONF_UNSET_SIZE;
3130 #if (NGX_HAVE_FILE_AIO) 3138 #if (NGX_HAVE_FILE_AIO)
3131 ngx_conf_merge_value(conf->aio, prev->aio, 0); 3139 ngx_conf_merge_value(conf->aio, prev->aio, 0);
3132 #endif 3140 #endif
3133 ngx_conf_merge_off_value(conf->directio, prev->directio, 3141 ngx_conf_merge_off_value(conf->directio, prev->directio,
3134 NGX_MAX_OFF_T_VALUE); 3142 NGX_MAX_OFF_T_VALUE);
3143 ngx_conf_merge_off_value(conf->directio_alignment, prev->directio_alignment,
3144 512);
3135 ngx_conf_merge_value(conf->tcp_nopush, prev->tcp_nopush, 0); 3145 ngx_conf_merge_value(conf->tcp_nopush, prev->tcp_nopush, 0);
3136 ngx_conf_merge_value(conf->tcp_nodelay, prev->tcp_nodelay, 1); 3146 ngx_conf_merge_value(conf->tcp_nodelay, prev->tcp_nodelay, 1);
3137 3147
3138 ngx_conf_merge_msec_value(conf->send_timeout, prev->send_timeout, 60000); 3148 ngx_conf_merge_msec_value(conf->send_timeout, prev->send_timeout, 60000);
3139 ngx_conf_merge_size_value(conf->send_lowat, prev->send_lowat, 0); 3149 ngx_conf_merge_size_value(conf->send_lowat, prev->send_lowat, 0);