Mercurial > hg > nginx
comparison src/http/ngx_http_core_module.c @ 346:55e496a8ece3
nginx-0.0.3-2004-06-06-23:49:18 import
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Sun, 06 Jun 2004 19:49:18 +0000 |
parents | e366ba5db8f8 |
children | 2e3cbc1bbe3c |
comparison
equal
deleted
inserted
replaced
345:fade4edd61f8 | 346:55e496a8ece3 |
---|---|
223 { ngx_string("lingering_timeout"), | 223 { ngx_string("lingering_timeout"), |
224 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, | 224 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, |
225 ngx_conf_set_msec_slot, | 225 ngx_conf_set_msec_slot, |
226 NGX_HTTP_LOC_CONF_OFFSET, | 226 NGX_HTTP_LOC_CONF_OFFSET, |
227 offsetof(ngx_http_core_loc_conf_t, lingering_timeout), | 227 offsetof(ngx_http_core_loc_conf_t, lingering_timeout), |
228 NULL }, | |
229 | |
230 { ngx_string("reset_timedout_connection"), | |
231 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, | |
232 ngx_conf_set_flag_slot, | |
233 NGX_HTTP_LOC_CONF_OFFSET, | |
234 offsetof(ngx_http_core_loc_conf_t, reset_timedout_connection), | |
228 NULL }, | 235 NULL }, |
229 | 236 |
230 { ngx_string("msie_padding"), | 237 { ngx_string("msie_padding"), |
231 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, | 238 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, |
232 ngx_conf_set_flag_slot, | 239 ngx_conf_set_flag_slot, |
1236 lcf->send_lowat = NGX_CONF_UNSET_SIZE; | 1243 lcf->send_lowat = NGX_CONF_UNSET_SIZE; |
1237 lcf->discarded_buffer_size = NGX_CONF_UNSET_SIZE; | 1244 lcf->discarded_buffer_size = NGX_CONF_UNSET_SIZE; |
1238 lcf->keepalive_timeout = NGX_CONF_UNSET_MSEC; | 1245 lcf->keepalive_timeout = NGX_CONF_UNSET_MSEC; |
1239 lcf->lingering_time = NGX_CONF_UNSET_MSEC; | 1246 lcf->lingering_time = NGX_CONF_UNSET_MSEC; |
1240 lcf->lingering_timeout = NGX_CONF_UNSET_MSEC; | 1247 lcf->lingering_timeout = NGX_CONF_UNSET_MSEC; |
1241 | 1248 lcf->reset_timedout_connection = NGX_CONF_UNSET; |
1242 lcf->msie_padding = NGX_CONF_UNSET; | 1249 lcf->msie_padding = NGX_CONF_UNSET; |
1243 | 1250 |
1244 return lcf; | 1251 return lcf; |
1245 } | 1252 } |
1246 | 1253 |
1324 ngx_conf_merge_msec_value(conf->lingering_time, | 1331 ngx_conf_merge_msec_value(conf->lingering_time, |
1325 prev->lingering_time, 30000); | 1332 prev->lingering_time, 30000); |
1326 ngx_conf_merge_msec_value(conf->lingering_timeout, | 1333 ngx_conf_merge_msec_value(conf->lingering_timeout, |
1327 prev->lingering_timeout, 5000); | 1334 prev->lingering_timeout, 5000); |
1328 | 1335 |
1336 ngx_conf_merge_value(conf->reset_timedout_connection, | |
1337 prev->reset_timedout_connection, 0); | |
1329 ngx_conf_merge_value(conf->msie_padding, prev->msie_padding, 1); | 1338 ngx_conf_merge_value(conf->msie_padding, prev->msie_padding, 1); |
1330 | 1339 |
1331 if (conf->open_files == NULL) { | 1340 if (conf->open_files == NULL) { |
1332 conf->open_files = prev->open_files; | 1341 conf->open_files = prev->open_files; |
1333 } | 1342 } |