Mercurial > hg > nginx
comparison src/http/ngx_http_core_module.c @ 2907:4f5753877376
limit_rate_after
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Tue, 02 Jun 2009 14:01:50 +0000 |
parents | 512d164a8348 |
children | c7d57b539248 |
comparison
equal
deleted
inserted
replaced
2906:97693137d636 | 2907:4f5753877376 |
---|---|
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, |
2922 lcf->tcp_nodelay = NGX_CONF_UNSET; | 2930 lcf->tcp_nodelay = NGX_CONF_UNSET; |
2923 lcf->send_timeout = NGX_CONF_UNSET_MSEC; | 2931 lcf->send_timeout = NGX_CONF_UNSET_MSEC; |
2924 lcf->send_lowat = NGX_CONF_UNSET_SIZE; | 2932 lcf->send_lowat = NGX_CONF_UNSET_SIZE; |
2925 lcf->postpone_output = NGX_CONF_UNSET_SIZE; | 2933 lcf->postpone_output = NGX_CONF_UNSET_SIZE; |
2926 lcf->limit_rate = NGX_CONF_UNSET_SIZE; | 2934 lcf->limit_rate = NGX_CONF_UNSET_SIZE; |
2935 lcf->limit_rate_after = NGX_CONF_UNSET_SIZE; | |
2927 lcf->keepalive_timeout = NGX_CONF_UNSET_MSEC; | 2936 lcf->keepalive_timeout = NGX_CONF_UNSET_MSEC; |
2928 lcf->keepalive_header = NGX_CONF_UNSET; | 2937 lcf->keepalive_header = NGX_CONF_UNSET; |
2929 lcf->keepalive_requests = NGX_CONF_UNSET_UINT; | 2938 lcf->keepalive_requests = NGX_CONF_UNSET_UINT; |
2930 lcf->lingering_time = NGX_CONF_UNSET_MSEC; | 2939 lcf->lingering_time = NGX_CONF_UNSET_MSEC; |
2931 lcf->lingering_timeout = NGX_CONF_UNSET_MSEC; | 2940 lcf->lingering_timeout = NGX_CONF_UNSET_MSEC; |
3121 ngx_conf_merge_msec_value(conf->send_timeout, prev->send_timeout, 60000); | 3130 ngx_conf_merge_msec_value(conf->send_timeout, prev->send_timeout, 60000); |
3122 ngx_conf_merge_size_value(conf->send_lowat, prev->send_lowat, 0); | 3131 ngx_conf_merge_size_value(conf->send_lowat, prev->send_lowat, 0); |
3123 ngx_conf_merge_size_value(conf->postpone_output, prev->postpone_output, | 3132 ngx_conf_merge_size_value(conf->postpone_output, prev->postpone_output, |
3124 1460); | 3133 1460); |
3125 ngx_conf_merge_size_value(conf->limit_rate, prev->limit_rate, 0); | 3134 ngx_conf_merge_size_value(conf->limit_rate, prev->limit_rate, 0); |
3135 ngx_conf_merge_size_value(conf->limit_rate_after, prev->limit_rate_after, | |
3136 0); | |
3126 ngx_conf_merge_msec_value(conf->keepalive_timeout, | 3137 ngx_conf_merge_msec_value(conf->keepalive_timeout, |
3127 prev->keepalive_timeout, 75000); | 3138 prev->keepalive_timeout, 75000); |
3128 ngx_conf_merge_sec_value(conf->keepalive_header, | 3139 ngx_conf_merge_sec_value(conf->keepalive_header, |
3129 prev->keepalive_header, 0); | 3140 prev->keepalive_header, 0); |
3130 ngx_conf_merge_uint_value(conf->keepalive_requests, | 3141 ngx_conf_merge_uint_value(conf->keepalive_requests, |