Mercurial > hg > nginx-ranges

comparison src/http/ngx_http_core_module.c @ 544:f7ec98e3caeb NGINX_0_8_18

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.8.18 *) Feature: the "read_ahead" directive. *) Feature: now several "perl_modules" directive may be used. *) Feature: the "limit_req_log_level" and "limit_conn_log_level" directives. *) Bugfix: now "limit_req" directive conforms to the leaky bucket algorithm. Thanks to Maxim Dounin. *) Bugfix: nginx did not work on Linux/sparc. Thanks to Marcus Ramberg. *) Bugfix: nginx sent '\0' in a "Location" response header line on MKCOL request. Thanks to Xie Zhenye. *) Bugfix: zero status code was logged instead of 499 status code; the bug had appeared in 0.8.11. *) Bugfix: socket leak; the bug had appeared in 0.8.11.
author Igor Sysoev <http://sysoev.ru>
date Tue, 06 Oct 2009 00:00:00 +0400
parents 4c5d2c627a6c
children 1dcf6adad484
comparison
equal deleted inserted replaced
543:7688992d2abb 544:f7ec98e3caeb
406 offsetof(ngx_http_core_loc_conf_t, aio), 406 offsetof(ngx_http_core_loc_conf_t, aio),
407 &ngx_http_core_aio }, 407 &ngx_http_core_aio },
408 408
409 #endif 409 #endif
410 410
411 { ngx_string("read_ahead"),
412 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
413 ngx_conf_set_size_slot,
414 NGX_HTTP_LOC_CONF_OFFSET,
415 offsetof(ngx_http_core_loc_conf_t, read_ahead),
416 NULL },
417
411 { ngx_string("directio"), 418 { ngx_string("directio"),
412 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, 419 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
413 ngx_http_core_directio, 420 ngx_http_core_directio,
414 NGX_HTTP_LOC_CONF_OFFSET, 421 NGX_HTTP_LOC_CONF_OFFSET,
415 0, 422 0,
2955 lcf->sendfile = NGX_CONF_UNSET; 2962 lcf->sendfile = NGX_CONF_UNSET;
2956 lcf->sendfile_max_chunk = NGX_CONF_UNSET_SIZE; 2963 lcf->sendfile_max_chunk = NGX_CONF_UNSET_SIZE;
2957 #if (NGX_HAVE_FILE_AIO) 2964 #if (NGX_HAVE_FILE_AIO)
2958 lcf->aio = NGX_CONF_UNSET; 2965 lcf->aio = NGX_CONF_UNSET;
2959 #endif 2966 #endif
2967 lcf->read_ahead = NGX_CONF_UNSET_SIZE;
2960 lcf->directio = NGX_CONF_UNSET; 2968 lcf->directio = NGX_CONF_UNSET;
2961 lcf->directio_alignment = NGX_CONF_UNSET; 2969 lcf->directio_alignment = NGX_CONF_UNSET;
2962 lcf->tcp_nopush = NGX_CONF_UNSET; 2970 lcf->tcp_nopush = NGX_CONF_UNSET;
2963 lcf->tcp_nodelay = NGX_CONF_UNSET; 2971 lcf->tcp_nodelay = NGX_CONF_UNSET;
2964 lcf->send_timeout = NGX_CONF_UNSET_MSEC; 2972 lcf->send_timeout = NGX_CONF_UNSET_MSEC;
3156 ngx_conf_merge_size_value(conf->sendfile_max_chunk, 3164 ngx_conf_merge_size_value(conf->sendfile_max_chunk,
3157 prev->sendfile_max_chunk, 0); 3165 prev->sendfile_max_chunk, 0);
3158 #if (NGX_HAVE_FILE_AIO) 3166 #if (NGX_HAVE_FILE_AIO)
3159 ngx_conf_merge_value(conf->aio, prev->aio, 0); 3167 ngx_conf_merge_value(conf->aio, prev->aio, 0);
3160 #endif 3168 #endif
3169 ngx_conf_merge_size_value(conf->read_ahead, prev->read_ahead, 0);
3161 ngx_conf_merge_off_value(conf->directio, prev->directio, 3170 ngx_conf_merge_off_value(conf->directio, prev->directio,
3162 NGX_MAX_OFF_T_VALUE); 3171 NGX_MAX_OFF_T_VALUE);
3163 ngx_conf_merge_off_value(conf->directio_alignment, prev->directio_alignment, 3172 ngx_conf_merge_off_value(conf->directio_alignment, prev->directio_alignment,
3164 512); 3173 512);
3165 ngx_conf_merge_value(conf->tcp_nopush, prev->tcp_nopush, 0); 3174 ngx_conf_merge_value(conf->tcp_nopush, prev->tcp_nopush, 0);