Mercurial > hg > nginx

comparison src/http/modules/proxy/ngx_http_proxy_handler.c @ 304:bcbe876f4262

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx-0.0.3-2004-04-02-09:14:40 import
author Igor Sysoev <igor@sysoev.ru>
date Fri, 02 Apr 2004 05:14:40 +0000
parents 00c5660d2707
children 4b1a3a4acc60
comparison
equal deleted inserted replaced
303:00c5660d2707 304:bcbe876f4262
812 void *parent, void *child) 812 void *parent, void *child)
813 { 813 {
814 ngx_http_proxy_loc_conf_t *prev = parent; 814 ngx_http_proxy_loc_conf_t *prev = parent;
815 ngx_http_proxy_loc_conf_t *conf = child; 815 ngx_http_proxy_loc_conf_t *conf = child;
816 816
817 size_t size;
818
817 ngx_conf_merge_msec_value(conf->connect_timeout, 819 ngx_conf_merge_msec_value(conf->connect_timeout,
818 prev->connect_timeout, 60000); 820 prev->connect_timeout, 60000);
819 ngx_conf_merge_msec_value(conf->send_timeout, prev->send_timeout, 30000); 821 ngx_conf_merge_msec_value(conf->send_timeout, prev->send_timeout, 30000);
820 822
821 ngx_conf_merge_value(conf->preserve_host, prev->preserve_host, 0); 823 ngx_conf_merge_value(conf->preserve_host, prev->preserve_host, 0);
822 ngx_conf_merge_value(conf->set_x_real_ip, prev->set_x_real_ip, 0); 824 ngx_conf_merge_value(conf->set_x_real_ip, prev->set_x_real_ip, 0);
823 ngx_conf_merge_value(conf->add_x_forwarded_for, 825 ngx_conf_merge_value(conf->add_x_forwarded_for,
824 prev->add_x_forwarded_for, 0); 826 prev->add_x_forwarded_for, 0);
825 827
828 ngx_conf_merge_msec_value(conf->read_timeout, prev->read_timeout, 30000);
829
826 ngx_conf_merge_size_value(conf->header_buffer_size, 830 ngx_conf_merge_size_value(conf->header_buffer_size,
827 prev->header_buffer_size, 4096); 831 prev->header_buffer_size, 4096);
828 ngx_conf_merge_msec_value(conf->read_timeout, prev->read_timeout, 30000);
829 ngx_conf_merge_bufs_value(conf->bufs, prev->bufs, 8, 4096); 832 ngx_conf_merge_bufs_value(conf->bufs, prev->bufs, 8, 4096);
833
834 size = conf->header_buffer_size;
835 if (size < conf->bufs.size) {
836 size = conf->bufs.size;
837 }
838
839
830 ngx_conf_merge_size_value(conf->busy_buffers_size, 840 ngx_conf_merge_size_value(conf->busy_buffers_size,
831 prev->busy_buffers_size, 8192); 841 prev->busy_buffers_size, NGX_CONF_UNSET_SIZE);
832 842
833 #if 0 843 if (conf->busy_buffers_size == NGX_CONF_UNSET_SIZE) {
834 if (conf->max_temp_file_size > conf->bufs.size) { 844 conf->busy_buffers_size = 2 * size;
835 return "\"proxy_max_temp_file\" must be greater " 845
836 "than one of the \"proxy_buffers\""; 846 } else if (conf->busy_buffers_size < size) {
837 } 847 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
838 #endif 848 "\"proxy_busy_buffers_size\" must be equal or bigger than "
849 "maximum of the value of \"proxy_header_buffer_size\" and "
850 "one of the \"proxy_buffers\"");
851
852 return NGX_CONF_ERROR;
853 }
854
839 855
840 ngx_conf_merge_size_value(conf->temp_file_write_size, 856 ngx_conf_merge_size_value(conf->temp_file_write_size,
841 prev->temp_file_write_size, 16384); 857 prev->temp_file_write_size, NGX_CONF_UNSET_SIZE);
858
859 if (conf->temp_file_write_size == NGX_CONF_UNSET_SIZE) {
860 conf->temp_file_write_size = 2 * size;
861
862 } else if (conf->temp_file_write_size < size) {
863 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
864 "\"proxy_temp_file_write_size\" must be equal or bigger than "
865 "maximum of the value of \"proxy_header_buffer_size\" and "
866 "one of the \"proxy_buffers\"");
867
868 return NGX_CONF_ERROR;
869 }
870
871
872 ngx_conf_merge_size_value(conf->max_temp_file_size,
873 prev->max_temp_file_size, NGX_CONF_UNSET_SIZE);
874
875 if (conf->max_temp_file_size == NGX_CONF_UNSET_SIZE) {
876 conf->max_temp_file_size = 2 * size;
877
878 } else if (conf->max_temp_file_size < size) {
879 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
880 "\"proxy_max_temp_file_size\" must be equal or bigger than "
881 "maximum of the value of \"proxy_header_buffer_size\" and "
882 "one of the \"proxy_buffers\"");
883
884 return NGX_CONF_ERROR;
885 }
886
842 887
843 ngx_conf_merge_bitmask_value(conf->next_upstream, prev->next_upstream, 888 ngx_conf_merge_bitmask_value(conf->next_upstream, prev->next_upstream,
844 (NGX_CONF_BITMASK_SET 889 (NGX_CONF_BITMASK_SET
845 |NGX_HTTP_PROXY_FT_ERROR 890 |NGX_HTTP_PROXY_FT_ERROR
846 |NGX_HTTP_PROXY_FT_TIMEOUT)); 891 |NGX_HTTP_PROXY_FT_TIMEOUT));