Mercurial > hg > nginx

comparison src/http/ngx_http_core_module.c @ 436:9549fc9508e5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx-0.0.11-2004-09-23-10:32:00 import
author Igor Sysoev <igor@sysoev.ru>
date Thu, 23 Sep 2004 06:32:00 +0000
parents 5cdc4838d4e8
children 470270fa84d2
comparison
equal deleted inserted replaced
435:5cdc4838d4e8 436:9549fc9508e5
94 ngx_conf_set_size_slot, 94 ngx_conf_set_size_slot,
95 NGX_HTTP_SRV_CONF_OFFSET, 95 NGX_HTTP_SRV_CONF_OFFSET,
96 offsetof(ngx_http_core_srv_conf_t, client_header_buffer_size), 96 offsetof(ngx_http_core_srv_conf_t, client_header_buffer_size),
97 NULL }, 97 NULL },
98 98
99 { ngx_string("client_large_buffers"), 99 { ngx_string("large_client_header_buffers"),
100 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE2, 100 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE2,
101 ngx_conf_set_bufs_slot, 101 ngx_conf_set_bufs_slot,
102 NGX_HTTP_SRV_CONF_OFFSET, 102 NGX_HTTP_SRV_CONF_OFFSET,
103 offsetof(ngx_http_core_srv_conf_t, client_large_buffers), 103 offsetof(ngx_http_core_srv_conf_t, large_client_header_buffers),
104 NULL },
105
106 { ngx_string("large_client_header"),
107 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG,
108 ngx_conf_set_flag_slot,
109 NGX_HTTP_SRV_CONF_OFFSET,
110 offsetof(ngx_http_core_srv_conf_t, large_client_header),
111 NULL }, 104 NULL },
112 105
113 { ngx_string("restrict_host_names"), 106 { ngx_string("restrict_host_names"),
114 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1, 107 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
115 ngx_conf_set_enum_slot, 108 ngx_conf_set_enum_slot,
237 { ngx_string("keepalive_timeout"), 230 { ngx_string("keepalive_timeout"),
238 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE12, 231 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE12,
239 ngx_set_keepalive, 232 ngx_set_keepalive,
240 NGX_HTTP_LOC_CONF_OFFSET, 233 NGX_HTTP_LOC_CONF_OFFSET,
241 0, 234 0,
235 NULL },
236
237 { ngx_string("keepalive_buffers"),
238 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
239 ngx_conf_set_flag_slot,
240 NGX_HTTP_LOC_CONF_OFFSET,
241 offsetof(ngx_http_core_loc_conf_t, keepalive_buffers),
242 NULL }, 242 NULL },
243 243
244 { ngx_string("lingering_time"), 244 { ngx_string("lingering_time"),
245 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, 245 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
246 ngx_conf_set_msec_slot, 246 ngx_conf_set_msec_slot,
1273 cscf->connection_pool_size = NGX_CONF_UNSET_SIZE; 1273 cscf->connection_pool_size = NGX_CONF_UNSET_SIZE;
1274 cscf->post_accept_timeout = NGX_CONF_UNSET_MSEC; 1274 cscf->post_accept_timeout = NGX_CONF_UNSET_MSEC;
1275 cscf->request_pool_size = NGX_CONF_UNSET_SIZE; 1275 cscf->request_pool_size = NGX_CONF_UNSET_SIZE;
1276 cscf->client_header_timeout = NGX_CONF_UNSET_MSEC; 1276 cscf->client_header_timeout = NGX_CONF_UNSET_MSEC;
1277 cscf->client_header_buffer_size = NGX_CONF_UNSET_SIZE; 1277 cscf->client_header_buffer_size = NGX_CONF_UNSET_SIZE;
1278 cscf->large_client_header = NGX_CONF_UNSET;
1279 cscf->restrict_host_names = NGX_CONF_UNSET_UINT; 1278 cscf->restrict_host_names = NGX_CONF_UNSET_UINT;
1280 1279
1281 return cscf; 1280 return cscf;
1282 } 1281 }
1283 1282
1331 cmcf->max_server_name_len = n->name.len; 1330 cmcf->max_server_name_len = n->name.len;
1332 } 1331 }
1333 } 1332 }
1334 1333
1335 ngx_conf_merge_size_value(conf->connection_pool_size, 1334 ngx_conf_merge_size_value(conf->connection_pool_size,
1336 prev->connection_pool_size, 16384); 1335 prev->connection_pool_size, 2048);
1337 ngx_conf_merge_msec_value(conf->post_accept_timeout, 1336 ngx_conf_merge_msec_value(conf->post_accept_timeout,
1338 prev->post_accept_timeout, 30000); 1337 prev->post_accept_timeout, 30000);
1339 ngx_conf_merge_size_value(conf->request_pool_size, 1338 ngx_conf_merge_size_value(conf->request_pool_size,
1340 prev->request_pool_size, 16384); 1339 prev->request_pool_size, 16384);
1341 ngx_conf_merge_msec_value(conf->client_header_timeout, 1340 ngx_conf_merge_msec_value(conf->client_header_timeout,
1342 prev->client_header_timeout, 60000); 1341 prev->client_header_timeout, 60000);
1343 ngx_conf_merge_size_value(conf->client_header_buffer_size, 1342 ngx_conf_merge_size_value(conf->client_header_buffer_size,
1344 prev->client_header_buffer_size, 1024); 1343 prev->client_header_buffer_size, 1024);
1345 ngx_conf_merge_bufs_value(conf->client_large_buffers, 1344 ngx_conf_merge_bufs_value(conf->large_client_header_buffers,
1346 prev->client_large_buffers, 4, ngx_pagesize); 1345 prev->large_client_header_buffers,
1347 ngx_conf_merge_value(conf->large_client_header, 1346 4, ngx_pagesize);
1348 prev->large_client_header, 1); 1347
1348 if (conf->large_client_header_buffers.size < conf->connection_pool_size) {
1349 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
1350 "the \"large_client_header_buffers\" size must be "
1351 "equal to or bigger than \"connection_pool_size\"");
1352 return NGX_CONF_ERROR;
1353 }
1354
1349 ngx_conf_merge_unsigned_value(conf->restrict_host_names, 1355 ngx_conf_merge_unsigned_value(conf->restrict_host_names,
1350 prev->restrict_host_names, 0); 1356 prev->restrict_host_names, 0);
1351 1357
1352 return NGX_CONF_OK; 1358 return NGX_CONF_OK;
1353 } 1359 }
1385 lcf->tcp_nopush = NGX_CONF_UNSET; 1391 lcf->tcp_nopush = NGX_CONF_UNSET;
1386 lcf->send_timeout = NGX_CONF_UNSET_MSEC; 1392 lcf->send_timeout = NGX_CONF_UNSET_MSEC;
1387 lcf->send_lowat = NGX_CONF_UNSET_SIZE; 1393 lcf->send_lowat = NGX_CONF_UNSET_SIZE;
1388 lcf->postpone_output = NGX_CONF_UNSET_SIZE; 1394 lcf->postpone_output = NGX_CONF_UNSET_SIZE;
1389 lcf->limit_rate = NGX_CONF_UNSET_SIZE; 1395 lcf->limit_rate = NGX_CONF_UNSET_SIZE;
1390 lcf->discarded_buffer_size = NGX_CONF_UNSET_SIZE;
1391 lcf->keepalive_timeout = NGX_CONF_UNSET_MSEC; 1396 lcf->keepalive_timeout = NGX_CONF_UNSET_MSEC;
1392 lcf->keepalive_header = NGX_CONF_UNSET; 1397 lcf->keepalive_header = NGX_CONF_UNSET;
1398 lcf->keepalive_buffers = NGX_CONF_UNSET;
1393 lcf->lingering_time = NGX_CONF_UNSET_MSEC; 1399 lcf->lingering_time = NGX_CONF_UNSET_MSEC;
1394 lcf->lingering_timeout = NGX_CONF_UNSET_MSEC; 1400 lcf->lingering_timeout = NGX_CONF_UNSET_MSEC;
1395 lcf->reset_timedout_connection = NGX_CONF_UNSET; 1401 lcf->reset_timedout_connection = NGX_CONF_UNSET;
1396 lcf->msie_padding = NGX_CONF_UNSET; 1402 lcf->msie_padding = NGX_CONF_UNSET;
1397 1403
1472 ngx_conf_merge_msec_value(conf->send_timeout, prev->send_timeout, 60000); 1478 ngx_conf_merge_msec_value(conf->send_timeout, prev->send_timeout, 60000);
1473 ngx_conf_merge_size_value(conf->send_lowat, prev->send_lowat, 0); 1479 ngx_conf_merge_size_value(conf->send_lowat, prev->send_lowat, 0);
1474 ngx_conf_merge_size_value(conf->postpone_output, prev->postpone_output, 1480 ngx_conf_merge_size_value(conf->postpone_output, prev->postpone_output,
1475 1460); 1481 1460);
1476 ngx_conf_merge_size_value(conf->limit_rate, prev->limit_rate, 0); 1482 ngx_conf_merge_size_value(conf->limit_rate, prev->limit_rate, 0);
1477 ngx_conf_merge_size_value(conf->discarded_buffer_size,
1478 prev->discarded_buffer_size, 1500);
1479 ngx_conf_merge_msec_value(conf->keepalive_timeout, 1483 ngx_conf_merge_msec_value(conf->keepalive_timeout,
1480 prev->keepalive_timeout, 75000); 1484 prev->keepalive_timeout, 75000);
1481 ngx_conf_merge_sec_value(conf->keepalive_header, 1485 ngx_conf_merge_sec_value(conf->keepalive_header,
1482 prev->keepalive_header, 0); 1486 prev->keepalive_header, 0);
1487 ngx_conf_merge_value(conf->keepalive_buffers, prev->keepalive_buffers, 1);
1483 ngx_conf_merge_msec_value(conf->lingering_time, 1488 ngx_conf_merge_msec_value(conf->lingering_time,
1484 prev->lingering_time, 30000); 1489 prev->lingering_time, 30000);
1485 ngx_conf_merge_msec_value(conf->lingering_timeout, 1490 ngx_conf_merge_msec_value(conf->lingering_timeout,
1486 prev->lingering_timeout, 5000); 1491 prev->lingering_timeout, 5000);
1487 1492