Mercurial > hg > nginx
comparison src/http/ngx_http_core_module.c @ 391:b670db10cbbd
nginx-0.0.7-2004-07-14-20:01:42 import
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Wed, 14 Jul 2004 16:01:42 +0000 |
parents | 02a511569afb |
children | 5659d773cfa8 |
comparison
equal
deleted
inserted
replaced
390:1471c6fb108a | 391:b670db10cbbd |
---|---|
203 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, | 203 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, |
204 ngx_conf_set_size_slot, | 204 ngx_conf_set_size_slot, |
205 NGX_HTTP_LOC_CONF_OFFSET, | 205 NGX_HTTP_LOC_CONF_OFFSET, |
206 offsetof(ngx_http_core_loc_conf_t, send_lowat), | 206 offsetof(ngx_http_core_loc_conf_t, send_lowat), |
207 &ngx_http_lowat_post }, | 207 &ngx_http_lowat_post }, |
208 | |
209 { ngx_string("postpone_output"), | |
210 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, | |
211 ngx_conf_set_size_slot, | |
212 NGX_HTTP_LOC_CONF_OFFSET, | |
213 offsetof(ngx_http_core_loc_conf_t, postpone_output), | |
214 NULL }, | |
215 | |
216 { ngx_string("limit_rate"), | |
217 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, | |
218 ngx_conf_set_size_slot, | |
219 NGX_HTTP_LOC_CONF_OFFSET, | |
220 offsetof(ngx_http_core_loc_conf_t, limit_rate), | |
221 NULL }, | |
208 | 222 |
209 { ngx_string("keepalive_timeout"), | 223 { ngx_string("keepalive_timeout"), |
210 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, |
211 ngx_conf_set_msec_slot, | 225 ngx_conf_set_msec_slot, |
212 NGX_HTTP_LOC_CONF_OFFSET, | 226 NGX_HTTP_LOC_CONF_OFFSET, |
1249 lcf->client_body_timeout = NGX_CONF_UNSET_MSEC; | 1263 lcf->client_body_timeout = NGX_CONF_UNSET_MSEC; |
1250 lcf->sendfile = NGX_CONF_UNSET; | 1264 lcf->sendfile = NGX_CONF_UNSET; |
1251 lcf->tcp_nopush = NGX_CONF_UNSET; | 1265 lcf->tcp_nopush = NGX_CONF_UNSET; |
1252 lcf->send_timeout = NGX_CONF_UNSET_MSEC; | 1266 lcf->send_timeout = NGX_CONF_UNSET_MSEC; |
1253 lcf->send_lowat = NGX_CONF_UNSET_SIZE; | 1267 lcf->send_lowat = NGX_CONF_UNSET_SIZE; |
1268 lcf->postpone_output = NGX_CONF_UNSET_SIZE; | |
1269 lcf->limit_rate = NGX_CONF_UNSET_SIZE; | |
1254 lcf->discarded_buffer_size = NGX_CONF_UNSET_SIZE; | 1270 lcf->discarded_buffer_size = NGX_CONF_UNSET_SIZE; |
1255 lcf->keepalive_timeout = NGX_CONF_UNSET_MSEC; | 1271 lcf->keepalive_timeout = NGX_CONF_UNSET_MSEC; |
1256 lcf->lingering_time = NGX_CONF_UNSET_MSEC; | 1272 lcf->lingering_time = NGX_CONF_UNSET_MSEC; |
1257 lcf->lingering_timeout = NGX_CONF_UNSET_MSEC; | 1273 lcf->lingering_timeout = NGX_CONF_UNSET_MSEC; |
1258 lcf->reset_timedout_connection = NGX_CONF_UNSET; | 1274 lcf->reset_timedout_connection = NGX_CONF_UNSET; |
1332 prev->client_body_timeout, 60000); | 1348 prev->client_body_timeout, 60000); |
1333 ngx_conf_merge_value(conf->sendfile, prev->sendfile, 0); | 1349 ngx_conf_merge_value(conf->sendfile, prev->sendfile, 0); |
1334 ngx_conf_merge_value(conf->tcp_nopush, prev->tcp_nopush, 0); | 1350 ngx_conf_merge_value(conf->tcp_nopush, prev->tcp_nopush, 0); |
1335 ngx_conf_merge_msec_value(conf->send_timeout, prev->send_timeout, 60000); | 1351 ngx_conf_merge_msec_value(conf->send_timeout, prev->send_timeout, 60000); |
1336 ngx_conf_merge_size_value(conf->send_lowat, prev->send_lowat, 0); | 1352 ngx_conf_merge_size_value(conf->send_lowat, prev->send_lowat, 0); |
1353 ngx_conf_merge_size_value(conf->postpone_output, prev->postpone_output, | |
1354 1460); | |
1355 ngx_conf_merge_size_value(conf->limit_rate, prev->limit_rate, 0); | |
1337 ngx_conf_merge_size_value(conf->discarded_buffer_size, | 1356 ngx_conf_merge_size_value(conf->discarded_buffer_size, |
1338 prev->discarded_buffer_size, 1500); | 1357 prev->discarded_buffer_size, 1500); |
1339 ngx_conf_merge_msec_value(conf->keepalive_timeout, | 1358 ngx_conf_merge_msec_value(conf->keepalive_timeout, |
1340 prev->keepalive_timeout, 70000); | 1359 prev->keepalive_timeout, 70000); |
1341 ngx_conf_merge_msec_value(conf->lingering_time, | 1360 ngx_conf_merge_msec_value(conf->lingering_time, |