diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2004-10-01 15:53:53 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2004-10-01 15:53:53 +0000 |
| commit | 8035fd27919d1f598b0d655a3bf30200220462d3 (patch) | |
| tree | 5881e9883cfb282ec37eb8ab1f903c59ff41ddb0 /src/http | |
| parent | 4bed15b9b58f7ea5c1626162944db140b7119488 (diff) | |
| download | nginx-8035fd27919d1f598b0d655a3bf30200220462d3.tar.gz nginx-8035fd27919d1f598b0d655a3bf30200220462d3.tar.bz2 | |
nginx-0.1.0-2004-10-01-19:53:53 import
Diffstat (limited to 'src/http')
| -rw-r--r-- | src/http/modules/proxy/ngx_http_proxy_handler.c | 8 | ||||
| -rw-r--r-- | src/http/ngx_http_core_module.c | 11 |
2 files changed, 10 insertions, 9 deletions
diff --git a/src/http/modules/proxy/ngx_http_proxy_handler.c b/src/http/modules/proxy/ngx_http_proxy_handler.c index f394fbb24..3fa2e0bf3 100644 --- a/src/http/modules/proxy/ngx_http_proxy_handler.c +++ b/src/http/modules/proxy/ngx_http_proxy_handler.c @@ -919,19 +919,19 @@ static char *ngx_http_proxy_merge_loc_conf(ngx_conf_t *cf, ngx_conf_merge_msec_value(conf->connect_timeout, prev->connect_timeout, 60000); - ngx_conf_merge_msec_value(conf->send_timeout, prev->send_timeout, 30000); + ngx_conf_merge_msec_value(conf->send_timeout, prev->send_timeout, 60000); ngx_conf_merge_value(conf->preserve_host, prev->preserve_host, 0); ngx_conf_merge_value(conf->set_x_real_ip, prev->set_x_real_ip, 0); ngx_conf_merge_value(conf->add_x_forwarded_for, prev->add_x_forwarded_for, 0); - ngx_conf_merge_msec_value(conf->read_timeout, prev->read_timeout, 30000); + ngx_conf_merge_msec_value(conf->read_timeout, prev->read_timeout, 60000); ngx_conf_merge_size_value(conf->header_buffer_size, - prev->header_buffer_size, 4096); + prev->header_buffer_size, (size_t) ngx_pagesize); - ngx_conf_merge_bufs_value(conf->bufs, prev->bufs, 8, 4096); + ngx_conf_merge_bufs_value(conf->bufs, prev->bufs, 8, ngx_pagesize); if (conf->bufs.num < 2) { ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c index 68bb314b3..6df6edf45 100644 --- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c @@ -1330,11 +1330,11 @@ static char *ngx_http_core_merge_srv_conf(ngx_conf_t *cf, } ngx_conf_merge_size_value(conf->connection_pool_size, - prev->connection_pool_size, 2048); + prev->connection_pool_size, 256); ngx_conf_merge_msec_value(conf->post_accept_timeout, - prev->post_accept_timeout, 30000); + prev->post_accept_timeout, 60000); ngx_conf_merge_size_value(conf->request_pool_size, - prev->request_pool_size, 16384); + prev->request_pool_size, 4096); ngx_conf_merge_msec_value(conf->client_header_timeout, prev->client_header_timeout, 60000); ngx_conf_merge_size_value(conf->client_header_buffer_size, @@ -1469,9 +1469,10 @@ static char *ngx_http_core_merge_loc_conf(ngx_conf_t *cf, prev->default_type, "text/plain"); ngx_conf_merge_size_value(conf->client_max_body_size, - prev->client_max_body_size, 10 * 1024 * 1024); + prev->client_max_body_size, 1 * 1024 * 1024); ngx_conf_merge_size_value(conf->client_body_buffer_size, - prev->client_body_buffer_size, 8192); + prev->client_body_buffer_size, + (size_t) 2 * ngx_pagesize); ngx_conf_merge_msec_value(conf->client_body_timeout, prev->client_body_timeout, 60000); ngx_conf_merge_value(conf->sendfile, prev->sendfile, 0); |