comparison src/http/ngx_http_core_module.c @ 1197:493a227edfd5

sendfile_max_chunk
author Igor Sysoev <igor@sysoev.ru>
date Mon, 07 May 2007 06:33:39 +0000
parents 6e2216ad2c87
children 98317b0a0852
comparison
equal deleted inserted replaced
1196:67077918b965 1197:493a227edfd5
291 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF 291 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
292 |NGX_CONF_TAKE1, 292 |NGX_CONF_TAKE1,
293 ngx_conf_set_flag_slot, 293 ngx_conf_set_flag_slot,
294 NGX_HTTP_LOC_CONF_OFFSET, 294 NGX_HTTP_LOC_CONF_OFFSET,
295 offsetof(ngx_http_core_loc_conf_t, sendfile), 295 offsetof(ngx_http_core_loc_conf_t, sendfile),
296 NULL },
297
298 { ngx_string("sendfile_max_chunk"),
299 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
300 ngx_conf_set_size_slot,
301 NGX_HTTP_LOC_CONF_OFFSET,
302 offsetof(ngx_http_core_loc_conf_t, sendfile_max_chunk),
296 NULL }, 303 NULL },
297 304
298 { ngx_string("tcp_nopush"), 305 { ngx_string("tcp_nopush"),
299 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, 306 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
300 ngx_conf_set_flag_slot, 307 ngx_conf_set_flag_slot,
2189 lcf->client_body_timeout = NGX_CONF_UNSET_MSEC; 2196 lcf->client_body_timeout = NGX_CONF_UNSET_MSEC;
2190 lcf->satisfy_any = NGX_CONF_UNSET; 2197 lcf->satisfy_any = NGX_CONF_UNSET;
2191 lcf->internal = NGX_CONF_UNSET; 2198 lcf->internal = NGX_CONF_UNSET;
2192 lcf->client_body_in_file_only = NGX_CONF_UNSET; 2199 lcf->client_body_in_file_only = NGX_CONF_UNSET;
2193 lcf->sendfile = NGX_CONF_UNSET; 2200 lcf->sendfile = NGX_CONF_UNSET;
2201 lcf->sendfile_max_chunk = NGX_CONF_UNSET_SIZE;
2194 lcf->tcp_nopush = NGX_CONF_UNSET; 2202 lcf->tcp_nopush = NGX_CONF_UNSET;
2195 lcf->tcp_nodelay = NGX_CONF_UNSET; 2203 lcf->tcp_nodelay = NGX_CONF_UNSET;
2196 lcf->send_timeout = NGX_CONF_UNSET_MSEC; 2204 lcf->send_timeout = NGX_CONF_UNSET_MSEC;
2197 lcf->send_lowat = NGX_CONF_UNSET_SIZE; 2205 lcf->send_lowat = NGX_CONF_UNSET_SIZE;
2198 lcf->postpone_output = NGX_CONF_UNSET_SIZE; 2206 lcf->postpone_output = NGX_CONF_UNSET_SIZE;
2357 ngx_conf_merge_value(conf->satisfy_any, prev->satisfy_any, 0); 2365 ngx_conf_merge_value(conf->satisfy_any, prev->satisfy_any, 0);
2358 ngx_conf_merge_value(conf->internal, prev->internal, 0); 2366 ngx_conf_merge_value(conf->internal, prev->internal, 0);
2359 ngx_conf_merge_value(conf->client_body_in_file_only, 2367 ngx_conf_merge_value(conf->client_body_in_file_only,
2360 prev->client_body_in_file_only, 0); 2368 prev->client_body_in_file_only, 0);
2361 ngx_conf_merge_value(conf->sendfile, prev->sendfile, 0); 2369 ngx_conf_merge_value(conf->sendfile, prev->sendfile, 0);
2370 ngx_conf_merge_size_value(conf->sendfile_max_chunk,
2371 prev->sendfile_max_chunk, 0);
2362 ngx_conf_merge_value(conf->tcp_nopush, prev->tcp_nopush, 0); 2372 ngx_conf_merge_value(conf->tcp_nopush, prev->tcp_nopush, 0);
2363 ngx_conf_merge_value(conf->tcp_nodelay, prev->tcp_nodelay, 1); 2373 ngx_conf_merge_value(conf->tcp_nodelay, prev->tcp_nodelay, 1);
2364 2374
2365 ngx_conf_merge_msec_value(conf->send_timeout, prev->send_timeout, 60000); 2375 ngx_conf_merge_msec_value(conf->send_timeout, prev->send_timeout, 60000);
2366 ngx_conf_merge_size_value(conf->send_lowat, prev->send_lowat, 0); 2376 ngx_conf_merge_size_value(conf->send_lowat, prev->send_lowat, 0);