Mercurial > hg > nginx
comparison src/http/ngx_http_core_module.c @ 3236:9aa8fd2d5a00 stable-0.7
merge r2908:
limit_rate_after
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 26 Oct 2009 15:46:59 +0000 |
parents | 501fd3ae3188 |
children | 2efa8d2fcde1 |
comparison
equal
deleted
inserted
replaced
3235:042124063e3d | 3236:9aa8fd2d5a00 |
---|---|
431 ngx_conf_set_size_slot, | 431 ngx_conf_set_size_slot, |
432 NGX_HTTP_LOC_CONF_OFFSET, | 432 NGX_HTTP_LOC_CONF_OFFSET, |
433 offsetof(ngx_http_core_loc_conf_t, limit_rate), | 433 offsetof(ngx_http_core_loc_conf_t, limit_rate), |
434 NULL }, | 434 NULL }, |
435 | 435 |
436 { ngx_string("limit_rate_after"), | |
437 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF | |
438 |NGX_CONF_TAKE1, | |
439 ngx_conf_set_size_slot, | |
440 NGX_HTTP_LOC_CONF_OFFSET, | |
441 offsetof(ngx_http_core_loc_conf_t, limit_rate_after), | |
442 NULL }, | |
443 | |
436 { ngx_string("keepalive_timeout"), | 444 { ngx_string("keepalive_timeout"), |
437 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE12, | 445 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE12, |
438 ngx_http_core_keepalive, | 446 ngx_http_core_keepalive, |
439 NGX_HTTP_LOC_CONF_OFFSET, | 447 NGX_HTTP_LOC_CONF_OFFSET, |
440 0, | 448 0, |
2918 lcf->tcp_nodelay = NGX_CONF_UNSET; | 2926 lcf->tcp_nodelay = NGX_CONF_UNSET; |
2919 lcf->send_timeout = NGX_CONF_UNSET_MSEC; | 2927 lcf->send_timeout = NGX_CONF_UNSET_MSEC; |
2920 lcf->send_lowat = NGX_CONF_UNSET_SIZE; | 2928 lcf->send_lowat = NGX_CONF_UNSET_SIZE; |
2921 lcf->postpone_output = NGX_CONF_UNSET_SIZE; | 2929 lcf->postpone_output = NGX_CONF_UNSET_SIZE; |
2922 lcf->limit_rate = NGX_CONF_UNSET_SIZE; | 2930 lcf->limit_rate = NGX_CONF_UNSET_SIZE; |
2931 lcf->limit_rate_after = NGX_CONF_UNSET_SIZE; | |
2923 lcf->keepalive_timeout = NGX_CONF_UNSET_MSEC; | 2932 lcf->keepalive_timeout = NGX_CONF_UNSET_MSEC; |
2924 lcf->keepalive_header = NGX_CONF_UNSET; | 2933 lcf->keepalive_header = NGX_CONF_UNSET; |
2925 lcf->keepalive_requests = NGX_CONF_UNSET_UINT; | 2934 lcf->keepalive_requests = NGX_CONF_UNSET_UINT; |
2926 lcf->lingering_time = NGX_CONF_UNSET_MSEC; | 2935 lcf->lingering_time = NGX_CONF_UNSET_MSEC; |
2927 lcf->lingering_timeout = NGX_CONF_UNSET_MSEC; | 2936 lcf->lingering_timeout = NGX_CONF_UNSET_MSEC; |
3117 ngx_conf_merge_msec_value(conf->send_timeout, prev->send_timeout, 60000); | 3126 ngx_conf_merge_msec_value(conf->send_timeout, prev->send_timeout, 60000); |
3118 ngx_conf_merge_size_value(conf->send_lowat, prev->send_lowat, 0); | 3127 ngx_conf_merge_size_value(conf->send_lowat, prev->send_lowat, 0); |
3119 ngx_conf_merge_size_value(conf->postpone_output, prev->postpone_output, | 3128 ngx_conf_merge_size_value(conf->postpone_output, prev->postpone_output, |
3120 1460); | 3129 1460); |
3121 ngx_conf_merge_size_value(conf->limit_rate, prev->limit_rate, 0); | 3130 ngx_conf_merge_size_value(conf->limit_rate, prev->limit_rate, 0); |
3131 ngx_conf_merge_size_value(conf->limit_rate_after, prev->limit_rate_after, | |
3132 0); | |
3122 ngx_conf_merge_msec_value(conf->keepalive_timeout, | 3133 ngx_conf_merge_msec_value(conf->keepalive_timeout, |
3123 prev->keepalive_timeout, 75000); | 3134 prev->keepalive_timeout, 75000); |
3124 ngx_conf_merge_sec_value(conf->keepalive_header, | 3135 ngx_conf_merge_sec_value(conf->keepalive_header, |
3125 prev->keepalive_header, 0); | 3136 prev->keepalive_header, 0); |
3126 ngx_conf_merge_uint_value(conf->keepalive_requests, | 3137 ngx_conf_merge_uint_value(conf->keepalive_requests, |