Mercurial > hg > nginx
comparison src/http/modules/proxy/ngx_http_proxy_handler.c @ 448:241dc8092a33
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 |
---|---|
917 | 917 |
918 size_t size; | 918 size_t size; |
919 | 919 |
920 ngx_conf_merge_msec_value(conf->connect_timeout, | 920 ngx_conf_merge_msec_value(conf->connect_timeout, |
921 prev->connect_timeout, 60000); | 921 prev->connect_timeout, 60000); |
922 ngx_conf_merge_msec_value(conf->send_timeout, prev->send_timeout, 30000); | 922 ngx_conf_merge_msec_value(conf->send_timeout, prev->send_timeout, 60000); |
923 | 923 |
924 ngx_conf_merge_value(conf->preserve_host, prev->preserve_host, 0); | 924 ngx_conf_merge_value(conf->preserve_host, prev->preserve_host, 0); |
925 ngx_conf_merge_value(conf->set_x_real_ip, prev->set_x_real_ip, 0); | 925 ngx_conf_merge_value(conf->set_x_real_ip, prev->set_x_real_ip, 0); |
926 ngx_conf_merge_value(conf->add_x_forwarded_for, | 926 ngx_conf_merge_value(conf->add_x_forwarded_for, |
927 prev->add_x_forwarded_for, 0); | 927 prev->add_x_forwarded_for, 0); |
928 | 928 |
929 ngx_conf_merge_msec_value(conf->read_timeout, prev->read_timeout, 30000); | 929 ngx_conf_merge_msec_value(conf->read_timeout, prev->read_timeout, 60000); |
930 | 930 |
931 ngx_conf_merge_size_value(conf->header_buffer_size, | 931 ngx_conf_merge_size_value(conf->header_buffer_size, |
932 prev->header_buffer_size, 4096); | 932 prev->header_buffer_size, (size_t) ngx_pagesize); |
933 | 933 |
934 ngx_conf_merge_bufs_value(conf->bufs, prev->bufs, 8, 4096); | 934 ngx_conf_merge_bufs_value(conf->bufs, prev->bufs, 8, ngx_pagesize); |
935 | 935 |
936 if (conf->bufs.num < 2) { | 936 if (conf->bufs.num < 2) { |
937 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | 937 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
938 "there must be at least 2 \"proxy_buffers\""); | 938 "there must be at least 2 \"proxy_buffers\""); |
939 return NGX_CONF_ERROR; | 939 return NGX_CONF_ERROR; |