Mercurial > hg > nginx

comparison src/http/ngx_http_core_module.c @ 448:241dc8092a33

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx-0.1.0-2004-10-01-19:53:53 import
author Igor Sysoev <igor@sysoev.ru>
date Fri, 01 Oct 2004 15:53:53 +0000
parents 42d11f017717
children 23fb87bddda1
comparison
equal deleted inserted replaced
447:288f249897e7 448:241dc8092a33
1328 cmcf->max_server_name_len = n->name.len; 1328 cmcf->max_server_name_len = n->name.len;
1329 } 1329 }
1330 } 1330 }
1331 1331
1332 ngx_conf_merge_size_value(conf->connection_pool_size, 1332 ngx_conf_merge_size_value(conf->connection_pool_size,
1333 prev->connection_pool_size, 2048); 1333 prev->connection_pool_size, 256);
1334 ngx_conf_merge_msec_value(conf->post_accept_timeout, 1334 ngx_conf_merge_msec_value(conf->post_accept_timeout,
1335 prev->post_accept_timeout, 30000); 1335 prev->post_accept_timeout, 60000);
1336 ngx_conf_merge_size_value(conf->request_pool_size, 1336 ngx_conf_merge_size_value(conf->request_pool_size,
1337 prev->request_pool_size, 16384); 1337 prev->request_pool_size, 4096);
1338 ngx_conf_merge_msec_value(conf->client_header_timeout, 1338 ngx_conf_merge_msec_value(conf->client_header_timeout,
1339 prev->client_header_timeout, 60000); 1339 prev->client_header_timeout, 60000);
1340 ngx_conf_merge_size_value(conf->client_header_buffer_size, 1340 ngx_conf_merge_size_value(conf->client_header_buffer_size,
1341 prev->client_header_buffer_size, 1024); 1341 prev->client_header_buffer_size, 1024);
1342 ngx_conf_merge_bufs_value(conf->large_client_header_buffers, 1342 ngx_conf_merge_bufs_value(conf->large_client_header_buffers,
1467 1467
1468 ngx_conf_merge_str_value(conf->default_type, 1468 ngx_conf_merge_str_value(conf->default_type,
1469 prev->default_type, "text/plain"); 1469 prev->default_type, "text/plain");
1470 1470
1471 ngx_conf_merge_size_value(conf->client_max_body_size, 1471 ngx_conf_merge_size_value(conf->client_max_body_size,
1472 prev->client_max_body_size, 10 * 1024 * 1024); 1472 prev->client_max_body_size, 1 * 1024 * 1024);
1473 ngx_conf_merge_size_value(conf->client_body_buffer_size, 1473 ngx_conf_merge_size_value(conf->client_body_buffer_size,
1474 prev->client_body_buffer_size, 8192); 1474 prev->client_body_buffer_size,
1475 (size_t) 2 * ngx_pagesize);
1475 ngx_conf_merge_msec_value(conf->client_body_timeout, 1476 ngx_conf_merge_msec_value(conf->client_body_timeout,
1476 prev->client_body_timeout, 60000); 1477 prev->client_body_timeout, 60000);
1477 ngx_conf_merge_value(conf->sendfile, prev->sendfile, 0); 1478 ngx_conf_merge_value(conf->sendfile, prev->sendfile, 0);
1478 ngx_conf_merge_value(conf->tcp_nopush, prev->tcp_nopush, 0); 1479 ngx_conf_merge_value(conf->tcp_nopush, prev->tcp_nopush, 0);
1479 ngx_conf_merge_msec_value(conf->send_timeout, prev->send_timeout, 60000); 1480 ngx_conf_merge_msec_value(conf->send_timeout, prev->send_timeout, 60000);