Mercurial > hg > nginx

comparison src/http/modules/proxy/ngx_http_proxy_handler.c @ 303:00c5660d2707

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx-0.0.3-2004-04-01-20:20:53 import
author Igor Sysoev <igor@sysoev.ru>
date Thu, 01 Apr 2004 16:20:53 +0000
parents 4a3f18406832
children bcbe876f4262
comparison
equal deleted inserted replaced
302:1526e7686b20 303:00c5660d2707
56 { ngx_string("proxy_pass"), 56 { ngx_string("proxy_pass"),
57 NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, 57 NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
58 ngx_http_proxy_set_pass, 58 ngx_http_proxy_set_pass,
59 NGX_HTTP_LOC_CONF_OFFSET, 59 NGX_HTTP_LOC_CONF_OFFSET,
60 0, 60 0,
61 NULL },
62
63 { ngx_string("proxy_request_buffer_size"),
64 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
65 ngx_conf_set_size_slot,
66 NGX_HTTP_LOC_CONF_OFFSET,
67 offsetof(ngx_http_proxy_loc_conf_t, request_buffer_size),
68 NULL }, 61 NULL },
69 62
70 { ngx_string("proxy_connect_timeout"), 63 { ngx_string("proxy_connect_timeout"),
71 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, 64 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
72 ngx_conf_set_msec_slot, 65 ngx_conf_set_msec_slot,
779 772
780 conf->busy_lock = NULL; 773 conf->busy_lock = NULL;
781 774
782 */ 775 */
783 776
784 conf->request_buffer_size = NGX_CONF_UNSET_SIZE;
785 conf->connect_timeout = NGX_CONF_UNSET_MSEC; 777 conf->connect_timeout = NGX_CONF_UNSET_MSEC;
786 conf->send_timeout = NGX_CONF_UNSET_MSEC; 778 conf->send_timeout = NGX_CONF_UNSET_MSEC;
787 779
788 conf->preserve_host = NGX_CONF_UNSET; 780 conf->preserve_host = NGX_CONF_UNSET;
789 conf->set_x_real_ip = NGX_CONF_UNSET; 781 conf->set_x_real_ip = NGX_CONF_UNSET;
820 void *parent, void *child) 812 void *parent, void *child)
821 { 813 {
822 ngx_http_proxy_loc_conf_t *prev = parent; 814 ngx_http_proxy_loc_conf_t *prev = parent;
823 ngx_http_proxy_loc_conf_t *conf = child; 815 ngx_http_proxy_loc_conf_t *conf = child;
824 816
825 ngx_conf_merge_size_value(conf->request_buffer_size,
826 prev->request_buffer_size, 8192);
827 ngx_conf_merge_msec_value(conf->connect_timeout, 817 ngx_conf_merge_msec_value(conf->connect_timeout,
828 prev->connect_timeout, 60000); 818 prev->connect_timeout, 60000);
829 ngx_conf_merge_msec_value(conf->send_timeout, prev->send_timeout, 30000); 819 ngx_conf_merge_msec_value(conf->send_timeout, prev->send_timeout, 30000);
830 820
831 ngx_conf_merge_value(conf->preserve_host, prev->preserve_host, 0); 821 ngx_conf_merge_value(conf->preserve_host, prev->preserve_host, 0);