nginx: src/http/modules/ngx_http_proxy

annotate src/http/modules/ngx_http_proxy_module.c @ 7047:3fef8c5caa75

Proxy: split configured header names and values. Previously, each configured header was represented in one of two ways, depending on whether or not its value included any variables. If the value didn't include any variables, then it would be represented as as a single script that contained complete header line with HTTP/1.1 delimiters, i.e.: "Header: value\r\n" But if the value included any variables, then it would be represented as a series of three scripts: first contained header name and the ": " delimiter, second evaluated to header value, and third contained only "\r\n", i.e.: "Header: " "$value" "\r\n" This commit changes that, so that each configured header is represented as a series of two scripts: first contains only header name, and second contains (or evaluates to) only header value, i.e.: "Header" "$value" or "Header" "value" This not only makes things more consistent, but also allows header name and value to be accessed separately. Signed-off-by: Piotr Sikora <piotrsikora@google.com>

author	Piotr Sikora <piotrsikora@google.com>
date	Wed, 15 Mar 2017 15:55:35 -0700
parents	08537eab4f23
children	2a288909abc6

rev	line source
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2 /*
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3 * Copyright (C) Igor Sysoev
4412 d620f497c50f Copyright updated. Maxim Konovalov <maxim@nginx.com> parents: 4401 diff changeset	4 * Copyright (C) Nginx, Inc.
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	5 */
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	6
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	7
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	8 #include <ngx_config.h>
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	9 #include <ngx_core.h>
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	10 #include <ngx_http.h>
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	11
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	12
5951 610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	13 typedef struct {
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	14 ngx_array_t caches; /* ngx_http_file_cache_t * */
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	15 } ngx_http_proxy_main_conf_t;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	16
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	17
4461 103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	18 typedef struct ngx_http_proxy_rewrite_s ngx_http_proxy_rewrite_t;
103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	19
103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	20 typedef ngx_int_t (ngx_http_proxy_rewrite_pt)(ngx_http_request_t r,
4462 a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	21 ngx_table_elt_t *h, size_t prefix, size_t len,
a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	22 ngx_http_proxy_rewrite_t *pr);
4461 103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	23
103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	24 struct ngx_http_proxy_rewrite_s {
103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	25 ngx_http_proxy_rewrite_pt handler;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	26
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	27 union {
4336 99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	28 ngx_http_complex_value_t complex;
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	29 #if (NGX_PCRE)
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	30 ngx_http_regex_t *regex;
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	31 #endif
4461 103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	32 } pattern;
4336 99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	33
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	34 ngx_http_complex_value_t replacement;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	35 };
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	36
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	37
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	38 typedef struct {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	39 ngx_str_t key_start;
2391 d88e757cc7d8 delete surplus upstream.schema field Igor Sysoev <igor@sysoev.ru> parents: 2285 diff changeset	40 ngx_str_t schema;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	41 ngx_str_t host_header;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	42 ngx_str_t port;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	43 ngx_str_t uri;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	44 } ngx_http_proxy_vars_t;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	45
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	46
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	47 typedef struct {
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	48 ngx_array_t *flushes;
f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	49 ngx_array_t *lengths;
f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	50 ngx_array_t *values;
f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	51 ngx_hash_t hash;
f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	52 } ngx_http_proxy_headers_t;
f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	53
f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	54
f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	55 typedef struct {
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	56 ngx_http_upstream_conf_t upstream;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	57
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	58 ngx_array_t *body_flushes;
5910 29fa5023bd6f Proxy: renamed and rearranged fields in proxy configuration. Roman Arutyunyan <arut@nginx.com> parents: 5909 diff changeset	59 ngx_array_t *body_lengths;
29fa5023bd6f Proxy: renamed and rearranged fields in proxy configuration. Roman Arutyunyan <arut@nginx.com> parents: 5909 diff changeset	60 ngx_array_t *body_values;
29fa5023bd6f Proxy: renamed and rearranged fields in proxy configuration. Roman Arutyunyan <arut@nginx.com> parents: 5909 diff changeset	61 ngx_str_t body_source;
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	62
f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	63 ngx_http_proxy_headers_t headers;
5909 8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	64 #if (NGX_HTTP_CACHE)
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	65 ngx_http_proxy_headers_t headers_cache;
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	66 #endif
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	67 ngx_array_t *headers_source;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	68
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	69 ngx_array_t *proxy_lengths;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	70 ngx_array_t *proxy_values;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	71
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	72 ngx_array_t *redirects;
4465 8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	73 ngx_array_t *cookie_domains;
4466 b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	74 ngx_array_t *cookie_paths;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	75
6781 ca27074f8f0f Proxy: support variables for proxy_method directive. Dmitry Lazurkin <dilaz03@gmail.com> parents: 6747 diff changeset	76 ngx_http_complex_value_t *method;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	77 ngx_str_t location;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	78 ngx_str_t url;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	79
2672 b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	80 #if (NGX_HTTP_CACHE)
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	81 ngx_http_complex_value_t cache_key;
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	82 #endif
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	83
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	84 ngx_http_proxy_vars_t vars;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	85
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	86 ngx_flag_t redirect;
1180 1666b7b0bafc proxy_headers_hash_max_size and proxy_headers_hash_bucket_size Igor Sysoev <igor@sysoev.ru> parents: 1125 diff changeset	87
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	88 ngx_uint_t http_version;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	89
1180 1666b7b0bafc proxy_headers_hash_max_size and proxy_headers_hash_bucket_size Igor Sysoev <igor@sysoev.ru> parents: 1125 diff changeset	90 ngx_uint_t headers_hash_max_size;
1666b7b0bafc proxy_headers_hash_max_size and proxy_headers_hash_bucket_size Igor Sysoev <igor@sysoev.ru> parents: 1125 diff changeset	91 ngx_uint_t headers_hash_bucket_size;
5385 7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	92
7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	93 #if (NGX_HTTP_SSL)
7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	94 ngx_uint_t ssl;
7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	95 ngx_uint_t ssl_protocols;
5390 919d230ecdbe Proxy: added the "proxy_ssl_ciphers" directive. Piotr Sikora <piotr@cloudflare.com> parents: 5385 diff changeset	96 ngx_str_t ssl_ciphers;
5661 060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	97 ngx_uint_t ssl_verify_depth;
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	98 ngx_str_t ssl_trusted_certificate;
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	99 ngx_str_t ssl_crl;
5900 20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	100 ngx_str_t ssl_certificate;
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	101 ngx_str_t ssl_certificate_key;
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	102 ngx_array_t *ssl_passwords;
5385 7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	103 #endif
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	104 } ngx_http_proxy_loc_conf_t;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	105
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	106
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	107 typedef struct {
3627 9061fdb2ed8c use ngx_http_parse_status_line() Igor Sysoev <igor@sysoev.ru> parents: 3615 diff changeset	108 ngx_http_status_t status;
4925 32030fa8cb14 Request body: chunked parsing moved to ngx_http_parse.c from proxy. Maxim Dounin <mdounin@mdounin.ru> parents: 4602 diff changeset	109 ngx_http_chunked_t chunked;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	110 ngx_http_proxy_vars_t vars;
4927 93294110728f Request body: always use calculated size of a request body in proxy. Maxim Dounin <mdounin@mdounin.ru> parents: 4925 diff changeset	111 off_t internal_body_length;
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	112
6051 d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	113 ngx_chain_t *free;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	114 ngx_chain_t *busy;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	115
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	116 unsigned head:1;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	117 unsigned internal_chunked:1;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	118 unsigned header_sent:1;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	119 } ngx_http_proxy_ctx_t;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	120
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	121
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	122 static ngx_int_t ngx_http_proxy_eval(ngx_http_request_t *r,
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	123 ngx_http_proxy_ctx_t ctx, ngx_http_proxy_loc_conf_t plcf);
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	124 #if (NGX_HTTP_CACHE)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	125 static ngx_int_t ngx_http_proxy_create_key(ngx_http_request_t *r);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	126 #endif
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	127 static ngx_int_t ngx_http_proxy_create_request(ngx_http_request_t *r);
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	128 static ngx_int_t ngx_http_proxy_reinit_request(ngx_http_request_t *r);
6051 d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	129 static ngx_int_t ngx_http_proxy_body_output_filter(void data, ngx_chain_t in);
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	130 static ngx_int_t ngx_http_proxy_process_status_line(ngx_http_request_t *r);
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	131 static ngx_int_t ngx_http_proxy_process_header(ngx_http_request_t *r);
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	132 static ngx_int_t ngx_http_proxy_input_filter_init(void *data);
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	133 static ngx_int_t ngx_http_proxy_copy_filter(ngx_event_pipe_t *p,
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	134 ngx_buf_t *buf);
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	135 static ngx_int_t ngx_http_proxy_chunked_filter(ngx_event_pipe_t *p,
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	136 ngx_buf_t *buf);
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	137 static ngx_int_t ngx_http_proxy_non_buffered_copy_filter(void *data,
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	138 ssize_t bytes);
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	139 static ngx_int_t ngx_http_proxy_non_buffered_chunked_filter(void *data,
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	140 ssize_t bytes);
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	141 static void ngx_http_proxy_abort_request(ngx_http_request_t *r);
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	142 static void ngx_http_proxy_finalize_request(ngx_http_request_t *r,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	143 ngx_int_t rc);
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	144
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	145 static ngx_int_t ngx_http_proxy_host_variable(ngx_http_request_t *r,
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	146 ngx_http_variable_value_t *v, uintptr_t data);
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	147 static ngx_int_t ngx_http_proxy_port_variable(ngx_http_request_t *r,
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	148 ngx_http_variable_value_t *v, uintptr_t data);
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	149 static ngx_int_t
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	150 ngx_http_proxy_add_x_forwarded_for_variable(ngx_http_request_t *r,
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	151 ngx_http_variable_value_t *v, uintptr_t data);
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	152 static ngx_int_t
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	153 ngx_http_proxy_internal_body_length_variable(ngx_http_request_t *r,
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	154 ngx_http_variable_value_t *v, uintptr_t data);
6051 d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	155 static ngx_int_t ngx_http_proxy_internal_chunked_variable(ngx_http_request_t *r,
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	156 ngx_http_variable_value_t *v, uintptr_t data);
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	157 static ngx_int_t ngx_http_proxy_rewrite_redirect(ngx_http_request_t *r,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	158 ngx_table_elt_t *h, size_t prefix);
4465 8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	159 static ngx_int_t ngx_http_proxy_rewrite_cookie(ngx_http_request_t *r,
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	160 ngx_table_elt_t *h);
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	161 static ngx_int_t ngx_http_proxy_rewrite_cookie_value(ngx_http_request_t *r,
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	162 ngx_table_elt_t h, u_char value, ngx_array_t *rewrites);
4462 a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	163 static ngx_int_t ngx_http_proxy_rewrite(ngx_http_request_t *r,
a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	164 ngx_table_elt_t h, size_t prefix, size_t len, ngx_str_t replacement);
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	165
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	166 static ngx_int_t ngx_http_proxy_add_variables(ngx_conf_t *cf);
5951 610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	167 static void ngx_http_proxy_create_main_conf(ngx_conf_t cf);
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	168 static void ngx_http_proxy_create_loc_conf(ngx_conf_t cf);
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	169 static char ngx_http_proxy_merge_loc_conf(ngx_conf_t cf,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	170 void parent, void child);
5907 195561ef367f Upstream: moved header initializations to separate functions. Roman Arutyunyan <arut@nginx.com> parents: 5905 diff changeset	171 static ngx_int_t ngx_http_proxy_init_headers(ngx_conf_t *cf,
5909 8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	172 ngx_http_proxy_loc_conf_t conf, ngx_http_proxy_headers_t headers,
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	173 ngx_keyval_t *default_headers);
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	174
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	175 static char ngx_http_proxy_pass(ngx_conf_t cf, ngx_command_t *cmd,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	176 void *conf);
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	177 static char ngx_http_proxy_redirect(ngx_conf_t cf, ngx_command_t *cmd,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	178 void *conf);
4465 8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	179 static char ngx_http_proxy_cookie_domain(ngx_conf_t cf, ngx_command_t *cmd,
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	180 void *conf);
4466 b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	181 static char ngx_http_proxy_cookie_path(ngx_conf_t cf, ngx_command_t *cmd,
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	182 void *conf);
1295 5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	183 static char ngx_http_proxy_store(ngx_conf_t cf, ngx_command_t *cmd,
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	184 void *conf);
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	185 #if (NGX_HTTP_CACHE)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	186 static char ngx_http_proxy_cache(ngx_conf_t cf, ngx_command_t *cmd,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	187 void *conf);
2672 b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	188 static char ngx_http_proxy_cache_key(ngx_conf_t cf, ngx_command_t *cmd,
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	189 void *conf);
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	190 #endif
5900 20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	191 #if (NGX_HTTP_SSL)
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	192 static char ngx_http_proxy_ssl_password_file(ngx_conf_t cf,
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	193 ngx_command_t cmd, void conf);
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	194 #endif
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	195
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	196 static char ngx_http_proxy_lowat_check(ngx_conf_t cf, void post, void data);
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	197
4463 a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	198 static ngx_int_t ngx_http_proxy_rewrite_regex(ngx_conf_t *cf,
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	199 ngx_http_proxy_rewrite_t pr, ngx_str_t regex, ngx_uint_t caseless);
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	200
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	201 #if (NGX_HTTP_SSL)
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	202 static ngx_int_t ngx_http_proxy_set_ssl(ngx_conf_t *cf,
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	203 ngx_http_proxy_loc_conf_t *plcf);
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	204 #endif
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	205 static void ngx_http_proxy_set_vars(ngx_url_t u, ngx_http_proxy_vars_t v);
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	206
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	207
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	208 static ngx_conf_post_t ngx_http_proxy_lowat_post =
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	209 { ngx_http_proxy_lowat_check };
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	210
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	211
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	212 static ngx_conf_bitmask_t ngx_http_proxy_next_upstream_masks[] = {
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	213 { ngx_string("error"), NGX_HTTP_UPSTREAM_FT_ERROR },
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	214 { ngx_string("timeout"), NGX_HTTP_UPSTREAM_FT_TIMEOUT },
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	215 { ngx_string("invalid_header"), NGX_HTTP_UPSTREAM_FT_INVALID_HEADER },
6467 91c8d990fb45 Upstream: proxy_next_upstream non_idempotent. Maxim Dounin <mdounin@mdounin.ru> parents: 6311 diff changeset	216 { ngx_string("non_idempotent"), NGX_HTTP_UPSTREAM_FT_NON_IDEMPOTENT },
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	217 { ngx_string("http_500"), NGX_HTTP_UPSTREAM_FT_HTTP_500 },
2268 33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2256 diff changeset	218 { ngx_string("http_502"), NGX_HTTP_UPSTREAM_FT_HTTP_502 },
623 0216fd1471f3 nginx-0.3.33-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 619 diff changeset	219 { ngx_string("http_503"), NGX_HTTP_UPSTREAM_FT_HTTP_503 },
2268 33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2256 diff changeset	220 { ngx_string("http_504"), NGX_HTTP_UPSTREAM_FT_HTTP_504 },
5231 05c53652e7b4 Upstream: http_403 support in proxy_next_upstream (and friends). Maxim Dounin <mdounin@mdounin.ru> parents: 5211 diff changeset	221 { ngx_string("http_403"), NGX_HTTP_UPSTREAM_FT_HTTP_403 },
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	222 { ngx_string("http_404"), NGX_HTTP_UPSTREAM_FT_HTTP_404 },
6966 fa56ab75cffc Upstream: allow recovery from "429 Too Many Requests" response. Piotr Sikora <piotrsikora@google.com> parents: 6906 diff changeset	223 { ngx_string("http_429"), NGX_HTTP_UPSTREAM_FT_HTTP_429 },
2927 55ceaef03d34 proxy_cache_use_stale/fastcgi_cache_use_stale updating Igor Sysoev <igor@sysoev.ru> parents: 2912 diff changeset	224 { ngx_string("updating"), NGX_HTTP_UPSTREAM_FT_UPDATING },
665 5fd7a5e99047 nginx-0.3.54-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	225 { ngx_string("off"), NGX_HTTP_UPSTREAM_FT_OFF },
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	226 { ngx_null_string, 0 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	227 };
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	228
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	229
5385 7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	230 #if (NGX_HTTP_SSL)
7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	231
7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	232 static ngx_conf_bitmask_t ngx_http_proxy_ssl_protocols[] = {
7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	233 { ngx_string("SSLv2"), NGX_SSL_SSLv2 },
7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	234 { ngx_string("SSLv3"), NGX_SSL_SSLv3 },
7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	235 { ngx_string("TLSv1"), NGX_SSL_TLSv1 },
7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	236 { ngx_string("TLSv1.1"), NGX_SSL_TLSv1_1 },
7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	237 { ngx_string("TLSv1.2"), NGX_SSL_TLSv1_2 },
6981 08dc60979133 SSL: added support for TLSv1.3 in ssl_protocols directive. Sergey Kandaurov <pluknet@nginx.com> parents: 6966 diff changeset	238 { ngx_string("TLSv1.3"), NGX_SSL_TLSv1_3 },
5385 7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	239 { ngx_null_string, 0 }
7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	240 };
7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	241
7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	242 #endif
7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	243
7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	244
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	245 static ngx_conf_enum_t ngx_http_proxy_http_version[] = {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	246 { ngx_string("1.0"), NGX_HTTP_VERSION_10 },
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	247 { ngx_string("1.1"), NGX_HTTP_VERSION_11 },
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	248 { ngx_null_string, 0 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	249 };
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	250
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	251
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	252 ngx_module_t ngx_http_proxy_module;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	253
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	254
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	255 static ngx_command_t ngx_http_proxy_commands[] = {
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	256
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	257 { ngx_string("proxy_pass"),
843 ebab9490204c allow proxy_pass inside limit_except Igor Sysoev <igor@sysoev.ru> parents: 812 diff changeset	258 NGX_HTTP_LOC_CONF\|NGX_HTTP_LIF_CONF\|NGX_HTTP_LMT_CONF\|NGX_CONF_TAKE1,
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	259 ngx_http_proxy_pass,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	260 NGX_HTTP_LOC_CONF_OFFSET,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	261 0,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	262 NULL },
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	263
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	264 { ngx_string("proxy_redirect"),
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	265 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE12,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	266 ngx_http_proxy_redirect,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	267 NGX_HTTP_LOC_CONF_OFFSET,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	268 0,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	269 NULL },
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	270
4465 8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	271 { ngx_string("proxy_cookie_domain"),
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	272 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE12,
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	273 ngx_http_proxy_cookie_domain,
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	274 NGX_HTTP_LOC_CONF_OFFSET,
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	275 0,
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	276 NULL },
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	277
4466 b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	278 { ngx_string("proxy_cookie_path"),
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	279 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE12,
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	280 ngx_http_proxy_cookie_path,
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	281 NGX_HTTP_LOC_CONF_OFFSET,
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	282 0,
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	283 NULL },
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	284
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1244 diff changeset	285 { ngx_string("proxy_store"),
1295 5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	286 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	287 ngx_http_proxy_store,
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	288 NGX_HTTP_LOC_CONF_OFFSET,
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	289 0,
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	290 NULL },
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	291
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	292 { ngx_string("proxy_store_access"),
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1244 diff changeset	293 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE123,
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1244 diff changeset	294 ngx_conf_set_access_slot,
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1244 diff changeset	295 NGX_HTTP_LOC_CONF_OFFSET,
1295 5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	296 offsetof(ngx_http_proxy_loc_conf_t, upstream.store_access),
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1244 diff changeset	297 NULL },
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1244 diff changeset	298
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 579 diff changeset	299 { ngx_string("proxy_buffering"),
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 579 diff changeset	300 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_FLAG,
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 579 diff changeset	301 ngx_conf_set_flag_slot,
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 579 diff changeset	302 NGX_HTTP_LOC_CONF_OFFSET,
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 579 diff changeset	303 offsetof(ngx_http_proxy_loc_conf_t, upstream.buffering),
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 579 diff changeset	304 NULL },
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 579 diff changeset	305
6050 a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	306 { ngx_string("proxy_request_buffering"),
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	307 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_FLAG,
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	308 ngx_conf_set_flag_slot,
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	309 NGX_HTTP_LOC_CONF_OFFSET,
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	310 offsetof(ngx_http_proxy_loc_conf_t, upstream.request_buffering),
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	311 NULL },
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	312
629 65bf042c0b4f nginx-0.3.36-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 627 diff changeset	313 { ngx_string("proxy_ignore_client_abort"),
65bf042c0b4f nginx-0.3.36-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 627 diff changeset	314 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_FLAG,
65bf042c0b4f nginx-0.3.36-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 627 diff changeset	315 ngx_conf_set_flag_slot,
65bf042c0b4f nginx-0.3.36-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 627 diff changeset	316 NGX_HTTP_LOC_CONF_OFFSET,
65bf042c0b4f nginx-0.3.36-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 627 diff changeset	317 offsetof(ngx_http_proxy_loc_conf_t, upstream.ignore_client_abort),
65bf042c0b4f nginx-0.3.36-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 627 diff changeset	318 NULL },
65bf042c0b4f nginx-0.3.36-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 627 diff changeset	319
3271 fcd98af88df3 proxy_bind, fastcgi_bind, and memcached_bind Igor Sysoev <igor@sysoev.ru> parents: 3006 diff changeset	320 { ngx_string("proxy_bind"),
6530 1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6480 diff changeset	321 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE12,
3399 ac9c0380337d fix typo Igor Sysoev <igor@sysoev.ru> parents: 3397 diff changeset	322 ngx_http_upstream_bind_set_slot,
3271 fcd98af88df3 proxy_bind, fastcgi_bind, and memcached_bind Igor Sysoev <igor@sysoev.ru> parents: 3006 diff changeset	323 NGX_HTTP_LOC_CONF_OFFSET,
fcd98af88df3 proxy_bind, fastcgi_bind, and memcached_bind Igor Sysoev <igor@sysoev.ru> parents: 3006 diff changeset	324 offsetof(ngx_http_proxy_loc_conf_t, upstream.local),
fcd98af88df3 proxy_bind, fastcgi_bind, and memcached_bind Igor Sysoev <igor@sysoev.ru> parents: 3006 diff changeset	325 NULL },
fcd98af88df3 proxy_bind, fastcgi_bind, and memcached_bind Igor Sysoev <igor@sysoev.ru> parents: 3006 diff changeset	326
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	327 { ngx_string("proxy_connect_timeout"),
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	328 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	329 ngx_conf_set_msec_slot,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	330 NGX_HTTP_LOC_CONF_OFFSET,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	331 offsetof(ngx_http_proxy_loc_conf_t, upstream.connect_timeout),
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	332 NULL },
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	333
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	334 { ngx_string("proxy_send_timeout"),
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	335 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	336 ngx_conf_set_msec_slot,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	337 NGX_HTTP_LOC_CONF_OFFSET,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	338 offsetof(ngx_http_proxy_loc_conf_t, upstream.send_timeout),
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	339 NULL },
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	340
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	341 { ngx_string("proxy_send_lowat"),
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	342 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	343 ngx_conf_set_size_slot,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	344 NGX_HTTP_LOC_CONF_OFFSET,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	345 offsetof(ngx_http_proxy_loc_conf_t, upstream.send_lowat),
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	346 &ngx_http_proxy_lowat_post },
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	347
657 400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	348 { ngx_string("proxy_intercept_errors"),
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	349 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_FLAG,
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	350 ngx_conf_set_flag_slot,
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	351 NGX_HTTP_LOC_CONF_OFFSET,
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	352 offsetof(ngx_http_proxy_loc_conf_t, upstream.intercept_errors),
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	353 NULL },
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	354
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	355 { ngx_string("proxy_set_header"),
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	356 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE2,
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	357 ngx_conf_set_keyval_slot,
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	358 NGX_HTTP_LOC_CONF_OFFSET,
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	359 offsetof(ngx_http_proxy_loc_conf_t, headers_source),
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	360 NULL },
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	361
1180 1666b7b0bafc proxy_headers_hash_max_size and proxy_headers_hash_bucket_size Igor Sysoev <igor@sysoev.ru> parents: 1125 diff changeset	362 { ngx_string("proxy_headers_hash_max_size"),
1666b7b0bafc proxy_headers_hash_max_size and proxy_headers_hash_bucket_size Igor Sysoev <igor@sysoev.ru> parents: 1125 diff changeset	363 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
1666b7b0bafc proxy_headers_hash_max_size and proxy_headers_hash_bucket_size Igor Sysoev <igor@sysoev.ru> parents: 1125 diff changeset	364 ngx_conf_set_num_slot,
1666b7b0bafc proxy_headers_hash_max_size and proxy_headers_hash_bucket_size Igor Sysoev <igor@sysoev.ru> parents: 1125 diff changeset	365 NGX_HTTP_LOC_CONF_OFFSET,
1666b7b0bafc proxy_headers_hash_max_size and proxy_headers_hash_bucket_size Igor Sysoev <igor@sysoev.ru> parents: 1125 diff changeset	366 offsetof(ngx_http_proxy_loc_conf_t, headers_hash_max_size),
1666b7b0bafc proxy_headers_hash_max_size and proxy_headers_hash_bucket_size Igor Sysoev <igor@sysoev.ru> parents: 1125 diff changeset	367 NULL },
1666b7b0bafc proxy_headers_hash_max_size and proxy_headers_hash_bucket_size Igor Sysoev <igor@sysoev.ru> parents: 1125 diff changeset	368
1666b7b0bafc proxy_headers_hash_max_size and proxy_headers_hash_bucket_size Igor Sysoev <igor@sysoev.ru> parents: 1125 diff changeset	369 { ngx_string("proxy_headers_hash_bucket_size"),
1666b7b0bafc proxy_headers_hash_max_size and proxy_headers_hash_bucket_size Igor Sysoev <igor@sysoev.ru> parents: 1125 diff changeset	370 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
1666b7b0bafc proxy_headers_hash_max_size and proxy_headers_hash_bucket_size Igor Sysoev <igor@sysoev.ru> parents: 1125 diff changeset	371 ngx_conf_set_num_slot,
1666b7b0bafc proxy_headers_hash_max_size and proxy_headers_hash_bucket_size Igor Sysoev <igor@sysoev.ru> parents: 1125 diff changeset	372 NGX_HTTP_LOC_CONF_OFFSET,
1666b7b0bafc proxy_headers_hash_max_size and proxy_headers_hash_bucket_size Igor Sysoev <igor@sysoev.ru> parents: 1125 diff changeset	373 offsetof(ngx_http_proxy_loc_conf_t, headers_hash_bucket_size),
1666b7b0bafc proxy_headers_hash_max_size and proxy_headers_hash_bucket_size Igor Sysoev <igor@sysoev.ru> parents: 1125 diff changeset	374 NULL },
1666b7b0bafc proxy_headers_hash_max_size and proxy_headers_hash_bucket_size Igor Sysoev <igor@sysoev.ru> parents: 1125 diff changeset	375
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	376 { ngx_string("proxy_set_body"),
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	377 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	378 ngx_conf_set_str_slot,
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	379 NGX_HTTP_LOC_CONF_OFFSET,
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	380 offsetof(ngx_http_proxy_loc_conf_t, body_source),
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	381 NULL },
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	382
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	383 { ngx_string("proxy_method"),
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	384 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
6781 ca27074f8f0f Proxy: support variables for proxy_method directive. Dmitry Lazurkin <dilaz03@gmail.com> parents: 6747 diff changeset	385 ngx_http_set_complex_value_slot,
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	386 NGX_HTTP_LOC_CONF_OFFSET,
561 e48ebafc6939 nginx-0.3.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 555 diff changeset	387 offsetof(ngx_http_proxy_loc_conf_t, method),
e48ebafc6939 nginx-0.3.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 555 diff changeset	388 NULL },
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	389
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	390 { ngx_string("proxy_pass_request_headers"),
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	391 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_FLAG,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	392 ngx_conf_set_flag_slot,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	393 NGX_HTTP_LOC_CONF_OFFSET,
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	394 offsetof(ngx_http_proxy_loc_conf_t, upstream.pass_request_headers),
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	395 NULL },
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	396
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	397 { ngx_string("proxy_pass_request_body"),
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	398 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_FLAG,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	399 ngx_conf_set_flag_slot,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	400 NGX_HTTP_LOC_CONF_OFFSET,
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	401 offsetof(ngx_http_proxy_loc_conf_t, upstream.pass_request_body),
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	402 NULL },
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	403
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 579 diff changeset	404 { ngx_string("proxy_buffer_size"),
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 579 diff changeset	405 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 579 diff changeset	406 ngx_conf_set_size_slot,
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 579 diff changeset	407 NGX_HTTP_LOC_CONF_OFFSET,
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 579 diff changeset	408 offsetof(ngx_http_proxy_loc_conf_t, upstream.buffer_size),
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 579 diff changeset	409 NULL },
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 579 diff changeset	410
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	411 { ngx_string("proxy_read_timeout"),
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	412 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	413 ngx_conf_set_msec_slot,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	414 NGX_HTTP_LOC_CONF_OFFSET,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	415 offsetof(ngx_http_proxy_loc_conf_t, upstream.read_timeout),
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	416 NULL },
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	417
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	418 { ngx_string("proxy_buffers"),
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	419 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE2,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	420 ngx_conf_set_bufs_slot,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	421 NGX_HTTP_LOC_CONF_OFFSET,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	422 offsetof(ngx_http_proxy_loc_conf_t, upstream.bufs),
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	423 NULL },
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	424
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	425 { ngx_string("proxy_busy_buffers_size"),
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	426 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	427 ngx_conf_set_size_slot,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	428 NGX_HTTP_LOC_CONF_OFFSET,
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	429 offsetof(ngx_http_proxy_loc_conf_t, upstream.busy_buffers_size_conf),
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	430 NULL },
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	431
5874 2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	432 { ngx_string("proxy_force_ranges"),
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	433 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_FLAG,
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	434 ngx_conf_set_flag_slot,
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	435 NGX_HTTP_LOC_CONF_OFFSET,
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	436 offsetof(ngx_http_proxy_loc_conf_t, upstream.force_ranges),
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	437 NULL },
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	438
5883 973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5874 diff changeset	439 { ngx_string("proxy_limit_rate"),
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5874 diff changeset	440 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5874 diff changeset	441 ngx_conf_set_size_slot,
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5874 diff changeset	442 NGX_HTTP_LOC_CONF_OFFSET,
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5874 diff changeset	443 offsetof(ngx_http_proxy_loc_conf_t, upstream.limit_rate),
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5874 diff changeset	444 NULL },
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5874 diff changeset	445
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	446 #if (NGX_HTTP_CACHE)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	447
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	448 { ngx_string("proxy_cache"),
3729 4b773fc06336 fix directive type Igor Sysoev <igor@sysoev.ru> parents: 3700 diff changeset	449 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	450 ngx_http_proxy_cache,
2597 86967878cd76 fix the previous commit Igor Sysoev <igor@sysoev.ru> parents: 2596 diff changeset	451 NGX_HTTP_LOC_CONF_OFFSET,
2596 9a265cd00ba5 axe old definition fields Igor Sysoev <igor@sysoev.ru> parents: 2592 diff changeset	452 0,
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	453 NULL },
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	454
2672 b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	455 { ngx_string("proxy_cache_key"),
3729 4b773fc06336 fix directive type Igor Sysoev <igor@sysoev.ru> parents: 3700 diff changeset	456 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
2672 b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	457 ngx_http_proxy_cache_key,
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	458 NGX_HTTP_LOC_CONF_OFFSET,
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	459 0,
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	460 NULL },
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	461
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	462 { ngx_string("proxy_cache_path"),
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	463 NGX_HTTP_MAIN_CONF\|NGX_CONF_2MORE,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	464 ngx_http_file_cache_set_slot,
5951 610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	465 NGX_HTTP_MAIN_CONF_OFFSET,
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	466 offsetof(ngx_http_proxy_main_conf_t, caches),
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	467 &ngx_http_proxy_module },
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	468
3699 b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3692 diff changeset	469 { ngx_string("proxy_cache_bypass"),
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3692 diff changeset	470 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_1MORE,
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3692 diff changeset	471 ngx_http_set_predicate_slot,
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3692 diff changeset	472 NGX_HTTP_LOC_CONF_OFFSET,
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3692 diff changeset	473 offsetof(ngx_http_proxy_loc_conf_t, upstream.cache_bypass),
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3692 diff changeset	474 NULL },
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3692 diff changeset	475
3526 62a4fd1e6e2c proxy_no_cache and fastcgi_no_cache Igor Sysoev <igor@sysoev.ru> parents: 3523 diff changeset	476 { ngx_string("proxy_no_cache"),
62a4fd1e6e2c proxy_no_cache and fastcgi_no_cache Igor Sysoev <igor@sysoev.ru> parents: 3523 diff changeset	477 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_1MORE,
3692 045ea40cbfe8 use ngx_http_test_predicates(), ngx_http_set_predicate_slot() Igor Sysoev <igor@sysoev.ru> parents: 3670 diff changeset	478 ngx_http_set_predicate_slot,
3526 62a4fd1e6e2c proxy_no_cache and fastcgi_no_cache Igor Sysoev <igor@sysoev.ru> parents: 3523 diff changeset	479 NGX_HTTP_LOC_CONF_OFFSET,
62a4fd1e6e2c proxy_no_cache and fastcgi_no_cache Igor Sysoev <igor@sysoev.ru> parents: 3523 diff changeset	480 offsetof(ngx_http_proxy_loc_conf_t, upstream.no_cache),
62a4fd1e6e2c proxy_no_cache and fastcgi_no_cache Igor Sysoev <igor@sysoev.ru> parents: 3523 diff changeset	481 NULL },
62a4fd1e6e2c proxy_no_cache and fastcgi_no_cache Igor Sysoev <igor@sysoev.ru> parents: 3523 diff changeset	482
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	483 { ngx_string("proxy_cache_valid"),
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	484 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_1MORE,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	485 ngx_http_file_cache_valid_set_slot,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	486 NGX_HTTP_LOC_CONF_OFFSET,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	487 offsetof(ngx_http_proxy_loc_conf_t, upstream.cache_valid),
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	488 NULL },
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	489
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	490 { ngx_string("proxy_cache_min_uses"),
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	491 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	492 ngx_conf_set_num_slot,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	493 NGX_HTTP_LOC_CONF_OFFSET,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	494 offsetof(ngx_http_proxy_loc_conf_t, upstream.cache_min_uses),
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	495 NULL },
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	496
6793 0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6785 diff changeset	497 { ngx_string("proxy_cache_max_range_offset"),
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6785 diff changeset	498 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6785 diff changeset	499 ngx_conf_set_off_slot,
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6785 diff changeset	500 NGX_HTTP_LOC_CONF_OFFSET,
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6785 diff changeset	501 offsetof(ngx_http_proxy_loc_conf_t, upstream.cache_max_range_offset),
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6785 diff changeset	502 NULL },
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6785 diff changeset	503
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	504 { ngx_string("proxy_cache_use_stale"),
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	505 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_1MORE,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	506 ngx_conf_set_bitmask_slot,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	507 NGX_HTTP_LOC_CONF_OFFSET,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	508 offsetof(ngx_http_proxy_loc_conf_t, upstream.cache_use_stale),
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	509 &ngx_http_proxy_next_upstream_masks },
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	510
2875 6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2786 diff changeset	511 { ngx_string("proxy_cache_methods"),
6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2786 diff changeset	512 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_1MORE,
6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2786 diff changeset	513 ngx_conf_set_bitmask_slot,
6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2786 diff changeset	514 NGX_HTTP_LOC_CONF_OFFSET,
6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2786 diff changeset	515 offsetof(ngx_http_proxy_loc_conf_t, upstream.cache_methods),
6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2786 diff changeset	516 &ngx_http_upstream_cache_method_mask },
6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2786 diff changeset	517
4385 70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4377 diff changeset	518 { ngx_string("proxy_cache_lock"),
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4377 diff changeset	519 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_FLAG,
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4377 diff changeset	520 ngx_conf_set_flag_slot,
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4377 diff changeset	521 NGX_HTTP_LOC_CONF_OFFSET,
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4377 diff changeset	522 offsetof(ngx_http_proxy_loc_conf_t, upstream.cache_lock),
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4377 diff changeset	523 NULL },
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4377 diff changeset	524
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4377 diff changeset	525 { ngx_string("proxy_cache_lock_timeout"),
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4377 diff changeset	526 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4377 diff changeset	527 ngx_conf_set_msec_slot,
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4377 diff changeset	528 NGX_HTTP_LOC_CONF_OFFSET,
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4377 diff changeset	529 offsetof(ngx_http_proxy_loc_conf_t, upstream.cache_lock_timeout),
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4377 diff changeset	530 NULL },
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4377 diff changeset	531
5905 2f7e557eab5b Cache: proxy_cache_lock_age and friends. Roman Arutyunyan <arut@nginx.com> parents: 5900 diff changeset	532 { ngx_string("proxy_cache_lock_age"),
2f7e557eab5b Cache: proxy_cache_lock_age and friends. Roman Arutyunyan <arut@nginx.com> parents: 5900 diff changeset	533 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
2f7e557eab5b Cache: proxy_cache_lock_age and friends. Roman Arutyunyan <arut@nginx.com> parents: 5900 diff changeset	534 ngx_conf_set_msec_slot,
2f7e557eab5b Cache: proxy_cache_lock_age and friends. Roman Arutyunyan <arut@nginx.com> parents: 5900 diff changeset	535 NGX_HTTP_LOC_CONF_OFFSET,
2f7e557eab5b Cache: proxy_cache_lock_age and friends. Roman Arutyunyan <arut@nginx.com> parents: 5900 diff changeset	536 offsetof(ngx_http_proxy_loc_conf_t, upstream.cache_lock_age),
2f7e557eab5b Cache: proxy_cache_lock_age and friends. Roman Arutyunyan <arut@nginx.com> parents: 5900 diff changeset	537 NULL },
2f7e557eab5b Cache: proxy_cache_lock_age and friends. Roman Arutyunyan <arut@nginx.com> parents: 5900 diff changeset	538
5441 43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5391 diff changeset	539 { ngx_string("proxy_cache_revalidate"),
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5391 diff changeset	540 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_FLAG,
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5391 diff changeset	541 ngx_conf_set_flag_slot,
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5391 diff changeset	542 NGX_HTTP_LOC_CONF_OFFSET,
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5391 diff changeset	543 offsetof(ngx_http_proxy_loc_conf_t, upstream.cache_revalidate),
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5391 diff changeset	544 NULL },
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5391 diff changeset	545
6290 4d5ac1a31d44 Upstream: proxy_cache_convert_head directive. Roman Arutyunyan <arut@nginx.com> parents: 6157 diff changeset	546 { ngx_string("proxy_cache_convert_head"),
4d5ac1a31d44 Upstream: proxy_cache_convert_head directive. Roman Arutyunyan <arut@nginx.com> parents: 6157 diff changeset	547 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_FLAG,
4d5ac1a31d44 Upstream: proxy_cache_convert_head directive. Roman Arutyunyan <arut@nginx.com> parents: 6157 diff changeset	548 ngx_conf_set_flag_slot,
4d5ac1a31d44 Upstream: proxy_cache_convert_head directive. Roman Arutyunyan <arut@nginx.com> parents: 6157 diff changeset	549 NGX_HTTP_LOC_CONF_OFFSET,
4d5ac1a31d44 Upstream: proxy_cache_convert_head directive. Roman Arutyunyan <arut@nginx.com> parents: 6157 diff changeset	550 offsetof(ngx_http_proxy_loc_conf_t, upstream.cache_convert_head),
4d5ac1a31d44 Upstream: proxy_cache_convert_head directive. Roman Arutyunyan <arut@nginx.com> parents: 6157 diff changeset	551 NULL },
4d5ac1a31d44 Upstream: proxy_cache_convert_head directive. Roman Arutyunyan <arut@nginx.com> parents: 6157 diff changeset	552
6906 1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6793 diff changeset	553 { ngx_string("proxy_cache_background_update"),
1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6793 diff changeset	554 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_FLAG,
1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6793 diff changeset	555 ngx_conf_set_flag_slot,
1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6793 diff changeset	556 NGX_HTTP_LOC_CONF_OFFSET,
1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6793 diff changeset	557 offsetof(ngx_http_proxy_loc_conf_t, upstream.cache_background_update),
1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6793 diff changeset	558 NULL },
1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6793 diff changeset	559
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	560 #endif
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	561
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	562 { ngx_string("proxy_temp_path"),
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	563 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1234,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	564 ngx_conf_set_path_slot,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	565 NGX_HTTP_LOC_CONF_OFFSET,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	566 offsetof(ngx_http_proxy_loc_conf_t, upstream.temp_path),
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	567 NULL },
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	568
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	569 { ngx_string("proxy_max_temp_file_size"),
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	570 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	571 ngx_conf_set_size_slot,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	572 NGX_HTTP_LOC_CONF_OFFSET,
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	573 offsetof(ngx_http_proxy_loc_conf_t, upstream.max_temp_file_size_conf),
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	574 NULL },
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	575
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	576 { ngx_string("proxy_temp_file_write_size"),
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	577 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	578 ngx_conf_set_size_slot,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	579 NGX_HTTP_LOC_CONF_OFFSET,
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	580 offsetof(ngx_http_proxy_loc_conf_t, upstream.temp_file_write_size_conf),
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	581 NULL },
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	582
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	583 { ngx_string("proxy_next_upstream"),
547 818fbd4750b9 nginx-0.2.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 543 diff changeset	584 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_1MORE,
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	585 ngx_conf_set_bitmask_slot,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	586 NGX_HTTP_LOC_CONF_OFFSET,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	587 offsetof(ngx_http_proxy_loc_conf_t, upstream.next_upstream),
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	588 &ngx_http_proxy_next_upstream_masks },
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	589
5832 d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5738 diff changeset	590 { ngx_string("proxy_next_upstream_tries"),
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5738 diff changeset	591 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5738 diff changeset	592 ngx_conf_set_num_slot,
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5738 diff changeset	593 NGX_HTTP_LOC_CONF_OFFSET,
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5738 diff changeset	594 offsetof(ngx_http_proxy_loc_conf_t, upstream.next_upstream_tries),
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5738 diff changeset	595 NULL },
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5738 diff changeset	596
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5738 diff changeset	597 { ngx_string("proxy_next_upstream_timeout"),
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5738 diff changeset	598 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5738 diff changeset	599 ngx_conf_set_msec_slot,
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5738 diff changeset	600 NGX_HTTP_LOC_CONF_OFFSET,
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5738 diff changeset	601 offsetof(ngx_http_proxy_loc_conf_t, upstream.next_upstream_timeout),
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5738 diff changeset	602 NULL },
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5738 diff changeset	603
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	604 { ngx_string("proxy_pass_header"),
3729 4b773fc06336 fix directive type Igor Sysoev <igor@sysoev.ru> parents: 3700 diff changeset	605 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	606 ngx_conf_set_str_array_slot,
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	607 NGX_HTTP_LOC_CONF_OFFSET,
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	608 offsetof(ngx_http_proxy_loc_conf_t, upstream.pass_headers),
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	609 NULL },
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	610
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	611 { ngx_string("proxy_hide_header"),
3729 4b773fc06336 fix directive type Igor Sysoev <igor@sysoev.ru> parents: 3700 diff changeset	612 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	613 ngx_conf_set_str_array_slot,
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	614 NGX_HTTP_LOC_CONF_OFFSET,
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	615 offsetof(ngx_http_proxy_loc_conf_t, upstream.hide_headers),
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	616 NULL },
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	617
2786 4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2784 diff changeset	618 { ngx_string("proxy_ignore_headers"),
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2784 diff changeset	619 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_1MORE,
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2784 diff changeset	620 ngx_conf_set_bitmask_slot,
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2784 diff changeset	621 NGX_HTTP_LOC_CONF_OFFSET,
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2784 diff changeset	622 offsetof(ngx_http_proxy_loc_conf_t, upstream.ignore_headers),
3667 12bd9e26fadb use shared ngx_http_upstream_ignore_headers_masks[] Igor Sysoev <igor@sysoev.ru> parents: 3629 diff changeset	623 &ngx_http_upstream_ignore_headers_masks },
2786 4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2784 diff changeset	624
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	625 { ngx_string("proxy_http_version"),
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	626 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	627 ngx_conf_set_enum_slot,
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	628 NGX_HTTP_LOC_CONF_OFFSET,
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	629 offsetof(ngx_http_proxy_loc_conf_t, http_version),
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	630 &ngx_http_proxy_http_version },
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	631
2184 274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2135 diff changeset	632 #if (NGX_HTTP_SSL)
274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2135 diff changeset	633
274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2135 diff changeset	634 { ngx_string("proxy_ssl_session_reuse"),
274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2135 diff changeset	635 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_FLAG,
274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2135 diff changeset	636 ngx_conf_set_flag_slot,
274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2135 diff changeset	637 NGX_HTTP_LOC_CONF_OFFSET,
274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2135 diff changeset	638 offsetof(ngx_http_proxy_loc_conf_t, upstream.ssl_session_reuse),
274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2135 diff changeset	639 NULL },
274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2135 diff changeset	640
5385 7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	641 { ngx_string("proxy_ssl_protocols"),
7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	642 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_1MORE,
7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	643 ngx_conf_set_bitmask_slot,
7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	644 NGX_HTTP_LOC_CONF_OFFSET,
7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	645 offsetof(ngx_http_proxy_loc_conf_t, ssl_protocols),
7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	646 &ngx_http_proxy_ssl_protocols },
7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	647
5390 919d230ecdbe Proxy: added the "proxy_ssl_ciphers" directive. Piotr Sikora <piotr@cloudflare.com> parents: 5385 diff changeset	648 { ngx_string("proxy_ssl_ciphers"),
919d230ecdbe Proxy: added the "proxy_ssl_ciphers" directive. Piotr Sikora <piotr@cloudflare.com> parents: 5385 diff changeset	649 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
919d230ecdbe Proxy: added the "proxy_ssl_ciphers" directive. Piotr Sikora <piotr@cloudflare.com> parents: 5385 diff changeset	650 ngx_conf_set_str_slot,
919d230ecdbe Proxy: added the "proxy_ssl_ciphers" directive. Piotr Sikora <piotr@cloudflare.com> parents: 5385 diff changeset	651 NGX_HTTP_LOC_CONF_OFFSET,
919d230ecdbe Proxy: added the "proxy_ssl_ciphers" directive. Piotr Sikora <piotr@cloudflare.com> parents: 5385 diff changeset	652 offsetof(ngx_http_proxy_loc_conf_t, ssl_ciphers),
919d230ecdbe Proxy: added the "proxy_ssl_ciphers" directive. Piotr Sikora <piotr@cloudflare.com> parents: 5385 diff changeset	653 NULL },
919d230ecdbe Proxy: added the "proxy_ssl_ciphers" directive. Piotr Sikora <piotr@cloudflare.com> parents: 5385 diff changeset	654
5660 7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	655 { ngx_string("proxy_ssl_name"),
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	656 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	657 ngx_http_set_complex_value_slot,
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	658 NGX_HTTP_LOC_CONF_OFFSET,
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	659 offsetof(ngx_http_proxy_loc_conf_t, upstream.ssl_name),
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	660 NULL },
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	661
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	662 { ngx_string("proxy_ssl_server_name"),
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	663 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_FLAG,
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	664 ngx_conf_set_flag_slot,
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	665 NGX_HTTP_LOC_CONF_OFFSET,
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	666 offsetof(ngx_http_proxy_loc_conf_t, upstream.ssl_server_name),
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	667 NULL },
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	668
5661 060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	669 { ngx_string("proxy_ssl_verify"),
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	670 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_FLAG,
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	671 ngx_conf_set_flag_slot,
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	672 NGX_HTTP_LOC_CONF_OFFSET,
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	673 offsetof(ngx_http_proxy_loc_conf_t, upstream.ssl_verify),
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	674 NULL },
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	675
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	676 { ngx_string("proxy_ssl_verify_depth"),
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	677 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	678 ngx_conf_set_num_slot,
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	679 NGX_HTTP_LOC_CONF_OFFSET,
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	680 offsetof(ngx_http_proxy_loc_conf_t, ssl_verify_depth),
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	681 NULL },
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	682
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	683 { ngx_string("proxy_ssl_trusted_certificate"),
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	684 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	685 ngx_conf_set_str_slot,
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	686 NGX_HTTP_LOC_CONF_OFFSET,
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	687 offsetof(ngx_http_proxy_loc_conf_t, ssl_trusted_certificate),
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	688 NULL },
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	689
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	690 { ngx_string("proxy_ssl_crl"),
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	691 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	692 ngx_conf_set_str_slot,
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	693 NGX_HTTP_LOC_CONF_OFFSET,
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	694 offsetof(ngx_http_proxy_loc_conf_t, ssl_crl),
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	695 NULL },
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	696
5900 20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	697 { ngx_string("proxy_ssl_certificate"),
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	698 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	699 ngx_conf_set_str_slot,
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	700 NGX_HTTP_LOC_CONF_OFFSET,
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	701 offsetof(ngx_http_proxy_loc_conf_t, ssl_certificate),
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	702 NULL },
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	703
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	704 { ngx_string("proxy_ssl_certificate_key"),
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	705 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	706 ngx_conf_set_str_slot,
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	707 NGX_HTTP_LOC_CONF_OFFSET,
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	708 offsetof(ngx_http_proxy_loc_conf_t, ssl_certificate_key),
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	709 NULL },
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	710
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	711 { ngx_string("proxy_ssl_password_file"),
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	712 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	713 ngx_http_proxy_ssl_password_file,
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	714 NGX_HTTP_LOC_CONF_OFFSET,
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	715 0,
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	716 NULL },
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	717
2184 274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2135 diff changeset	718 #endif
274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2135 diff changeset	719
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	720 ngx_null_command
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	721 };
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	722
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	723
667 63a820b0bc6c nginx-0.3.55-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 665 diff changeset	724 static ngx_http_module_t ngx_http_proxy_module_ctx = {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	725 ngx_http_proxy_add_variables, /* preconfiguration */
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	726 NULL, /* postconfiguration */
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	727
5951 610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	728 ngx_http_proxy_create_main_conf, /* create main configuration */
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	729 NULL, /* init main configuration */
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	730
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	731 NULL, /* create server configuration */
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	732 NULL, /* merge server configuration */
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	733
4499 778ef9c3fd2d Fixed spelling in single-line comments. Ruslan Ermilov <ru@nginx.com> parents: 4466 diff changeset	734 ngx_http_proxy_create_loc_conf, /* create location configuration */
778ef9c3fd2d Fixed spelling in single-line comments. Ruslan Ermilov <ru@nginx.com> parents: 4466 diff changeset	735 ngx_http_proxy_merge_loc_conf /* merge location configuration */
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	736 };
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	737
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	738
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	739 ngx_module_t ngx_http_proxy_module = {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	740 NGX_MODULE_V1,
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	741 &ngx_http_proxy_module_ctx, /* module context */
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	742 ngx_http_proxy_commands, /* module directives */
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	743 NGX_HTTP_MODULE, /* module type */
541 b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 539 diff changeset	744 NULL, /* init master */
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	745 NULL, /* init module */
541 b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 539 diff changeset	746 NULL, /* init process */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 539 diff changeset	747 NULL, /* init thread */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 539 diff changeset	748 NULL, /* exit thread */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 539 diff changeset	749 NULL, /* exit process */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 539 diff changeset	750 NULL, /* exit master */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 539 diff changeset	751 NGX_MODULE_V1_PADDING
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	752 };
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	753
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	754
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	755 static char ngx_http_proxy_version[] = " HTTP/1.0" CRLF;
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	756 static char ngx_http_proxy_version_11[] = " HTTP/1.1" CRLF;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	757
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	758
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	759 static ngx_keyval_t ngx_http_proxy_headers[] = {
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	760 { ngx_string("Host"), ngx_string("$proxy_host") },
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	761 { ngx_string("Connection"), ngx_string("close") },
4927 93294110728f Request body: always use calculated size of a request body in proxy. Maxim Dounin <mdounin@mdounin.ru> parents: 4925 diff changeset	762 { ngx_string("Content-Length"), ngx_string("$proxy_internal_body_length") },
6051 d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	763 { ngx_string("Transfer-Encoding"), ngx_string("$proxy_internal_chunked") },
5936 2d3908516101 Proxy: the "TE" header now stripped by default (ticket #537). Maxim Dounin <mdounin@mdounin.ru> parents: 5910 diff changeset	764 { ngx_string("TE"), ngx_string("") },
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	765 { ngx_string("Keep-Alive"), ngx_string("") },
2067 5657037448d1 the "Expect" header support Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	766 { ngx_string("Expect"), ngx_string("") },
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	767 { ngx_string("Upgrade"), ngx_string("") },
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	768 { ngx_null_string, ngx_null_string }
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	769 };
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	770
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	771
2706 f905a6ab0ca8 hide cacheable Set-Cookie and P3P response headers Igor Sysoev <igor@sysoev.ru> parents: 2705 diff changeset	772 static ngx_str_t ngx_http_proxy_hide_headers[] = {
f905a6ab0ca8 hide cacheable Set-Cookie and P3P response headers Igor Sysoev <igor@sysoev.ru> parents: 2705 diff changeset	773 ngx_string("Date"),
f905a6ab0ca8 hide cacheable Set-Cookie and P3P response headers Igor Sysoev <igor@sysoev.ru> parents: 2705 diff changeset	774 ngx_string("Server"),
f905a6ab0ca8 hide cacheable Set-Cookie and P3P response headers Igor Sysoev <igor@sysoev.ru> parents: 2705 diff changeset	775 ngx_string("X-Pad"),
f905a6ab0ca8 hide cacheable Set-Cookie and P3P response headers Igor Sysoev <igor@sysoev.ru> parents: 2705 diff changeset	776 ngx_string("X-Accel-Expires"),
f905a6ab0ca8 hide cacheable Set-Cookie and P3P response headers Igor Sysoev <igor@sysoev.ru> parents: 2705 diff changeset	777 ngx_string("X-Accel-Redirect"),
f905a6ab0ca8 hide cacheable Set-Cookie and P3P response headers Igor Sysoev <igor@sysoev.ru> parents: 2705 diff changeset	778 ngx_string("X-Accel-Limit-Rate"),
f905a6ab0ca8 hide cacheable Set-Cookie and P3P response headers Igor Sysoev <igor@sysoev.ru> parents: 2705 diff changeset	779 ngx_string("X-Accel-Buffering"),
f905a6ab0ca8 hide cacheable Set-Cookie and P3P response headers Igor Sysoev <igor@sysoev.ru> parents: 2705 diff changeset	780 ngx_string("X-Accel-Charset"),
f905a6ab0ca8 hide cacheable Set-Cookie and P3P response headers Igor Sysoev <igor@sysoev.ru> parents: 2705 diff changeset	781 ngx_null_string
f905a6ab0ca8 hide cacheable Set-Cookie and P3P response headers Igor Sysoev <igor@sysoev.ru> parents: 2705 diff changeset	782 };
f905a6ab0ca8 hide cacheable Set-Cookie and P3P response headers Igor Sysoev <igor@sysoev.ru> parents: 2705 diff changeset	783
f905a6ab0ca8 hide cacheable Set-Cookie and P3P response headers Igor Sysoev <igor@sysoev.ru> parents: 2705 diff changeset	784
2705 d040c3786239 do not pass if-... headers for cacheable responses Igor Sysoev <igor@sysoev.ru> parents: 2672 diff changeset	785 #if (NGX_HTTP_CACHE)
d040c3786239 do not pass if-... headers for cacheable responses Igor Sysoev <igor@sysoev.ru> parents: 2672 diff changeset	786
d040c3786239 do not pass if-... headers for cacheable responses Igor Sysoev <igor@sysoev.ru> parents: 2672 diff changeset	787 static ngx_keyval_t ngx_http_proxy_cache_headers[] = {
d040c3786239 do not pass if-... headers for cacheable responses Igor Sysoev <igor@sysoev.ru> parents: 2672 diff changeset	788 { ngx_string("Host"), ngx_string("$proxy_host") },
d040c3786239 do not pass if-... headers for cacheable responses Igor Sysoev <igor@sysoev.ru> parents: 2672 diff changeset	789 { ngx_string("Connection"), ngx_string("close") },
4927 93294110728f Request body: always use calculated size of a request body in proxy. Maxim Dounin <mdounin@mdounin.ru> parents: 4925 diff changeset	790 { ngx_string("Content-Length"), ngx_string("$proxy_internal_body_length") },
6051 d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	791 { ngx_string("Transfer-Encoding"), ngx_string("$proxy_internal_chunked") },
5936 2d3908516101 Proxy: the "TE" header now stripped by default (ticket #537). Maxim Dounin <mdounin@mdounin.ru> parents: 5910 diff changeset	792 { ngx_string("TE"), ngx_string("") },
2705 d040c3786239 do not pass if-... headers for cacheable responses Igor Sysoev <igor@sysoev.ru> parents: 2672 diff changeset	793 { ngx_string("Keep-Alive"), ngx_string("") },
d040c3786239 do not pass if-... headers for cacheable responses Igor Sysoev <igor@sysoev.ru> parents: 2672 diff changeset	794 { ngx_string("Expect"), ngx_string("") },
4276 a0f18c78db3b Fixed Upgrade header clearing with proxy_cache. Maxim Dounin <mdounin@mdounin.ru> parents: 4275 diff changeset	795 { ngx_string("Upgrade"), ngx_string("") },
5441 43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5391 diff changeset	796 { ngx_string("If-Modified-Since"),
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5391 diff changeset	797 ngx_string("$upstream_cache_last_modified") },
2705 d040c3786239 do not pass if-... headers for cacheable responses Igor Sysoev <igor@sysoev.ru> parents: 2672 diff changeset	798 { ngx_string("If-Unmodified-Since"), ngx_string("") },
5738 c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5685 diff changeset	799 { ngx_string("If-None-Match"), ngx_string("$upstream_cache_etag") },
2705 d040c3786239 do not pass if-... headers for cacheable responses Igor Sysoev <igor@sysoev.ru> parents: 2672 diff changeset	800 { ngx_string("If-Match"), ngx_string("") },
d040c3786239 do not pass if-... headers for cacheable responses Igor Sysoev <igor@sysoev.ru> parents: 2672 diff changeset	801 { ngx_string("Range"), ngx_string("") },
d040c3786239 do not pass if-... headers for cacheable responses Igor Sysoev <igor@sysoev.ru> parents: 2672 diff changeset	802 { ngx_string("If-Range"), ngx_string("") },
d040c3786239 do not pass if-... headers for cacheable responses Igor Sysoev <igor@sysoev.ru> parents: 2672 diff changeset	803 { ngx_null_string, ngx_null_string }
d040c3786239 do not pass if-... headers for cacheable responses Igor Sysoev <igor@sysoev.ru> parents: 2672 diff changeset	804 };
d040c3786239 do not pass if-... headers for cacheable responses Igor Sysoev <igor@sysoev.ru> parents: 2672 diff changeset	805
2706 f905a6ab0ca8 hide cacheable Set-Cookie and P3P response headers Igor Sysoev <igor@sysoev.ru> parents: 2705 diff changeset	806 #endif
f905a6ab0ca8 hide cacheable Set-Cookie and P3P response headers Igor Sysoev <igor@sysoev.ru> parents: 2705 diff changeset	807
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	808
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	809 static ngx_http_variable_t ngx_http_proxy_vars[] = {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	810
637 e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 629 diff changeset	811 { ngx_string("proxy_host"), NULL, ngx_http_proxy_host_variable, 0,
1925 6fd26b0e1009 non cacheable $proxy_host and $proxy_port Igor Sysoev <igor@sysoev.ru> parents: 1912 diff changeset	812 NGX_HTTP_VAR_CHANGEABLE\|NGX_HTTP_VAR_NOCACHEABLE\|NGX_HTTP_VAR_NOHASH, 0 },
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	813
637 e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 629 diff changeset	814 { ngx_string("proxy_port"), NULL, ngx_http_proxy_port_variable, 0,
1925 6fd26b0e1009 non cacheable $proxy_host and $proxy_port Igor Sysoev <igor@sysoev.ru> parents: 1912 diff changeset	815 NGX_HTTP_VAR_CHANGEABLE\|NGX_HTTP_VAR_NOCACHEABLE\|NGX_HTTP_VAR_NOHASH, 0 },
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	816
637 e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 629 diff changeset	817 { ngx_string("proxy_add_x_forwarded_for"), NULL,
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	818 ngx_http_proxy_add_x_forwarded_for_variable, 0, NGX_HTTP_VAR_NOHASH, 0 },
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	819
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	820 #if 0
637 e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 629 diff changeset	821 { ngx_string("proxy_add_via"), NULL, NULL, 0, NGX_HTTP_VAR_NOHASH, 0 },
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	822 #endif
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	823
637 e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 629 diff changeset	824 { ngx_string("proxy_internal_body_length"), NULL,
5203 bfb99b75833b Proxy: $proxy_internal_body_length fixed. Maxim Dounin <mdounin@mdounin.ru> parents: 5188 diff changeset	825 ngx_http_proxy_internal_body_length_variable, 0,
bfb99b75833b Proxy: $proxy_internal_body_length fixed. Maxim Dounin <mdounin@mdounin.ru> parents: 5188 diff changeset	826 NGX_HTTP_VAR_NOCACHEABLE\|NGX_HTTP_VAR_NOHASH, 0 },
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	827
6051 d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	828 { ngx_string("proxy_internal_chunked"), NULL,
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	829 ngx_http_proxy_internal_chunked_variable, 0,
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	830 NGX_HTTP_VAR_NOCACHEABLE\|NGX_HTTP_VAR_NOHASH, 0 },
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	831
637 e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 629 diff changeset	832 { ngx_null_string, NULL, NULL, 0, 0, 0 }
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	833 };
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	834
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	835
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	836 static ngx_path_init_t ngx_http_proxy_temp_path = {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	837 ngx_string(NGX_HTTP_PROXY_TEMP_PATH), { 1, 2, 0 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	838 };
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	839
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	840
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	841 static ngx_int_t
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	842 ngx_http_proxy_handler(ngx_http_request_t *r)
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	843 {
5951 610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	844 ngx_int_t rc;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	845 ngx_http_upstream_t *u;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	846 ngx_http_proxy_ctx_t *ctx;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	847 ngx_http_proxy_loc_conf_t *plcf;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	848 #if (NGX_HTTP_CACHE)
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	849 ngx_http_proxy_main_conf_t *pmcf;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	850 #endif
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	851
3006 95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 2989 diff changeset	852 if (ngx_http_upstream_create(r) != NGX_OK) {
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	853 return NGX_HTTP_INTERNAL_SERVER_ERROR;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	854 }
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	855
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	856 ctx = ngx_pcalloc(r->pool, sizeof(ngx_http_proxy_ctx_t));
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	857 if (ctx == NULL) {
6003 cf2f8d91cf09 Proxy: use an appropriate error on memory allocation failure. Ruslan Ermilov <ru@nginx.com> parents: 5951 diff changeset	858 return NGX_HTTP_INTERNAL_SERVER_ERROR;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	859 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	860
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	861 ngx_http_set_ctx(r, ctx, ngx_http_proxy_module);
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	862
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	863 plcf = ngx_http_get_module_loc_conf(r, ngx_http_proxy_module);
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	864
3006 95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 2989 diff changeset	865 u = r->upstream;
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 2989 diff changeset	866
3733 527a0f8cae2a use NULL instead of 0 Igor Sysoev <igor@sysoev.ru> parents: 3731 diff changeset	867 if (plcf->proxy_lengths == NULL) {
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	868 ctx->vars = plcf->vars;
2391 d88e757cc7d8 delete surplus upstream.schema field Igor Sysoev <igor@sysoev.ru> parents: 2285 diff changeset	869 u->schema = plcf->vars.schema;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	870 #if (NGX_HTTP_SSL)
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	871 u->ssl = (plcf->upstream.ssl != NULL);
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	872 #endif
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	873
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	874 } else {
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	875 if (ngx_http_proxy_eval(r, ctx, plcf) != NGX_OK) {
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	876 return NGX_HTTP_INTERNAL_SERVER_ERROR;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	877 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	878 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	879
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	880 u->output.tag = (ngx_buf_tag_t) &ngx_http_proxy_module;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	881
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	882 u->conf = &plcf->upstream;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	883
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	884 #if (NGX_HTTP_CACHE)
5951 610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	885 pmcf = ngx_http_get_module_main_conf(r, ngx_http_proxy_module);
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	886
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	887 u->caches = &pmcf->caches;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	888 u->create_key = ngx_http_proxy_create_key;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	889 #endif
5951 610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	890
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	891 u->create_request = ngx_http_proxy_create_request;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	892 u->reinit_request = ngx_http_proxy_reinit_request;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	893 u->process_header = ngx_http_proxy_process_status_line;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	894 u->abort_request = ngx_http_proxy_abort_request;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	895 u->finalize_request = ngx_http_proxy_finalize_request;
3477 fb0b7450c2e8 reset a parsing state to parse correctly an upstream response, Igor Sysoev <igor@sysoev.ru> parents: 3471 diff changeset	896 r->state = 0;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	897
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	898 if (plcf->redirects) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	899 u->rewrite_redirect = ngx_http_proxy_rewrite_redirect;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	900 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	901
4466 b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	902 if (plcf->cookie_domains \|\| plcf->cookie_paths) {
4465 8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	903 u->rewrite_cookie = ngx_http_proxy_rewrite_cookie;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	904 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	905
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	906 u->buffering = plcf->upstream.buffering;
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	907
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	908 u->pipe = ngx_pcalloc(r->pool, sizeof(ngx_event_pipe_t));
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	909 if (u->pipe == NULL) {
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	910 return NGX_HTTP_INTERNAL_SERVER_ERROR;
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 579 diff changeset	911 }
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	912
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	913 u->pipe->input_filter = ngx_http_proxy_copy_filter;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	914 u->pipe->input_ctx = r;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	915
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	916 u->input_filter_init = ngx_http_proxy_input_filter_init;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	917 u->input_filter = ngx_http_proxy_non_buffered_copy_filter;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	918 u->input_filter_ctx = r;
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	919
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	920 u->accel = 1;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	921
6050 a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	922 if (!plcf->upstream.request_buffering
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	923 && plcf->body_values == NULL && plcf->upstream.pass_request_body
6051 d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	924 && (!r->headers_in.chunked
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	925 \|\| plcf->http_version == NGX_HTTP_VERSION_11))
6050 a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	926 {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	927 r->request_body_no_buffering = 1;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	928 }
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	929
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	930 rc = ngx_http_read_client_request_body(r, ngx_http_upstream_init);
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	931
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	932 if (rc >= NGX_HTTP_SPECIAL_RESPONSE) {
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	933 return rc;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	934 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	935
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	936 return NGX_DONE;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	937 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	938
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	939
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	940 static ngx_int_t
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	941 ngx_http_proxy_eval(ngx_http_request_t r, ngx_http_proxy_ctx_t ctx,
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	942 ngx_http_proxy_loc_conf_t *plcf)
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	943 {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	944 u_char *p;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	945 size_t add;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	946 u_short port;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	947 ngx_str_t proxy;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	948 ngx_url_t url;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	949 ngx_http_upstream_t *u;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	950
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	951 if (ngx_http_script_run(r, &proxy, plcf->proxy_lengths->elts, 0,
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	952 plcf->proxy_values->elts)
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	953 == NULL)
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	954 {
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	955 return NGX_ERROR;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	956 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	957
3977 2527cdb8d31f test length of proxy_pass with variables Igor Sysoev <igor@sysoev.ru> parents: 3976 diff changeset	958 if (proxy.len > 7
2527cdb8d31f test length of proxy_pass with variables Igor Sysoev <igor@sysoev.ru> parents: 3976 diff changeset	959 && ngx_strncasecmp(proxy.data, (u_char *) "http://", 7) == 0)
2527cdb8d31f test length of proxy_pass with variables Igor Sysoev <igor@sysoev.ru> parents: 3976 diff changeset	960 {
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	961 add = 7;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	962 port = 80;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	963
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	964 #if (NGX_HTTP_SSL)
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	965
3977 2527cdb8d31f test length of proxy_pass with variables Igor Sysoev <igor@sysoev.ru> parents: 3976 diff changeset	966 } else if (proxy.len > 8
2527cdb8d31f test length of proxy_pass with variables Igor Sysoev <igor@sysoev.ru> parents: 3976 diff changeset	967 && ngx_strncasecmp(proxy.data, (u_char *) "https://", 8) == 0)
2527cdb8d31f test length of proxy_pass with variables Igor Sysoev <igor@sysoev.ru> parents: 3976 diff changeset	968 {
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	969 add = 8;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	970 port = 443;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	971 r->upstream->ssl = 1;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	972
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	973 #endif
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	974
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	975 } else {
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	976 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	977 "invalid URL prefix in \"%V\"", &proxy);
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	978 return NGX_ERROR;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	979 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	980
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	981 u = r->upstream;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	982
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	983 u->schema.len = add;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	984 u->schema.data = proxy.data;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	985
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	986 ngx_memzero(&url, sizeof(ngx_url_t));
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	987
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	988 url.url.len = proxy.len - add;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	989 url.url.data = proxy.data + add;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	990 url.default_port = port;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	991 url.uri_part = 1;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	992 url.no_resolve = 1;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	993
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	994 if (ngx_parse_url(r->pool, &url) != NGX_OK) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	995 if (url.err) {
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	996 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	997 "%s in upstream \"%V\"", url.err, &url.url);
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	998 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	999
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1000 return NGX_ERROR;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1001 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1002
3323 9421e997c2c4 allow "proxy_pass http://$backend" without URI part Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	1003 if (url.uri.len) {
9421e997c2c4 allow "proxy_pass http://$backend" without URI part Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	1004 if (url.uri.data[0] == '?') {
9421e997c2c4 allow "proxy_pass http://$backend" without URI part Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	1005 p = ngx_pnalloc(r->pool, url.uri.len + 1);
9421e997c2c4 allow "proxy_pass http://$backend" without URI part Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	1006 if (p == NULL) {
9421e997c2c4 allow "proxy_pass http://$backend" without URI part Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	1007 return NGX_ERROR;
9421e997c2c4 allow "proxy_pass http://$backend" without URI part Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	1008 }
9421e997c2c4 allow "proxy_pass http://$backend" without URI part Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	1009
9421e997c2c4 allow "proxy_pass http://$backend" without URI part Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	1010 *p++ = '/';
9421e997c2c4 allow "proxy_pass http://$backend" without URI part Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	1011 ngx_memcpy(p, url.uri.data, url.uri.len);
9421e997c2c4 allow "proxy_pass http://$backend" without URI part Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	1012
9421e997c2c4 allow "proxy_pass http://$backend" without URI part Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	1013 url.uri.len++;
9421e997c2c4 allow "proxy_pass http://$backend" without URI part Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	1014 url.uri.data = p - 1;
2284 c3035feb6638 fix case proxy_pass URL is evaluted to http://host?args Igor Sysoev <igor@sysoev.ru> parents: 2268 diff changeset	1015 }
c3035feb6638 fix case proxy_pass URL is evaluted to http://host?args Igor Sysoev <igor@sysoev.ru> parents: 2268 diff changeset	1016 }
c3035feb6638 fix case proxy_pass URL is evaluted to http://host?args Igor Sysoev <igor@sysoev.ru> parents: 2268 diff changeset	1017
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1018 ctx->vars.key_start = u->schema;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1019
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1020 ngx_http_proxy_set_vars(&url, &ctx->vars);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1021
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1022 u->resolved = ngx_pcalloc(r->pool, sizeof(ngx_http_upstream_resolved_t));
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1023 if (u->resolved == NULL) {
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1024 return NGX_ERROR;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1025 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1026
6784 1af120241cde Upstream: removed unnecessary condition in proxy_eval() and friends. Ruslan Ermilov <ru@nginx.com> parents: 6781 diff changeset	1027 if (url.addrs) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1028 u->resolved->sockaddr = url.addrs[0].sockaddr;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1029 u->resolved->socklen = url.addrs[0].socklen;
6785 d1d0dd69a419 Upstream: added the ngx_http_upstream_resolved_t.name field. Ruslan Ermilov <ru@nginx.com> parents: 6784 diff changeset	1030 u->resolved->name = url.addrs[0].name;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1031 u->resolved->naddrs = 1;
2422 7af1e5fe102c variable support for unix sockets in fastcgi_pass and proxy_pass Igor Sysoev <igor@sysoev.ru> parents: 2391 diff changeset	1032 }
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1033
6785 d1d0dd69a419 Upstream: added the ngx_http_upstream_resolved_t.name field. Ruslan Ermilov <ru@nginx.com> parents: 6784 diff changeset	1034 u->resolved->host = url.host;
6303 a93345ee8f52 Upstream: fixed "no port" detection in evaluated upstreams. Ruslan Ermilov <ru@nginx.com> parents: 6290 diff changeset	1035 u->resolved->port = (in_port_t) (url.no_port ? port : url.port);
a93345ee8f52 Upstream: fixed "no port" detection in evaluated upstreams. Ruslan Ermilov <ru@nginx.com> parents: 6290 diff changeset	1036 u->resolved->no_port = url.no_port;
a93345ee8f52 Upstream: fixed "no port" detection in evaluated upstreams. Ruslan Ermilov <ru@nginx.com> parents: 6290 diff changeset	1037
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1038 return NGX_OK;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1039 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1040
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1041
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1042 #if (NGX_HTTP_CACHE)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1043
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1044 static ngx_int_t
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1045 ngx_http_proxy_create_key(ngx_http_request_t *r)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1046 {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1047 size_t len, loc_len;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1048 u_char *p;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1049 uintptr_t escape;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1050 ngx_str_t *key;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1051 ngx_http_upstream_t *u;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1052 ngx_http_proxy_ctx_t *ctx;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1053 ngx_http_proxy_loc_conf_t *plcf;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1054
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1055 u = r->upstream;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1056
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1057 plcf = ngx_http_get_module_loc_conf(r, ngx_http_proxy_module);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1058
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1059 ctx = ngx_http_get_module_ctx(r, ngx_http_proxy_module);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1060
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1061 key = ngx_array_push(&r->cache->keys);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1062 if (key == NULL) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1063 return NGX_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1064 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1065
4947 4251e72b8bb4 Allow the complex value to be defined as an empty string. Ruslan Ermilov <ru@nginx.com> parents: 4927 diff changeset	1066 if (plcf->cache_key.value.data) {
2672 b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	1067
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	1068 if (ngx_http_complex_value(r, &plcf->cache_key, key) != NGX_OK) {
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	1069 return NGX_ERROR;
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	1070 }
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	1071
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	1072 return NGX_OK;
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	1073 }
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	1074
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1075 *key = ctx->vars.key_start;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1076
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1077 key = ngx_array_push(&r->cache->keys);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1078 if (key == NULL) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1079 return NGX_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1080 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1081
4377 726a1ca9b52b Proxy: made proxy_pass with variables more consistent. Maxim Dounin <mdounin@mdounin.ru> parents: 4336 diff changeset	1082 if (plcf->proxy_lengths && ctx->vars.uri.len) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1083
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1084 *key = ctx->vars.uri;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1085 u->uri = ctx->vars.uri;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1086
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1087 return NGX_OK;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1088
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1089 } else if (ctx->vars.uri.len == 0 && r->valid_unparsed_uri && r == r->main)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1090 {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1091 *key = r->unparsed_uri;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1092 u->uri = r->unparsed_uri;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1093
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1094 return NGX_OK;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1095 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1096
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1097 loc_len = (r->valid_location && ctx->vars.uri.len) ? plcf->location.len : 0;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1098
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1099 if (r->quoted_uri \|\| r->internal) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1100 escape = 2 * ngx_escape_uri(NULL, r->uri.data + loc_len,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1101 r->uri.len - loc_len, NGX_ESCAPE_URI);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1102 } else {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1103 escape = 0;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1104 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1105
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1106 len = ctx->vars.uri.len + r->uri.len - loc_len + escape
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1107 + sizeof("?") - 1 + r->args.len;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1108
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1109 p = ngx_pnalloc(r->pool, len);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1110 if (p == NULL) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1111 return NGX_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1112 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1113
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1114 key->data = p;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1115
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1116 if (r->valid_location) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1117 p = ngx_copy(p, ctx->vars.uri.data, ctx->vars.uri.len);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1118 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1119
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1120 if (escape) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1121 ngx_escape_uri(p, r->uri.data + loc_len,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1122 r->uri.len - loc_len, NGX_ESCAPE_URI);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1123 p += r->uri.len - loc_len + escape;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1124
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1125 } else {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1126 p = ngx_copy(p, r->uri.data + loc_len, r->uri.len - loc_len);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1127 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1128
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1129 if (r->args.len > 0) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1130 *p++ = '?';
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1131 p = ngx_copy(p, r->args.data, r->args.len);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1132 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1133
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1134 key->len = p - key->data;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1135 u->uri = *key;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1136
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1137 return NGX_OK;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1138 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1139
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1140 #endif
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1141
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1142
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1143 static ngx_int_t
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1144 ngx_http_proxy_create_request(ngx_http_request_t *r)
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1145 {
7047 3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1146 size_t len, uri_len, loc_len, body_len,
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1147 key_len, val_len;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1148 uintptr_t escape;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1149 ngx_buf_t *b;
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1150 ngx_str_t method;
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1151 ngx_uint_t i, unparsed_uri;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1152 ngx_chain_t cl, body;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1153 ngx_list_part_t *part;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1154 ngx_table_elt_t *header;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1155 ngx_http_upstream_t *u;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1156 ngx_http_proxy_ctx_t *ctx;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1157 ngx_http_script_code_pt code;
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	1158 ngx_http_proxy_headers_t *headers;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1159 ngx_http_script_engine_t e, le;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1160 ngx_http_proxy_loc_conf_t *plcf;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1161 ngx_http_script_len_code_pt lcode;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1162
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1163 u = r->upstream;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1164
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1165 plcf = ngx_http_get_module_loc_conf(r, ngx_http_proxy_module);
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1166
5909 8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	1167 #if (NGX_HTTP_CACHE)
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	1168 headers = u->cacheable ? &plcf->headers_cache : &plcf->headers;
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	1169 #else
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	1170 headers = &plcf->headers;
5909 8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	1171 #endif
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	1172
561 e48ebafc6939 nginx-0.3.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 555 diff changeset	1173 if (u->method.len) {
e48ebafc6939 nginx-0.3.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 555 diff changeset	1174 /* HEAD was changed to GET to cache response */
e48ebafc6939 nginx-0.3.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 555 diff changeset	1175 method = u->method;
e48ebafc6939 nginx-0.3.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 555 diff changeset	1176
6781 ca27074f8f0f Proxy: support variables for proxy_method directive. Dmitry Lazurkin <dilaz03@gmail.com> parents: 6747 diff changeset	1177 } else if (plcf->method) {
ca27074f8f0f Proxy: support variables for proxy_method directive. Dmitry Lazurkin <dilaz03@gmail.com> parents: 6747 diff changeset	1178 if (ngx_http_complex_value(r, plcf->method, &method) != NGX_OK) {
ca27074f8f0f Proxy: support variables for proxy_method directive. Dmitry Lazurkin <dilaz03@gmail.com> parents: 6747 diff changeset	1179 return NGX_ERROR;
ca27074f8f0f Proxy: support variables for proxy_method directive. Dmitry Lazurkin <dilaz03@gmail.com> parents: 6747 diff changeset	1180 }
561 e48ebafc6939 nginx-0.3.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 555 diff changeset	1181
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1182 } else {
561 e48ebafc6939 nginx-0.3.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 555 diff changeset	1183 method = r->method_name;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1184 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1185
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1186 ctx = ngx_http_get_module_ctx(r, ngx_http_proxy_module);
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1187
6311 44122bddd9a1 Proxy: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 6303 diff changeset	1188 if (method.len == 4
44122bddd9a1 Proxy: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 6303 diff changeset	1189 && ngx_strncasecmp(method.data, (u_char *) "HEAD", 4) == 0)
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1190 {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1191 ctx->head = 1;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1192 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1193
6311 44122bddd9a1 Proxy: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 6303 diff changeset	1194 len = method.len + 1 + sizeof(ngx_http_proxy_version) - 1
44122bddd9a1 Proxy: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 6303 diff changeset	1195 + sizeof(CRLF) - 1;
1667 e9bd042134cb fix segfault Igor Sysoev <igor@sysoev.ru> parents: 1658 diff changeset	1196
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1197 escape = 0;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1198 loc_len = 0;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1199 unparsed_uri = 0;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1200
4377 726a1ca9b52b Proxy: made proxy_pass with variables more consistent. Maxim Dounin <mdounin@mdounin.ru> parents: 4336 diff changeset	1201 if (plcf->proxy_lengths && ctx->vars.uri.len) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1202 uri_len = ctx->vars.uri.len;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1203
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1204 } else if (ctx->vars.uri.len == 0 && r->valid_unparsed_uri && r == r->main)
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1205 {
609 608cf78b24ef nginx-0.3.26-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 605 diff changeset	1206 unparsed_uri = 1;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1207 uri_len = r->unparsed_uri.len;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1208
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1209 } else {
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1210 loc_len = (r->valid_location && ctx->vars.uri.len) ?
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1211 plcf->location.len : 0;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1212
3615 31e9677b15a1 allow spaces in URI Igor Sysoev <igor@sysoev.ru> parents: 3606 diff changeset	1213 if (r->quoted_uri \|\| r->space_in_uri \|\| r->internal) {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1214 escape = 2 * ngx_escape_uri(NULL, r->uri.data + loc_len,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1215 r->uri.len - loc_len, NGX_ESCAPE_URI);
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1216 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1217
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1218 uri_len = ctx->vars.uri.len + r->uri.len - loc_len + escape
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1219 + sizeof("?") - 1 + r->args.len;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1220 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1221
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1222 if (uri_len == 0) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1223 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1224 "zero length URI to proxy");
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1225 return NGX_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1226 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1227
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1228 len += uri_len;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1229
5211 ecd762770729 Proxy: clear script engine used to calculate lengths. Maxim Dounin <mdounin@mdounin.ru> parents: 5203 diff changeset	1230 ngx_memzero(&le, sizeof(ngx_http_script_engine_t));
ecd762770729 Proxy: clear script engine used to calculate lengths. Maxim Dounin <mdounin@mdounin.ru> parents: 5203 diff changeset	1231
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	1232 ngx_http_script_flush_no_cacheable_variables(r, plcf->body_flushes);
f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	1233 ngx_http_script_flush_no_cacheable_variables(r, headers->flushes);
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	1234
5910 29fa5023bd6f Proxy: renamed and rearranged fields in proxy configuration. Roman Arutyunyan <arut@nginx.com> parents: 5909 diff changeset	1235 if (plcf->body_lengths) {
29fa5023bd6f Proxy: renamed and rearranged fields in proxy configuration. Roman Arutyunyan <arut@nginx.com> parents: 5909 diff changeset	1236 le.ip = plcf->body_lengths->elts;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1237 le.request = r;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1238 le.flushed = 1;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1239 body_len = 0;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1240
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1241 while ((uintptr_t ) le.ip) {
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1242 lcode = (ngx_http_script_len_code_pt ) le.ip;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1243 body_len += lcode(&le);
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1244 }
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1245
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1246 ctx->internal_body_length = body_len;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1247 len += body_len;
4927 93294110728f Request body: always use calculated size of a request body in proxy. Maxim Dounin <mdounin@mdounin.ru> parents: 4925 diff changeset	1248
6051 d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1249 } else if (r->headers_in.chunked && r->reading_body) {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1250 ctx->internal_body_length = -1;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1251 ctx->internal_chunked = 1;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1252
4927 93294110728f Request body: always use calculated size of a request body in proxy. Maxim Dounin <mdounin@mdounin.ru> parents: 4925 diff changeset	1253 } else {
93294110728f Request body: always use calculated size of a request body in proxy. Maxim Dounin <mdounin@mdounin.ru> parents: 4925 diff changeset	1254 ctx->internal_body_length = r->headers_in.content_length_n;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1255 }
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1256
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	1257 le.ip = headers->lengths->elts;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1258 le.request = r;
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	1259 le.flushed = 1;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1260
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1261 while ((uintptr_t ) le.ip) {
7047 3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1262
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1263 lcode = (ngx_http_script_len_code_pt ) le.ip;
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1264 key_len = lcode(&le);
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1265
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1266 for (val_len = 0; (uintptr_t ) le.ip; val_len += lcode(&le)) {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1267 lcode = (ngx_http_script_len_code_pt ) le.ip;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1268 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1269 le.ip += sizeof(uintptr_t);
7047 3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1270
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1271 if (val_len == 0) {
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1272 continue;
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1273 }
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1274
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1275 len += key_len + sizeof(": ") - 1 + val_len + sizeof(CRLF) - 1;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1276 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1277
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1278
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1279 if (plcf->upstream.pass_request_headers) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1280 part = &r->headers_in.headers.part;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1281 header = part->elts;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1282
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1283 for (i = 0; /* void */; i++) {
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1284
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1285 if (i >= part->nelts) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1286 if (part->next == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1287 break;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1288 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1289
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1290 part = part->next;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1291 header = part->elts;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1292 i = 0;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1293 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1294
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	1295 if (ngx_hash_find(&headers->hash, header[i].hash,
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1296 header[i].lowcase_key, header[i].key.len))
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1297 {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1298 continue;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1299 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1300
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1301 len += header[i].key.len + sizeof(": ") - 1
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1302 + header[i].value.len + sizeof(CRLF) - 1;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1303 }
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1304 }
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1305
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1306
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1307 b = ngx_create_temp_buf(r->pool, len);
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1308 if (b == NULL) {
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1309 return NGX_ERROR;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1310 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1311
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1312 cl = ngx_alloc_chain_link(r->pool);
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1313 if (cl == NULL) {
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1314 return NGX_ERROR;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1315 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1316
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1317 cl->buf = b;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1318
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1319
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1320 /* the request line */
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1321
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	1322 b->last = ngx_copy(b->last, method.data, method.len);
6311 44122bddd9a1 Proxy: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 6303 diff changeset	1323 *b->last++ = ' ';
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1324
555 7bd37aef1e7e nginx-0.2.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 551 diff changeset	1325 u->uri.data = b->last;
7bd37aef1e7e nginx-0.2.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 551 diff changeset	1326
4377 726a1ca9b52b Proxy: made proxy_pass with variables more consistent. Maxim Dounin <mdounin@mdounin.ru> parents: 4336 diff changeset	1327 if (plcf->proxy_lengths && ctx->vars.uri.len) {
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1328 b->last = ngx_copy(b->last, ctx->vars.uri.data, ctx->vars.uri.len);
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1329
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1330 } else if (unparsed_uri) {
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	1331 b->last = ngx_copy(b->last, r->unparsed_uri.data, r->unparsed_uri.len);
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	1332
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1333 } else {
555 7bd37aef1e7e nginx-0.2.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 551 diff changeset	1334 if (r->valid_location) {
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1335 b->last = ngx_copy(b->last, ctx->vars.uri.data, ctx->vars.uri.len);
555 7bd37aef1e7e nginx-0.2.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 551 diff changeset	1336 }
551 483cca230603 nginx-0.2.4-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 547 diff changeset	1337
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1338 if (escape) {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1339 ngx_escape_uri(b->last, r->uri.data + loc_len,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1340 r->uri.len - loc_len, NGX_ESCAPE_URI);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1341 b->last += r->uri.len - loc_len + escape;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1342
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1343 } else {
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	1344 b->last = ngx_copy(b->last, r->uri.data + loc_len,
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	1345 r->uri.len - loc_len);
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1346 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1347
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1348 if (r->args.len > 0) {
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1349 *b->last++ = '?';
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	1350 b->last = ngx_copy(b->last, r->args.data, r->args.len);
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1351 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1352 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1353
555 7bd37aef1e7e nginx-0.2.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 551 diff changeset	1354 u->uri.len = b->last - u->uri.data;
7bd37aef1e7e nginx-0.2.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 551 diff changeset	1355
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1356 if (plcf->http_version == NGX_HTTP_VERSION_11) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1357 b->last = ngx_cpymem(b->last, ngx_http_proxy_version_11,
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1358 sizeof(ngx_http_proxy_version_11) - 1);
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1359
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1360 } else {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1361 b->last = ngx_cpymem(b->last, ngx_http_proxy_version,
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1362 sizeof(ngx_http_proxy_version) - 1);
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1363 }
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1364
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1365 ngx_memzero(&e, sizeof(ngx_http_script_engine_t));
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1366
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	1367 e.ip = headers->values->elts;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1368 e.pos = b->last;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1369 e.request = r;
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	1370 e.flushed = 1;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1371
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	1372 le.ip = headers->lengths->elts;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1373
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1374 while ((uintptr_t ) le.ip) {
7047 3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1375
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1376 lcode = (ngx_http_script_len_code_pt ) le.ip;
515 417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	1377 (void) lcode(&le);
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1378
7047 3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1379 for (val_len = 0; (uintptr_t ) le.ip; val_len += lcode(&le)) {
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1380 lcode = (ngx_http_script_len_code_pt ) le.ip;
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1381 }
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1382 le.ip += sizeof(uintptr_t);
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1383
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1384 if (val_len == 0) {
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1385 e.skip = 1;
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1386
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1387 while ((uintptr_t ) e.ip) {
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1388 code = (ngx_http_script_code_pt ) e.ip;
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1389 code((ngx_http_script_engine_t *) &e);
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1390 }
7047 3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1391 e.ip += sizeof(uintptr_t);
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1392
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1393 e.skip = 0;
7047 3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1394
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1395 continue;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1396 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1397
7047 3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1398 code = (ngx_http_script_code_pt ) e.ip;
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1399 code((ngx_http_script_engine_t *) &e);
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1400
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1401 e.pos++ = ':'; e.pos++ = ' ';
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1402
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1403 while ((uintptr_t ) e.ip) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1404 code = (ngx_http_script_code_pt ) e.ip;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1405 code((ngx_http_script_engine_t *) &e);
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1406 }
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1407 e.ip += sizeof(uintptr_t);
7047 3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1408
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1409 e.pos++ = CR; e.pos++ = LF;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1410 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1411
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1412 b->last = e.pos;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1413
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1414
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1415 if (plcf->upstream.pass_request_headers) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1416 part = &r->headers_in.headers.part;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1417 header = part->elts;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1418
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1419 for (i = 0; /* void */; i++) {
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1420
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1421 if (i >= part->nelts) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1422 if (part->next == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1423 break;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1424 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1425
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1426 part = part->next;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1427 header = part->elts;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1428 i = 0;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1429 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1430
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	1431 if (ngx_hash_find(&headers->hash, header[i].hash,
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1432 header[i].lowcase_key, header[i].key.len))
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1433 {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1434 continue;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1435 }
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1436
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	1437 b->last = ngx_copy(b->last, header[i].key.data, header[i].key.len);
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1438
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1439 b->last++ = ':'; b->last++ = ' ';
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1440
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	1441 b->last = ngx_copy(b->last, header[i].value.data,
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	1442 header[i].value.len);
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1443
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1444 b->last++ = CR; b->last++ = LF;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1445
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1446 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1447 "http proxy header: \"%V: %V\"",
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1448 &header[i].key, &header[i].value);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1449 }
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1450 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1451
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1452
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1453 /* add "\r\n" at the header end */
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1454 b->last++ = CR; b->last++ = LF;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1455
5910 29fa5023bd6f Proxy: renamed and rearranged fields in proxy configuration. Roman Arutyunyan <arut@nginx.com> parents: 5909 diff changeset	1456 if (plcf->body_values) {
29fa5023bd6f Proxy: renamed and rearranged fields in proxy configuration. Roman Arutyunyan <arut@nginx.com> parents: 5909 diff changeset	1457 e.ip = plcf->body_values->elts;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1458 e.pos = b->last;
6043 613b14b305c7 Proxy: fixed proxy_set_body with proxy_cache. Maxim Dounin <mdounin@mdounin.ru> parents: 6003 diff changeset	1459 e.skip = 0;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1460
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1461 while ((uintptr_t ) e.ip) {
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1462 code = (ngx_http_script_code_pt ) e.ip;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1463 code((ngx_http_script_engine_t *) &e);
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1464 }
579 4c5c2c55975c nginx-0.3.11-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	1465
4c5c2c55975c nginx-0.3.11-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	1466 b->last = e.pos;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1467 }
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1468
1774 68d21fd1dc64 use %s format Igor Sysoev <igor@sysoev.ru>* parents: 1701 diff changeset	1469 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
5685 0cbefdcf82a6 Style: use %N instead of '\n' where appropriate. Ruslan Ermilov <ru@nginx.com> parents: 5676 diff changeset	1470 "http proxy header:%N\"%*s\"",
1774 68d21fd1dc64 use %s format Igor Sysoev <igor@sysoev.ru>* parents: 1701 diff changeset	1471 (size_t) (b->last - b->pos), b->pos);
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1472
6050 a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	1473 if (r->request_body_no_buffering) {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	1474
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	1475 u->request_bufs = cl;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	1476
6051 d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1477 if (ctx->internal_chunked) {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1478 u->output.output_filter = ngx_http_proxy_body_output_filter;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1479 u->output.filter_ctx = r;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1480 }
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1481
6050 a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	1482 } else if (plcf->body_values == NULL && plcf->upstream.pass_request_body) {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1483
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1484 body = u->request_bufs;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1485 u->request_bufs = cl;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1486
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1487 while (body) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1488 b = ngx_alloc_buf(r->pool);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1489 if (b == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1490 return NGX_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1491 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1492
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1493 ngx_memcpy(b, body->buf, sizeof(ngx_buf_t));
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1494
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1495 cl->next = ngx_alloc_chain_link(r->pool);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1496 if (cl->next == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1497 return NGX_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1498 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1499
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1500 cl = cl->next;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1501 cl->buf = b;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1502
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1503 body = body->next;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1504 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1505
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1506 } else {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1507 u->request_bufs = cl;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1508 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1509
4009 3183165283cc Fixing proxy_set_body and proxy_pass_request_body with SSL. Maxim Dounin <mdounin@mdounin.ru> parents: 3977 diff changeset	1510 b->flush = 1;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1511 cl->next = NULL;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1512
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1513 return NGX_OK;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1514 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1515
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1516
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1517 static ngx_int_t
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1518 ngx_http_proxy_reinit_request(ngx_http_request_t *r)
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1519 {
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1520 ngx_http_proxy_ctx_t *ctx;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1521
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1522 ctx = ngx_http_get_module_ctx(r, ngx_http_proxy_module);
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1523
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1524 if (ctx == NULL) {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1525 return NGX_OK;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1526 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1527
3627 9061fdb2ed8c use ngx_http_parse_status_line() Igor Sysoev <igor@sysoev.ru> parents: 3615 diff changeset	1528 ctx->status.code = 0;
9061fdb2ed8c use ngx_http_parse_status_line() Igor Sysoev <igor@sysoev.ru> parents: 3615 diff changeset	1529 ctx->status.count = 0;
9061fdb2ed8c use ngx_http_parse_status_line() Igor Sysoev <igor@sysoev.ru> parents: 3615 diff changeset	1530 ctx->status.start = NULL;
9061fdb2ed8c use ngx_http_parse_status_line() Igor Sysoev <igor@sysoev.ru> parents: 3615 diff changeset	1531 ctx->status.end = NULL;
4925 32030fa8cb14 Request body: chunked parsing moved to ngx_http_parse.c from proxy. Maxim Dounin <mdounin@mdounin.ru> parents: 4602 diff changeset	1532 ctx->chunked.state = 0;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1533
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1534 r->upstream->process_header = ngx_http_proxy_process_status_line;
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1535 r->upstream->pipe->input_filter = ngx_http_proxy_copy_filter;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1536 r->upstream->input_filter = ngx_http_proxy_non_buffered_copy_filter;
3477 fb0b7450c2e8 reset a parsing state to parse correctly an upstream response, Igor Sysoev <igor@sysoev.ru> parents: 3471 diff changeset	1537 r->state = 0;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1538
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1539 return NGX_OK;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1540 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1541
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1542
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1543 static ngx_int_t
6051 d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1544 ngx_http_proxy_body_output_filter(void data, ngx_chain_t in)
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1545 {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1546 ngx_http_request_t *r = data;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1547
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1548 off_t size;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1549 u_char *chunk;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1550 ngx_int_t rc;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1551 ngx_buf_t *b;
6056 24ccec3c4a87 Proxy: fixed proxy_request_buffering and chunked with preread body. Maxim Dounin <mdounin@mdounin.ru> parents: 6051 diff changeset	1552 ngx_chain_t out, cl, tl, ll, *fl;
6051 d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1553 ngx_http_proxy_ctx_t *ctx;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1554
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1555 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1556 "proxy output filter");
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1557
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1558 ctx = ngx_http_get_module_ctx(r, ngx_http_proxy_module);
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1559
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1560 if (in == NULL) {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1561 out = in;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1562 goto out;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1563 }
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1564
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1565 out = NULL;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1566 ll = &out;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1567
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1568 if (!ctx->header_sent) {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1569 /* first buffer contains headers, pass it unmodified */
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1570
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1571 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1572 "proxy output header");
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1573
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1574 ctx->header_sent = 1;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1575
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1576 tl = ngx_alloc_chain_link(r->pool);
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1577 if (tl == NULL) {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1578 return NGX_ERROR;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1579 }
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1580
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1581 tl->buf = in->buf;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1582 *ll = tl;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1583 ll = &tl->next;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1584
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1585 in = in->next;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1586
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1587 if (in == NULL) {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1588 tl->next = NULL;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1589 goto out;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1590 }
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1591 }
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1592
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1593 size = 0;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1594 cl = in;
6056 24ccec3c4a87 Proxy: fixed proxy_request_buffering and chunked with preread body. Maxim Dounin <mdounin@mdounin.ru> parents: 6051 diff changeset	1595 fl = ll;
6051 d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1596
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1597 for ( ;; ) {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1598 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
6480 f01ab2dbcfdc Fixed logging. Sergey Kandaurov <pluknet@nginx.com> parents: 6467 diff changeset	1599 "proxy output chunk: %O", ngx_buf_size(cl->buf));
6051 d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1600
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1601 size += ngx_buf_size(cl->buf);
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1602
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1603 if (cl->buf->flush
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1604 \|\| cl->buf->sync
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1605 \|\| ngx_buf_in_memory(cl->buf)
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1606 \|\| cl->buf->in_file)
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1607 {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1608 tl = ngx_alloc_chain_link(r->pool);
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1609 if (tl == NULL) {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1610 return NGX_ERROR;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1611 }
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1612
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1613 tl->buf = cl->buf;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1614 *ll = tl;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1615 ll = &tl->next;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1616 }
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1617
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1618 if (cl->next == NULL) {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1619 break;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1620 }
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1621
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1622 cl = cl->next;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1623 }
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1624
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1625 if (size) {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1626 tl = ngx_chain_get_free_buf(r->pool, &ctx->free);
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1627 if (tl == NULL) {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1628 return NGX_ERROR;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1629 }
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1630
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1631 b = tl->buf;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1632 chunk = b->start;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1633
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1634 if (chunk == NULL) {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1635 /* the "0000000000000000" is 64-bit hexadecimal string */
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1636
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1637 chunk = ngx_palloc(r->pool, sizeof("0000000000000000" CRLF) - 1);
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1638 if (chunk == NULL) {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1639 return NGX_ERROR;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1640 }
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1641
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1642 b->start = chunk;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1643 b->end = chunk + sizeof("0000000000000000" CRLF) - 1;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1644 }
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1645
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1646 b->tag = (ngx_buf_tag_t) &ngx_http_proxy_body_output_filter;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1647 b->memory = 0;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1648 b->temporary = 1;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1649 b->pos = chunk;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1650 b->last = ngx_sprintf(chunk, "%xO" CRLF, size);
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1651
6056 24ccec3c4a87 Proxy: fixed proxy_request_buffering and chunked with preread body. Maxim Dounin <mdounin@mdounin.ru> parents: 6051 diff changeset	1652 tl->next = *fl;
24ccec3c4a87 Proxy: fixed proxy_request_buffering and chunked with preread body. Maxim Dounin <mdounin@mdounin.ru> parents: 6051 diff changeset	1653 *fl = tl;
6051 d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1654 }
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1655
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1656 if (cl->buf->last_buf) {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1657 tl = ngx_chain_get_free_buf(r->pool, &ctx->free);
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1658 if (tl == NULL) {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1659 return NGX_ERROR;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1660 }
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1661
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1662 b = tl->buf;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1663
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1664 b->tag = (ngx_buf_tag_t) &ngx_http_proxy_body_output_filter;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1665 b->temporary = 0;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1666 b->memory = 1;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1667 b->last_buf = 1;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1668 b->pos = (u_char *) CRLF "0" CRLF CRLF;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1669 b->last = b->pos + 7;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1670
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1671 cl->buf->last_buf = 0;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1672
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1673 *ll = tl;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1674
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1675 if (size == 0) {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1676 b->pos += 2;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1677 }
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1678
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1679 } else if (size > 0) {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1680 tl = ngx_chain_get_free_buf(r->pool, &ctx->free);
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1681 if (tl == NULL) {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1682 return NGX_ERROR;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1683 }
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1684
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1685 b = tl->buf;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1686
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1687 b->tag = (ngx_buf_tag_t) &ngx_http_proxy_body_output_filter;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1688 b->temporary = 0;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1689 b->memory = 1;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1690 b->pos = (u_char *) CRLF;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1691 b->last = b->pos + 2;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1692
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1693 *ll = tl;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1694
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1695 } else {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1696 *ll = NULL;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1697 }
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1698
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1699 out:
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1700
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1701 rc = ngx_chain_writer(&r->upstream->writer, out);
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1702
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1703 ngx_chain_update_chains(r->pool, &ctx->free, &ctx->busy, &out,
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1704 (ngx_buf_tag_t) &ngx_http_proxy_body_output_filter);
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1705
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1706 return rc;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1707 }
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1708
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1709
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1710 static ngx_int_t
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1711 ngx_http_proxy_process_status_line(ngx_http_request_t *r)
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1712 {
3628 cf47471a9eda make code more obviuos Igor Sysoev <igor@sysoev.ru> parents: 3627 diff changeset	1713 size_t len;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1714 ngx_int_t rc;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1715 ngx_http_upstream_t *u;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1716 ngx_http_proxy_ctx_t *ctx;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1717
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1718 ctx = ngx_http_get_module_ctx(r, ngx_http_proxy_module);
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1719
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1720 if (ctx == NULL) {
1699 976db8c6fb64 return NGX_ERROR instead of NGX_HTTP_INTERNAL_SERVER_ERROR in u->parse_header() Igor Sysoev <igor@sysoev.ru> parents: 1688 diff changeset	1721 return NGX_ERROR;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1722 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1723
3627 9061fdb2ed8c use ngx_http_parse_status_line() Igor Sysoev <igor@sysoev.ru> parents: 3615 diff changeset	1724 u = r->upstream;
9061fdb2ed8c use ngx_http_parse_status_line() Igor Sysoev <igor@sysoev.ru> parents: 3615 diff changeset	1725
9061fdb2ed8c use ngx_http_parse_status_line() Igor Sysoev <igor@sysoev.ru> parents: 3615 diff changeset	1726 rc = ngx_http_parse_status_line(r, &u->buffer, &ctx->status);
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1727
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1728 if (rc == NGX_AGAIN) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1729 return rc;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1730 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1731
3627 9061fdb2ed8c use ngx_http_parse_status_line() Igor Sysoev <igor@sysoev.ru> parents: 3615 diff changeset	1732 if (rc == NGX_ERROR) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1733
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1734 #if (NGX_HTTP_CACHE)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1735
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1736 if (r->cache) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1737 r->http_version = NGX_HTTP_VERSION_9;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1738 return NGX_OK;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1739 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1740
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1741 #endif
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1742
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1743 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1744 "upstream sent no valid HTTP/1.0 header");
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1745
619 7a16e281c01f nginx-0.3.31-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 611 diff changeset	1746 #if 0
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1747 if (u->accel) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1748 return NGX_HTTP_UPSTREAM_INVALID_HEADER;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1749 }
619 7a16e281c01f nginx-0.3.31-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 611 diff changeset	1750 #endif
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1751
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1752 r->http_version = NGX_HTTP_VERSION_9;
1616 0a293900d21b set status in correct place Igor Sysoev <igor@sysoev.ru> parents: 1565 diff changeset	1753 u->state->status = NGX_HTTP_OK;
4125 e5df04b05e75 Protocol version parsing in ngx_http_parse_status_line(). Maxim Dounin <mdounin@mdounin.ru> parents: 4009 diff changeset	1754 u->headers_in.connection_close = 1;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1755
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1756 return NGX_OK;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1757 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1758
5575 d15822784cf9 Upstream: fix $upstream_status variable. Piotr Sikora <piotr@cloudflare.com> parents: 5466 diff changeset	1759 if (u->state && u->state->status == 0) {
3627 9061fdb2ed8c use ngx_http_parse_status_line() Igor Sysoev <igor@sysoev.ru> parents: 3615 diff changeset	1760 u->state->status = ctx->status.code;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1761 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1762
3627 9061fdb2ed8c use ngx_http_parse_status_line() Igor Sysoev <igor@sysoev.ru> parents: 3615 diff changeset	1763 u->headers_in.status_n = ctx->status.code;
9061fdb2ed8c use ngx_http_parse_status_line() Igor Sysoev <igor@sysoev.ru> parents: 3615 diff changeset	1764
3628 cf47471a9eda make code more obviuos Igor Sysoev <igor@sysoev.ru> parents: 3627 diff changeset	1765 len = ctx->status.end - ctx->status.start;
cf47471a9eda make code more obviuos Igor Sysoev <igor@sysoev.ru> parents: 3627 diff changeset	1766 u->headers_in.status_line.len = len;
cf47471a9eda make code more obviuos Igor Sysoev <igor@sysoev.ru> parents: 3627 diff changeset	1767
cf47471a9eda make code more obviuos Igor Sysoev <igor@sysoev.ru> parents: 3627 diff changeset	1768 u->headers_in.status_line.data = ngx_pnalloc(r->pool, len);
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	1769 if (u->headers_in.status_line.data == NULL) {
1699 976db8c6fb64 return NGX_ERROR instead of NGX_HTTP_INTERNAL_SERVER_ERROR in u->parse_header() Igor Sysoev <igor@sysoev.ru> parents: 1688 diff changeset	1770 return NGX_ERROR;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1771 }
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	1772
3628 cf47471a9eda make code more obviuos Igor Sysoev <igor@sysoev.ru> parents: 3627 diff changeset	1773 ngx_memcpy(u->headers_in.status_line.data, ctx->status.start, len);
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1774
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1775 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1776 "http proxy status %ui \"%V\"",
936 2864303e0ce5 fix debug log Igor Sysoev <igor@sysoev.ru> parents: 906 diff changeset	1777 u->headers_in.status_n, &u->headers_in.status_line);
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1778
4125 e5df04b05e75 Protocol version parsing in ngx_http_parse_status_line(). Maxim Dounin <mdounin@mdounin.ru> parents: 4009 diff changeset	1779 if (ctx->status.http_version < NGX_HTTP_VERSION_11) {
e5df04b05e75 Protocol version parsing in ngx_http_parse_status_line(). Maxim Dounin <mdounin@mdounin.ru> parents: 4009 diff changeset	1780 u->headers_in.connection_close = 1;
e5df04b05e75 Protocol version parsing in ngx_http_parse_status_line(). Maxim Dounin <mdounin@mdounin.ru> parents: 4009 diff changeset	1781 }
e5df04b05e75 Protocol version parsing in ngx_http_parse_status_line(). Maxim Dounin <mdounin@mdounin.ru> parents: 4009 diff changeset	1782
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1783 u->process_header = ngx_http_proxy_process_header;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1784
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1785 return ngx_http_proxy_process_header(r);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1786 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1787
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1788
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1789 static ngx_int_t
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1790 ngx_http_proxy_process_header(ngx_http_request_t *r)
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1791 {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1792 ngx_int_t rc;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1793 ngx_table_elt_t *h;
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1794 ngx_http_upstream_t *u;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1795 ngx_http_proxy_ctx_t *ctx;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1796 ngx_http_upstream_header_t *hh;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1797 ngx_http_upstream_main_conf_t *umcf;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1798
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1799 umcf = ngx_http_get_module_main_conf(r, ngx_http_upstream_module);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1800
2024 7018254cc006 style fix Igor Sysoev <igor@sysoev.ru> parents: 1925 diff changeset	1801 for ( ;; ) {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1802
2256 8c17cfe63d2c underscores_in_headers Igor Sysoev <igor@sysoev.ru> parents: 2233 diff changeset	1803 rc = ngx_http_parse_header_line(r, &r->upstream->buffer, 1);
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1804
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1805 if (rc == NGX_OK) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1806
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1807 /* a header line has been parsed successfully */
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1808
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1809 h = ngx_list_push(&r->upstream->headers_in.headers);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1810 if (h == NULL) {
1699 976db8c6fb64 return NGX_ERROR instead of NGX_HTTP_INTERNAL_SERVER_ERROR in u->parse_header() Igor Sysoev <igor@sysoev.ru> parents: 1688 diff changeset	1811 return NGX_ERROR;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1812 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1813
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1814 h->hash = r->header_hash;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1815
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1816 h->key.len = r->header_name_end - r->header_name_start;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1817 h->value.len = r->header_end - r->header_start;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1818
2049 2a92804f4109 ) back out r2040 Igor Sysoev <igor@sysoev.ru>* parents: 2030 diff changeset	1819 h->key.data = ngx_pnalloc(r->pool,
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1820 h->key.len + 1 + h->value.len + 1 + h->key.len);
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1821 if (h->key.data == NULL) {
7001 08537eab4f23 Upstream: fixed u->headers_in.headers allocation error handling. Sergey Kandaurov <pluknet@nginx.com> parents: 6981 diff changeset	1822 h->hash = 0;
1699 976db8c6fb64 return NGX_ERROR instead of NGX_HTTP_INTERNAL_SERVER_ERROR in u->parse_header() Igor Sysoev <igor@sysoev.ru> parents: 1688 diff changeset	1823 return NGX_ERROR;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1824 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1825
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1826 h->value.data = h->key.data + h->key.len + 1;
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1827 h->lowcase_key = h->key.data + h->key.len + 1 + h->value.len + 1;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1828
4529 1ebec1d15a25 Fixed incorrect ngx_cpystrn() usage in ngx_http__process_header(). Maxim Dounin <mdounin@mdounin.ru>* parents: 4499 diff changeset	1829 ngx_memcpy(h->key.data, r->header_name_start, h->key.len);
1ebec1d15a25 Fixed incorrect ngx_cpystrn() usage in ngx_http__process_header(). Maxim Dounin <mdounin@mdounin.ru>* parents: 4499 diff changeset	1830 h->key.data[h->key.len] = '\0';
1ebec1d15a25 Fixed incorrect ngx_cpystrn() usage in ngx_http__process_header(). Maxim Dounin <mdounin@mdounin.ru>* parents: 4499 diff changeset	1831 ngx_memcpy(h->value.data, r->header_start, h->value.len);
1ebec1d15a25 Fixed incorrect ngx_cpystrn() usage in ngx_http__process_header(). Maxim Dounin <mdounin@mdounin.ru>* parents: 4499 diff changeset	1832 h->value.data[h->value.len] = '\0';
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1833
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1834 if (h->key.len == r->lowcase_index) {
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1835 ngx_memcpy(h->lowcase_key, r->lowcase_header, h->key.len);
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1836
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1837 } else {
2135 8c6521eedf84 ngx_strlow() Igor Sysoev <igor@sysoev.ru> parents: 2067 diff changeset	1838 ngx_strlow(h->lowcase_key, h->key.data, h->key.len);
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1839 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1840
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1841 hh = ngx_hash_find(&umcf->headers_in_hash, h->hash,
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1842 h->lowcase_key, h->key.len);
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1843
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1844 if (hh && hh->handler(r, h, hh->offset) != NGX_OK) {
1699 976db8c6fb64 return NGX_ERROR instead of NGX_HTTP_INTERNAL_SERVER_ERROR in u->parse_header() Igor Sysoev <igor@sysoev.ru> parents: 1688 diff changeset	1845 return NGX_ERROR;
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1846 }
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1847
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1848 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1849 "http proxy header: \"%V: %V\"",
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1850 &h->key, &h->value);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1851
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1852 continue;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1853 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1854
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1855 if (rc == NGX_HTTP_PARSE_HEADER_DONE) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1856
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1857 /* a whole header has been parsed successfully */
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1858
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1859 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1860 "http proxy header done");
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1861
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1862 /*
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1863 * if no "Server" and "Date" in header line,
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1864 * then add the special empty headers
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1865 */
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1866
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1867 if (r->upstream->headers_in.server == NULL) {
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1868 h = ngx_list_push(&r->upstream->headers_in.headers);
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1869 if (h == NULL) {
1699 976db8c6fb64 return NGX_ERROR instead of NGX_HTTP_INTERNAL_SERVER_ERROR in u->parse_header() Igor Sysoev <igor@sysoev.ru> parents: 1688 diff changeset	1870 return NGX_ERROR;
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1871 }
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1872
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1873 h->hash = ngx_hash(ngx_hash(ngx_hash(ngx_hash(
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1874 ngx_hash('s', 'e'), 'r'), 'v'), 'e'), 'r');
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1875
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3477 diff changeset	1876 ngx_str_set(&h->key, "Server");
dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3477 diff changeset	1877 ngx_str_null(&h->value);
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1878 h->lowcase_key = (u_char *) "server";
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1879 }
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1880
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1881 if (r->upstream->headers_in.date == NULL) {
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1882 h = ngx_list_push(&r->upstream->headers_in.headers);
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1883 if (h == NULL) {
1699 976db8c6fb64 return NGX_ERROR instead of NGX_HTTP_INTERNAL_SERVER_ERROR in u->parse_header() Igor Sysoev <igor@sysoev.ru> parents: 1688 diff changeset	1884 return NGX_ERROR;
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1885 }
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1886
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1887 h->hash = ngx_hash(ngx_hash(ngx_hash('d', 'a'), 't'), 'e');
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1888
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3477 diff changeset	1889 ngx_str_set(&h->key, "Date");
dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3477 diff changeset	1890 ngx_str_null(&h->value);
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1891 h->lowcase_key = (u_char *) "date";
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1892 }
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1893
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1894 /* clear content length if response is chunked */
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1895
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1896 u = r->upstream;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1897
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1898 if (u->headers_in.chunked) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1899 u->headers_in.content_length_n = -1;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1900 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1901
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1902 /*
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1903 * set u->keepalive if response has no body; this allows to keep
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1904 * connections alive in case of r->header_only or X-Accel-Redirect
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1905 */
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1906
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1907 ctx = ngx_http_get_module_ctx(r, ngx_http_proxy_module);
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1908
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1909 if (u->headers_in.status_n == NGX_HTTP_NO_CONTENT
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1910 \|\| u->headers_in.status_n == NGX_HTTP_NOT_MODIFIED
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1911 \|\| ctx->head
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1912 \|\| (!u->headers_in.chunked
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1913 && u->headers_in.content_length_n == 0))
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1914 {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1915 u->keepalive = !u->headers_in.connection_close;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1916 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1917
5072 7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5012 diff changeset	1918 if (u->headers_in.status_n == NGX_HTTP_SWITCHING_PROTOCOLS) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5012 diff changeset	1919 u->keepalive = 0;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5012 diff changeset	1920
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5012 diff changeset	1921 if (r->headers_in.upgrade) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5012 diff changeset	1922 u->upgrade = 1;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5012 diff changeset	1923 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5012 diff changeset	1924 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5012 diff changeset	1925
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1926 return NGX_OK;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1927 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1928
521 6f00349b98e5 nginx-0.1.35-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 519 diff changeset	1929 if (rc == NGX_AGAIN) {
6f00349b98e5 nginx-0.1.35-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 519 diff changeset	1930 return NGX_AGAIN;
6f00349b98e5 nginx-0.1.35-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 519 diff changeset	1931 }
6f00349b98e5 nginx-0.1.35-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 519 diff changeset	1932
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1933 /* there was error while a header line parsing */
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1934
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1935 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
619 7a16e281c01f nginx-0.3.31-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 611 diff changeset	1936 "upstream sent invalid header");
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1937
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1938 return NGX_HTTP_UPSTREAM_INVALID_HEADER;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1939 }
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1940 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1941
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1942
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1943 static ngx_int_t
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1944 ngx_http_proxy_input_filter_init(void *data)
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1945 {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1946 ngx_http_request_t *r = data;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1947 ngx_http_upstream_t *u;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1948 ngx_http_proxy_ctx_t *ctx;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1949
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1950 u = r->upstream;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1951 ctx = ngx_http_get_module_ctx(r, ngx_http_proxy_module);
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1952
4602 8036fc6af2df Proxy: added ctx checking to input filters. Maxim Dounin <mdounin@mdounin.ru> parents: 4593 diff changeset	1953 if (ctx == NULL) {
8036fc6af2df Proxy: added ctx checking to input filters. Maxim Dounin <mdounin@mdounin.ru> parents: 4593 diff changeset	1954 return NGX_ERROR;
8036fc6af2df Proxy: added ctx checking to input filters. Maxim Dounin <mdounin@mdounin.ru> parents: 4593 diff changeset	1955 }
8036fc6af2df Proxy: added ctx checking to input filters. Maxim Dounin <mdounin@mdounin.ru> parents: 4593 diff changeset	1956
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1957 ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
6480 f01ab2dbcfdc Fixed logging. Sergey Kandaurov <pluknet@nginx.com> parents: 6467 diff changeset	1958 "http proxy filter init s:%ui h:%d c:%d l:%O",
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1959 u->headers_in.status_n, ctx->head, u->headers_in.chunked,
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1960 u->headers_in.content_length_n);
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1961
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1962 /* as per RFC2616, 4.4 Message Length */
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1963
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1964 if (u->headers_in.status_n == NGX_HTTP_NO_CONTENT
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1965 \|\| u->headers_in.status_n == NGX_HTTP_NOT_MODIFIED
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1966 \|\| ctx->head)
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1967 {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1968 /* 1xx, 204, and 304 and replies to HEAD requests */
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1969 /* no 1xx since we don't send Expect and Upgrade */
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1970
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1971 u->pipe->length = 0;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1972 u->length = 0;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1973 u->keepalive = !u->headers_in.connection_close;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1974
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1975 } else if (u->headers_in.chunked) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1976 /* chunked */
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1977
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1978 u->pipe->input_filter = ngx_http_proxy_chunked_filter;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1979 u->pipe->length = 3; /* "0" LF LF */
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1980
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1981 u->input_filter = ngx_http_proxy_non_buffered_chunked_filter;
5301 a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5231 diff changeset	1982 u->length = 1;
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1983
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1984 } else if (u->headers_in.content_length_n == 0) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1985 /* empty body: special case as filter won't be called */
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1986
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1987 u->pipe->length = 0;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1988 u->length = 0;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1989 u->keepalive = !u->headers_in.connection_close;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1990
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1991 } else {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1992 /* content length or connection close */
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1993
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1994 u->pipe->length = u->headers_in.content_length_n;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1995 u->length = u->headers_in.content_length_n;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1996 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1997
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1998 return NGX_OK;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1999 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2000
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2001
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2002 static ngx_int_t
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2003 ngx_http_proxy_copy_filter(ngx_event_pipe_t p, ngx_buf_t buf)
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2004 {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2005 ngx_buf_t *b;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2006 ngx_chain_t *cl;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2007 ngx_http_request_t *r;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2008
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2009 if (buf->pos == buf->last) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2010 return NGX_OK;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2011 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2012
5466 e7b3b9855be8 Use ngx_chain_get_free_buf() in pipe input filters. Valentin Bartenev <vbart@nginx.com> parents: 5441 diff changeset	2013 cl = ngx_chain_get_free_buf(p->pool, &p->free);
e7b3b9855be8 Use ngx_chain_get_free_buf() in pipe input filters. Valentin Bartenev <vbart@nginx.com> parents: 5441 diff changeset	2014 if (cl == NULL) {
e7b3b9855be8 Use ngx_chain_get_free_buf() in pipe input filters. Valentin Bartenev <vbart@nginx.com> parents: 5441 diff changeset	2015 return NGX_ERROR;
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2016 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2017
5466 e7b3b9855be8 Use ngx_chain_get_free_buf() in pipe input filters. Valentin Bartenev <vbart@nginx.com> parents: 5441 diff changeset	2018 b = cl->buf;
e7b3b9855be8 Use ngx_chain_get_free_buf() in pipe input filters. Valentin Bartenev <vbart@nginx.com> parents: 5441 diff changeset	2019
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2020 ngx_memcpy(b, buf, sizeof(ngx_buf_t));
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2021 b->shadow = buf;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2022 b->tag = p->tag;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2023 b->last_shadow = 1;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2024 b->recycled = 1;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2025 buf->shadow = b;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2026
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2027 ngx_log_debug1(NGX_LOG_DEBUG_EVENT, p->log, 0, "input buf #%d", b->num);
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2028
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2029 if (p->in) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2030 *p->last_in = cl;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2031 } else {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2032 p->in = cl;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2033 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2034 p->last_in = &cl->next;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2035
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2036 if (p->length == -1) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2037 return NGX_OK;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2038 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2039
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2040 p->length -= b->last - b->pos;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2041
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2042 if (p->length == 0) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2043 r = p->input_ctx;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2044 p->upstream_done = 1;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2045 r->upstream->keepalive = !r->upstream->headers_in.connection_close;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2046
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2047 } else if (p->length < 0) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2048 r = p->input_ctx;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2049 p->upstream_done = 1;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2050
4145 f321e9750c8c Proxy: logging levels tuned, double logging fixed. Maxim Dounin <mdounin@mdounin.ru> parents: 4144 diff changeset	2051 ngx_log_error(NGX_LOG_WARN, r->connection->log, 0,
4962 13a5202b6b4b Proxy: better error message about unexpected data. Maxim Dounin <mdounin@mdounin.ru> parents: 4947 diff changeset	2052 "upstream sent more data than specified in "
13a5202b6b4b Proxy: better error message about unexpected data. Maxim Dounin <mdounin@mdounin.ru> parents: 4947 diff changeset	2053 "\"Content-Length\" header");
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2054 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2055
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2056 return NGX_OK;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2057 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2058
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2059
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2060 static ngx_int_t
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2061 ngx_http_proxy_chunked_filter(ngx_event_pipe_t p, ngx_buf_t buf)
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2062 {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2063 ngx_int_t rc;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2064 ngx_buf_t b, *prev;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2065 ngx_chain_t *cl;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2066 ngx_http_request_t *r;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2067 ngx_http_proxy_ctx_t *ctx;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2068
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2069 if (buf->pos == buf->last) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2070 return NGX_OK;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2071 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2072
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2073 r = p->input_ctx;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2074 ctx = ngx_http_get_module_ctx(r, ngx_http_proxy_module);
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2075
4602 8036fc6af2df Proxy: added ctx checking to input filters. Maxim Dounin <mdounin@mdounin.ru> parents: 4593 diff changeset	2076 if (ctx == NULL) {
8036fc6af2df Proxy: added ctx checking to input filters. Maxim Dounin <mdounin@mdounin.ru> parents: 4593 diff changeset	2077 return NGX_ERROR;
8036fc6af2df Proxy: added ctx checking to input filters. Maxim Dounin <mdounin@mdounin.ru> parents: 4593 diff changeset	2078 }
8036fc6af2df Proxy: added ctx checking to input filters. Maxim Dounin <mdounin@mdounin.ru> parents: 4593 diff changeset	2079
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2080 b = NULL;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2081 prev = &buf->shadow;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2082
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2083 for ( ;; ) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2084
4925 32030fa8cb14 Request body: chunked parsing moved to ngx_http_parse.c from proxy. Maxim Dounin <mdounin@mdounin.ru> parents: 4602 diff changeset	2085 rc = ngx_http_parse_chunked(r, buf, &ctx->chunked);
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2086
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2087 if (rc == NGX_OK) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2088
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2089 /* a chunk has been parsed successfully */
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2090
5466 e7b3b9855be8 Use ngx_chain_get_free_buf() in pipe input filters. Valentin Bartenev <vbart@nginx.com> parents: 5441 diff changeset	2091 cl = ngx_chain_get_free_buf(p->pool, &p->free);
e7b3b9855be8 Use ngx_chain_get_free_buf() in pipe input filters. Valentin Bartenev <vbart@nginx.com> parents: 5441 diff changeset	2092 if (cl == NULL) {
e7b3b9855be8 Use ngx_chain_get_free_buf() in pipe input filters. Valentin Bartenev <vbart@nginx.com> parents: 5441 diff changeset	2093 return NGX_ERROR;
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2094 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2095
5466 e7b3b9855be8 Use ngx_chain_get_free_buf() in pipe input filters. Valentin Bartenev <vbart@nginx.com> parents: 5441 diff changeset	2096 b = cl->buf;
e7b3b9855be8 Use ngx_chain_get_free_buf() in pipe input filters. Valentin Bartenev <vbart@nginx.com> parents: 5441 diff changeset	2097
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2098 ngx_memzero(b, sizeof(ngx_buf_t));
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2099
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2100 b->pos = buf->pos;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2101 b->start = buf->start;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2102 b->end = buf->end;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2103 b->tag = p->tag;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2104 b->temporary = 1;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2105 b->recycled = 1;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2106
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2107 *prev = b;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2108 prev = &b->shadow;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2109
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2110 if (p->in) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2111 *p->last_in = cl;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2112 } else {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2113 p->in = cl;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2114 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2115 p->last_in = &cl->next;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2116
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2117 /* STUB */ b->num = buf->num;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2118
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2119 ngx_log_debug2(NGX_LOG_DEBUG_EVENT, p->log, 0,
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2120 "input buf #%d %p", b->num, b->pos);
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2121
4925 32030fa8cb14 Request body: chunked parsing moved to ngx_http_parse.c from proxy. Maxim Dounin <mdounin@mdounin.ru> parents: 4602 diff changeset	2122 if (buf->last - buf->pos >= ctx->chunked.size) {
32030fa8cb14 Request body: chunked parsing moved to ngx_http_parse.c from proxy. Maxim Dounin <mdounin@mdounin.ru> parents: 4602 diff changeset	2123
5359 2fda9065d0f4 Win32: Borland C compatibility fixes. Maxim Dounin <mdounin@mdounin.ru> parents: 5301 diff changeset	2124 buf->pos += (size_t) ctx->chunked.size;
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2125 b->last = buf->pos;
4925 32030fa8cb14 Request body: chunked parsing moved to ngx_http_parse.c from proxy. Maxim Dounin <mdounin@mdounin.ru> parents: 4602 diff changeset	2126 ctx->chunked.size = 0;
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2127
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2128 continue;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2129 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2130
4925 32030fa8cb14 Request body: chunked parsing moved to ngx_http_parse.c from proxy. Maxim Dounin <mdounin@mdounin.ru> parents: 4602 diff changeset	2131 ctx->chunked.size -= buf->last - buf->pos;
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2132 buf->pos = buf->last;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2133 b->last = buf->last;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2134
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2135 continue;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2136 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2137
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2138 if (rc == NGX_DONE) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2139
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2140 /* a whole response has been parsed successfully */
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2141
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2142 p->upstream_done = 1;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2143 r->upstream->keepalive = !r->upstream->headers_in.connection_close;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2144
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2145 break;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2146 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2147
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2148 if (rc == NGX_AGAIN) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2149
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2150 /* set p->length, minimal amount of data we want to see */
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2151
4925 32030fa8cb14 Request body: chunked parsing moved to ngx_http_parse.c from proxy. Maxim Dounin <mdounin@mdounin.ru> parents: 4602 diff changeset	2152 p->length = ctx->chunked.length;
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2153
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2154 break;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2155 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2156
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2157 /* invalid response */
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2158
4145 f321e9750c8c Proxy: logging levels tuned, double logging fixed. Maxim Dounin <mdounin@mdounin.ru> parents: 4144 diff changeset	2159 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2160 "upstream sent invalid chunked response");
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2161
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2162 return NGX_ERROR;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2163 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2164
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2165 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
6480 f01ab2dbcfdc Fixed logging. Sergey Kandaurov <pluknet@nginx.com> parents: 6467 diff changeset	2166 "http proxy chunked state %ui, length %O",
4925 32030fa8cb14 Request body: chunked parsing moved to ngx_http_parse.c from proxy. Maxim Dounin <mdounin@mdounin.ru> parents: 4602 diff changeset	2167 ctx->chunked.state, p->length);
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2168
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2169 if (b) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2170 b->shadow = buf;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2171 b->last_shadow = 1;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2172
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2173 ngx_log_debug2(NGX_LOG_DEBUG_EVENT, p->log, 0,
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2174 "input buf %p %z", b->pos, b->last - b->pos);
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2175
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2176 return NGX_OK;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2177 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2178
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2179 /* there is no data record in the buf, add it to free chain */
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2180
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2181 if (ngx_event_pipe_add_free_buf(p, buf) != NGX_OK) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2182 return NGX_ERROR;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2183 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2184
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2185 return NGX_OK;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2186 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2187
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2188
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2189 static ngx_int_t
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2190 ngx_http_proxy_non_buffered_copy_filter(void *data, ssize_t bytes)
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2191 {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2192 ngx_http_request_t *r = data;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2193
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2194 ngx_buf_t *b;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2195 ngx_chain_t cl, *ll;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2196 ngx_http_upstream_t *u;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2197
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2198 u = r->upstream;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2199
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2200 for (cl = u->out_bufs, ll = &u->out_bufs; cl; cl = cl->next) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2201 ll = &cl->next;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2202 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2203
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2204 cl = ngx_chain_get_free_buf(r->pool, &u->free_bufs);
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2205 if (cl == NULL) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2206 return NGX_ERROR;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2207 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2208
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2209 *ll = cl;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2210
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2211 cl->buf->flush = 1;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2212 cl->buf->memory = 1;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2213
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2214 b = &u->buffer;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2215
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2216 cl->buf->pos = b->last;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2217 b->last += bytes;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2218 cl->buf->last = b->last;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2219 cl->buf->tag = u->output.tag;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2220
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2221 if (u->length == -1) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2222 return NGX_OK;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2223 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2224
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2225 u->length -= bytes;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2226
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2227 if (u->length == 0) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2228 u->keepalive = !u->headers_in.connection_close;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2229 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2230
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2231 return NGX_OK;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2232 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2233
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2234
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2235 static ngx_int_t
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2236 ngx_http_proxy_non_buffered_chunked_filter(void *data, ssize_t bytes)
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2237 {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2238 ngx_http_request_t *r = data;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2239
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2240 ngx_int_t rc;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2241 ngx_buf_t b, buf;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2242 ngx_chain_t cl, *ll;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2243 ngx_http_upstream_t *u;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2244 ngx_http_proxy_ctx_t *ctx;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2245
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2246 ctx = ngx_http_get_module_ctx(r, ngx_http_proxy_module);
4602 8036fc6af2df Proxy: added ctx checking to input filters. Maxim Dounin <mdounin@mdounin.ru> parents: 4593 diff changeset	2247
8036fc6af2df Proxy: added ctx checking to input filters. Maxim Dounin <mdounin@mdounin.ru> parents: 4593 diff changeset	2248 if (ctx == NULL) {
8036fc6af2df Proxy: added ctx checking to input filters. Maxim Dounin <mdounin@mdounin.ru> parents: 4593 diff changeset	2249 return NGX_ERROR;
8036fc6af2df Proxy: added ctx checking to input filters. Maxim Dounin <mdounin@mdounin.ru> parents: 4593 diff changeset	2250 }
8036fc6af2df Proxy: added ctx checking to input filters. Maxim Dounin <mdounin@mdounin.ru> parents: 4593 diff changeset	2251
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2252 u = r->upstream;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2253 buf = &u->buffer;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2254
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2255 buf->pos = buf->last;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2256 buf->last += bytes;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2257
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2258 for (cl = u->out_bufs, ll = &u->out_bufs; cl; cl = cl->next) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2259 ll = &cl->next;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2260 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2261
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2262 for ( ;; ) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2263
4925 32030fa8cb14 Request body: chunked parsing moved to ngx_http_parse.c from proxy. Maxim Dounin <mdounin@mdounin.ru> parents: 4602 diff changeset	2264 rc = ngx_http_parse_chunked(r, buf, &ctx->chunked);
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2265
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2266 if (rc == NGX_OK) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2267
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2268 /* a chunk has been parsed successfully */
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2269
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2270 cl = ngx_chain_get_free_buf(r->pool, &u->free_bufs);
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2271 if (cl == NULL) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2272 return NGX_ERROR;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2273 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2274
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2275 *ll = cl;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2276 ll = &cl->next;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2277
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2278 b = cl->buf;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2279
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2280 b->flush = 1;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2281 b->memory = 1;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2282
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2283 b->pos = buf->pos;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2284 b->tag = u->output.tag;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2285
4925 32030fa8cb14 Request body: chunked parsing moved to ngx_http_parse.c from proxy. Maxim Dounin <mdounin@mdounin.ru> parents: 4602 diff changeset	2286 if (buf->last - buf->pos >= ctx->chunked.size) {
5359 2fda9065d0f4 Win32: Borland C compatibility fixes. Maxim Dounin <mdounin@mdounin.ru> parents: 5301 diff changeset	2287 buf->pos += (size_t) ctx->chunked.size;
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2288 b->last = buf->pos;
4925 32030fa8cb14 Request body: chunked parsing moved to ngx_http_parse.c from proxy. Maxim Dounin <mdounin@mdounin.ru> parents: 4602 diff changeset	2289 ctx->chunked.size = 0;
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2290
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2291 } else {
4925 32030fa8cb14 Request body: chunked parsing moved to ngx_http_parse.c from proxy. Maxim Dounin <mdounin@mdounin.ru> parents: 4602 diff changeset	2292 ctx->chunked.size -= buf->last - buf->pos;
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2293 buf->pos = buf->last;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2294 b->last = buf->last;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2295 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2296
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2297 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2298 "http proxy out buf %p %z",
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2299 b->pos, b->last - b->pos);
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2300
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2301 continue;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2302 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2303
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2304 if (rc == NGX_DONE) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2305
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2306 /* a whole response has been parsed successfully */
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2307
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2308 u->keepalive = !u->headers_in.connection_close;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2309 u->length = 0;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2310
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2311 break;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2312 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2313
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2314 if (rc == NGX_AGAIN) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2315 break;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2316 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2317
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2318 /* invalid response */
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2319
4145 f321e9750c8c Proxy: logging levels tuned, double logging fixed. Maxim Dounin <mdounin@mdounin.ru> parents: 4144 diff changeset	2320 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2321 "upstream sent invalid chunked response");
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2322
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2323 return NGX_ERROR;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2324 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2325
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2326 /* provide continuous buffer for subrequests in memory */
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2327
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2328 if (r->subrequest_in_memory) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2329
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2330 cl = u->out_bufs;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2331
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2332 if (cl) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2333 buf->pos = cl->buf->pos;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2334 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2335
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2336 buf->last = buf->pos;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2337
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2338 for (cl = u->out_bufs; cl; cl = cl->next) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2339 ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
6480 f01ab2dbcfdc Fixed logging. Sergey Kandaurov <pluknet@nginx.com> parents: 6467 diff changeset	2340 "http proxy in memory %p-%p %O",
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2341 cl->buf->pos, cl->buf->last, ngx_buf_size(cl->buf));
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2342
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2343 if (buf->last == cl->buf->pos) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2344 buf->last = cl->buf->last;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2345 continue;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2346 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2347
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2348 buf->last = ngx_movemem(buf->last, cl->buf->pos,
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2349 cl->buf->last - cl->buf->pos);
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2350
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2351 cl->buf->pos = buf->last - (cl->buf->last - cl->buf->pos);
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2352 cl->buf->last = buf->last;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2353 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2354 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2355
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2356 return NGX_OK;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2357 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2358
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2359
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2360 static void
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2361 ngx_http_proxy_abort_request(ngx_http_request_t *r)
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2362 {
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2363 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2364 "abort http proxy request");
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2365
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2366 return;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2367 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2368
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2369
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2370 static void
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2371 ngx_http_proxy_finalize_request(ngx_http_request_t *r, ngx_int_t rc)
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2372 {
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2373 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2374 "finalize http proxy request");
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2375
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2376 return;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2377 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2378
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2379
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	2380 static ngx_int_t
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	2381 ngx_http_proxy_host_variable(ngx_http_request_t *r,
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	2382 ngx_http_variable_value_t *v, uintptr_t data)
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2383 {
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2384 ngx_http_proxy_ctx_t *ctx;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2385
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2386 ctx = ngx_http_get_module_ctx(r, ngx_http_proxy_module);
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2387
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2388 if (ctx == NULL) {
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2389 v->not_found = 1;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2390 return NGX_OK;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2391 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2392
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2393 v->len = ctx->vars.host_header.len;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2394 v->valid = 1;
1565 4c43e25d11ea fix English grammar Igor Sysoev <igor@sysoev.ru> parents: 1563 diff changeset	2395 v->no_cacheable = 0;
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	2396 v->not_found = 0;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2397 v->data = ctx->vars.host_header.data;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2398
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	2399 return NGX_OK;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2400 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2401
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2402
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	2403 static ngx_int_t
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	2404 ngx_http_proxy_port_variable(ngx_http_request_t *r,
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	2405 ngx_http_variable_value_t *v, uintptr_t data)
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2406 {
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2407 ngx_http_proxy_ctx_t *ctx;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2408
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2409 ctx = ngx_http_get_module_ctx(r, ngx_http_proxy_module);
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2410
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2411 if (ctx == NULL) {
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2412 v->not_found = 1;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2413 return NGX_OK;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2414 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2415
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2416 v->len = ctx->vars.port.len;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2417 v->valid = 1;
1565 4c43e25d11ea fix English grammar Igor Sysoev <igor@sysoev.ru> parents: 1563 diff changeset	2418 v->no_cacheable = 0;
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	2419 v->not_found = 0;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2420 v->data = ctx->vars.port.data;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2421
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	2422 return NGX_OK;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2423 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2424
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2425
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	2426 static ngx_int_t
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2427 ngx_http_proxy_add_x_forwarded_for_variable(ngx_http_request_t *r,
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	2428 ngx_http_variable_value_t *v, uintptr_t data)
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2429 {
5084 f7fe817c92a2 Correctly handle multiple X-Forwarded-For headers (ticket #106). Ruslan Ermilov <ru@nginx.com> parents: 5072 diff changeset	2430 size_t len;
f7fe817c92a2 Correctly handle multiple X-Forwarded-For headers (ticket #106). Ruslan Ermilov <ru@nginx.com> parents: 5072 diff changeset	2431 u_char *p;
f7fe817c92a2 Correctly handle multiple X-Forwarded-For headers (ticket #106). Ruslan Ermilov <ru@nginx.com> parents: 5072 diff changeset	2432 ngx_uint_t i, n;
f7fe817c92a2 Correctly handle multiple X-Forwarded-For headers (ticket #106). Ruslan Ermilov <ru@nginx.com> parents: 5072 diff changeset	2433 ngx_table_elt_t **h;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2434
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2435 v->valid = 1;
1565 4c43e25d11ea fix English grammar Igor Sysoev <igor@sysoev.ru> parents: 1563 diff changeset	2436 v->no_cacheable = 0;
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	2437 v->not_found = 0;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2438
5084 f7fe817c92a2 Correctly handle multiple X-Forwarded-For headers (ticket #106). Ruslan Ermilov <ru@nginx.com> parents: 5072 diff changeset	2439 n = r->headers_in.x_forwarded_for.nelts;
f7fe817c92a2 Correctly handle multiple X-Forwarded-For headers (ticket #106). Ruslan Ermilov <ru@nginx.com> parents: 5072 diff changeset	2440 h = r->headers_in.x_forwarded_for.elts;
f7fe817c92a2 Correctly handle multiple X-Forwarded-For headers (ticket #106). Ruslan Ermilov <ru@nginx.com> parents: 5072 diff changeset	2441
f7fe817c92a2 Correctly handle multiple X-Forwarded-For headers (ticket #106). Ruslan Ermilov <ru@nginx.com> parents: 5072 diff changeset	2442 len = 0;
f7fe817c92a2 Correctly handle multiple X-Forwarded-For headers (ticket #106). Ruslan Ermilov <ru@nginx.com> parents: 5072 diff changeset	2443
f7fe817c92a2 Correctly handle multiple X-Forwarded-For headers (ticket #106). Ruslan Ermilov <ru@nginx.com> parents: 5072 diff changeset	2444 for (i = 0; i < n; i++) {
f7fe817c92a2 Correctly handle multiple X-Forwarded-For headers (ticket #106). Ruslan Ermilov <ru@nginx.com> parents: 5072 diff changeset	2445 len += h[i]->value.len + sizeof(", ") - 1;
f7fe817c92a2 Correctly handle multiple X-Forwarded-For headers (ticket #106). Ruslan Ermilov <ru@nginx.com> parents: 5072 diff changeset	2446 }
f7fe817c92a2 Correctly handle multiple X-Forwarded-For headers (ticket #106). Ruslan Ermilov <ru@nginx.com> parents: 5072 diff changeset	2447
f7fe817c92a2 Correctly handle multiple X-Forwarded-For headers (ticket #106). Ruslan Ermilov <ru@nginx.com> parents: 5072 diff changeset	2448 if (len == 0) {
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	2449 v->len = r->connection->addr_text.len;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	2450 v->data = r->connection->addr_text.data;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	2451 return NGX_OK;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2452 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2453
5084 f7fe817c92a2 Correctly handle multiple X-Forwarded-For headers (ticket #106). Ruslan Ermilov <ru@nginx.com> parents: 5072 diff changeset	2454 len += r->connection->addr_text.len;
f7fe817c92a2 Correctly handle multiple X-Forwarded-For headers (ticket #106). Ruslan Ermilov <ru@nginx.com> parents: 5072 diff changeset	2455
f7fe817c92a2 Correctly handle multiple X-Forwarded-For headers (ticket #106). Ruslan Ermilov <ru@nginx.com> parents: 5072 diff changeset	2456 p = ngx_pnalloc(r->pool, len);
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2457 if (p == NULL) {
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	2458 return NGX_ERROR;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2459 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2460
5084 f7fe817c92a2 Correctly handle multiple X-Forwarded-For headers (ticket #106). Ruslan Ermilov <ru@nginx.com> parents: 5072 diff changeset	2461 v->len = len;
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	2462 v->data = p;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2463
5084 f7fe817c92a2 Correctly handle multiple X-Forwarded-For headers (ticket #106). Ruslan Ermilov <ru@nginx.com> parents: 5072 diff changeset	2464 for (i = 0; i < n; i++) {
f7fe817c92a2 Correctly handle multiple X-Forwarded-For headers (ticket #106). Ruslan Ermilov <ru@nginx.com> parents: 5072 diff changeset	2465 p = ngx_copy(p, h[i]->value.data, h[i]->value.len);
f7fe817c92a2 Correctly handle multiple X-Forwarded-For headers (ticket #106). Ruslan Ermilov <ru@nginx.com> parents: 5072 diff changeset	2466 p++ = ','; p++ = ' ';
f7fe817c92a2 Correctly handle multiple X-Forwarded-For headers (ticket #106). Ruslan Ermilov <ru@nginx.com> parents: 5072 diff changeset	2467 }
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2468
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2469 ngx_memcpy(p, r->connection->addr_text.data, r->connection->addr_text.len);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2470
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	2471 return NGX_OK;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2472 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2473
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2474
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2475 static ngx_int_t
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2476 ngx_http_proxy_internal_body_length_variable(ngx_http_request_t *r,
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2477 ngx_http_variable_value_t *v, uintptr_t data)
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2478 {
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2479 ngx_http_proxy_ctx_t *ctx;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2480
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2481 ctx = ngx_http_get_module_ctx(r, ngx_http_proxy_module);
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2482
4927 93294110728f Request body: always use calculated size of a request body in proxy. Maxim Dounin <mdounin@mdounin.ru> parents: 4925 diff changeset	2483 if (ctx == NULL \|\| ctx->internal_body_length < 0) {
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2484 v->not_found = 1;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2485 return NGX_OK;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2486 }
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2487
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2488 v->valid = 1;
1565 4c43e25d11ea fix English grammar Igor Sysoev <igor@sysoev.ru> parents: 1563 diff changeset	2489 v->no_cacheable = 0;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2490 v->not_found = 0;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2491
5188 886800caf360 Proxy: allocate $proxy_internal_body_length from request pool. Ruslan Ermilov <ru@nginx.com> parents: 5084 diff changeset	2492 v->data = ngx_pnalloc(r->pool, NGX_OFF_T_LEN);
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2493
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2494 if (v->data == NULL) {
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2495 return NGX_ERROR;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2496 }
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2497
4927 93294110728f Request body: always use calculated size of a request body in proxy. Maxim Dounin <mdounin@mdounin.ru> parents: 4925 diff changeset	2498 v->len = ngx_sprintf(v->data, "%O", ctx->internal_body_length) - v->data;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2499
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2500 return NGX_OK;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2501 }
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2502
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2503
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2504 static ngx_int_t
6051 d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2505 ngx_http_proxy_internal_chunked_variable(ngx_http_request_t *r,
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2506 ngx_http_variable_value_t *v, uintptr_t data)
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2507 {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2508 ngx_http_proxy_ctx_t *ctx;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2509
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2510 ctx = ngx_http_get_module_ctx(r, ngx_http_proxy_module);
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2511
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2512 if (ctx == NULL \|\| !ctx->internal_chunked) {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2513 v->not_found = 1;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2514 return NGX_OK;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2515 }
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2516
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2517 v->valid = 1;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2518 v->no_cacheable = 0;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2519 v->not_found = 0;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2520
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2521 v->data = (u_char *) "chunked";
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2522 v->len = sizeof("chunked") - 1;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2523
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2524 return NGX_OK;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2525 }
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2526
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2527
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2528 static ngx_int_t
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2529 ngx_http_proxy_rewrite_redirect(ngx_http_request_t r, ngx_table_elt_t h,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2530 size_t prefix)
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2531 {
4462 a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2532 size_t len;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2533 ngx_int_t rc;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2534 ngx_uint_t i;
4461 103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	2535 ngx_http_proxy_rewrite_t *pr;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2536 ngx_http_proxy_loc_conf_t *plcf;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2537
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2538 plcf = ngx_http_get_module_loc_conf(r, ngx_http_proxy_module);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2539
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2540 pr = plcf->redirects->elts;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2541
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2542 if (pr == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2543 return NGX_DECLINED;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2544 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2545
4462 a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2546 len = h->value.len - prefix;
a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2547
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2548 for (i = 0; i < plcf->redirects->nelts; i++) {
4462 a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2549 rc = pr[i].handler(r, h, prefix, len, &pr[i]);
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2550
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2551 if (rc != NGX_DECLINED) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2552 return rc;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2553 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2554 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2555
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2556 return NGX_DECLINED;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2557 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2558
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2559
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2560 static ngx_int_t
4465 8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2561 ngx_http_proxy_rewrite_cookie(ngx_http_request_t r, ngx_table_elt_t h)
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2562 {
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2563 size_t prefix;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2564 u_char *p;
4466 b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2565 ngx_int_t rc, rv;
4465 8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2566 ngx_http_proxy_loc_conf_t *plcf;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2567
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2568 p = (u_char *) ngx_strchr(h->value.data, ';');
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2569 if (p == NULL) {
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2570 return NGX_DECLINED;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2571 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2572
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2573 prefix = p + 1 - h->value.data;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2574
4466 b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2575 rv = NGX_DECLINED;
4465 8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2576
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2577 plcf = ngx_http_get_module_loc_conf(r, ngx_http_proxy_module);
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2578
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2579 if (plcf->cookie_domains) {
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2580 p = ngx_strcasestrn(h->value.data + prefix, "domain=", 7 - 1);
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2581
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2582 if (p) {
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2583 rc = ngx_http_proxy_rewrite_cookie_value(r, h, p + 7,
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2584 plcf->cookie_domains);
4466 b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2585 if (rc == NGX_ERROR) {
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2586 return NGX_ERROR;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2587 }
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2588
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2589 if (rc != NGX_DECLINED) {
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2590 rv = rc;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2591 }
4465 8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2592 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2593 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2594
4466 b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2595 if (plcf->cookie_paths) {
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2596 p = ngx_strcasestrn(h->value.data + prefix, "path=", 5 - 1);
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2597
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2598 if (p) {
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2599 rc = ngx_http_proxy_rewrite_cookie_value(r, h, p + 5,
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2600 plcf->cookie_paths);
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2601 if (rc == NGX_ERROR) {
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2602 return NGX_ERROR;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2603 }
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2604
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2605 if (rc != NGX_DECLINED) {
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2606 rv = rc;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2607 }
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2608 }
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2609 }
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2610
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2611 return rv;
4465 8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2612 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2613
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2614
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2615 static ngx_int_t
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2616 ngx_http_proxy_rewrite_cookie_value(ngx_http_request_t r, ngx_table_elt_t h,
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2617 u_char value, ngx_array_t rewrites)
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2618 {
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2619 size_t len, prefix;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2620 u_char *p;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2621 ngx_int_t rc;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2622 ngx_uint_t i;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2623 ngx_http_proxy_rewrite_t *pr;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2624
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2625 prefix = value - h->value.data;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2626
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2627 p = (u_char *) ngx_strchr(value, ';');
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2628
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2629 len = p ? (size_t) (p - value) : (h->value.len - prefix);
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2630
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2631 pr = rewrites->elts;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2632
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2633 for (i = 0; i < rewrites->nelts; i++) {
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2634 rc = pr[i].handler(r, h, prefix, len, &pr[i]);
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2635
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2636 if (rc != NGX_DECLINED) {
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2637 return rc;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2638 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2639 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2640
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2641 return NGX_DECLINED;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2642 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2643
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2644
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2645 static ngx_int_t
4461 103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	2646 ngx_http_proxy_rewrite_complex_handler(ngx_http_request_t *r,
4462 a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2647 ngx_table_elt_t h, size_t prefix, size_t len, ngx_http_proxy_rewrite_t pr)
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2648 {
4462 a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2649 ngx_str_t pattern, replacement;
4461 103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	2650
103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	2651 if (ngx_http_complex_value(r, &pr->pattern.complex, &pattern) != NGX_OK) {
4336 99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	2652 return NGX_ERROR;
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	2653 }
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	2654
4462 a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2655 if (pattern.len > len
4461 103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	2656 \|\| ngx_rstrncmp(h->value.data + prefix, pattern.data,
103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	2657 pattern.len) != 0)
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2658 {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2659 return NGX_DECLINED;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2660 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2661
4336 99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	2662 if (ngx_http_complex_value(r, &pr->replacement, &replacement) != NGX_OK) {
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	2663 return NGX_ERROR;
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	2664 }
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	2665
4462 a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2666 return ngx_http_proxy_rewrite(r, h, prefix, pattern.len, &replacement);
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2667 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2668
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2669
4336 99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	2670 #if (NGX_PCRE)
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	2671
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2672 static ngx_int_t
4461 103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	2673 ngx_http_proxy_rewrite_regex_handler(ngx_http_request_t r, ngx_table_elt_t h,
4462 a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2674 size_t prefix, size_t len, ngx_http_proxy_rewrite_t *pr)
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2675 {
4462 a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2676 ngx_str_t pattern, replacement;
a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2677
a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2678 pattern.len = len;
4461 103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	2679 pattern.data = h->value.data + prefix;
103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	2680
103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	2681 if (ngx_http_regex_exec(r, pr->pattern.regex, &pattern) != NGX_OK) {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2682 return NGX_DECLINED;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2683 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2684
4336 99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	2685 if (ngx_http_complex_value(r, &pr->replacement, &replacement) != NGX_OK) {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2686 return NGX_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2687 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2688
4462 a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2689 if (prefix == 0 && h->value.len == len) {
4398 3d51ba7f347b Fixed: proxy_redirect with regex might broke Refresh header. Valentin Bartenev <vbart@nginx.com> parents: 4385 diff changeset	2690 h->value = replacement;
3d51ba7f347b Fixed: proxy_redirect with regex might broke Refresh header. Valentin Bartenev <vbart@nginx.com> parents: 4385 diff changeset	2691 return NGX_OK;
3d51ba7f347b Fixed: proxy_redirect with regex might broke Refresh header. Valentin Bartenev <vbart@nginx.com> parents: 4385 diff changeset	2692 }
3d51ba7f347b Fixed: proxy_redirect with regex might broke Refresh header. Valentin Bartenev <vbart@nginx.com> parents: 4385 diff changeset	2693
4462 a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2694 return ngx_http_proxy_rewrite(r, h, prefix, len, &replacement);
a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2695 }
a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2696
a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2697 #endif
a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2698
a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2699
a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2700 static ngx_int_t
4465 8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2701 ngx_http_proxy_rewrite_domain_handler(ngx_http_request_t *r,
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2702 ngx_table_elt_t h, size_t prefix, size_t len, ngx_http_proxy_rewrite_t pr)
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2703 {
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2704 u_char *p;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2705 ngx_str_t pattern, replacement;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2706
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2707 if (ngx_http_complex_value(r, &pr->pattern.complex, &pattern) != NGX_OK) {
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2708 return NGX_ERROR;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2709 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2710
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2711 p = h->value.data + prefix;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2712
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2713 if (p[0] == '.') {
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2714 p++;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2715 prefix++;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2716 len--;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2717 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2718
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2719 if (pattern.len != len \|\| ngx_rstrncasecmp(pattern.data, p, len) != 0) {
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2720 return NGX_DECLINED;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2721 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2722
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2723 if (ngx_http_complex_value(r, &pr->replacement, &replacement) != NGX_OK) {
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2724 return NGX_ERROR;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2725 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2726
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2727 return ngx_http_proxy_rewrite(r, h, prefix, len, &replacement);
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2728 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2729
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2730
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2731 static ngx_int_t
4462 a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2732 ngx_http_proxy_rewrite(ngx_http_request_t r, ngx_table_elt_t h, size_t prefix,
a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2733 size_t len, ngx_str_t *replacement)
a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2734 {
a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2735 u_char p, data;
a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2736 size_t new_len;
a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2737
a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2738 new_len = replacement->len + h->value.len - len;
a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2739
a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2740 if (replacement->len > len) {
a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2741
5676 fbfdf8017748 Proxy: fixed possible uninitialized memory access. Valentin Bartenev <vbart@nginx.com> parents: 5661 diff changeset	2742 data = ngx_pnalloc(r->pool, new_len + 1);
4462 a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2743 if (data == NULL) {
a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2744 return NGX_ERROR;
a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2745 }
a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2746
a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2747 p = ngx_copy(data, h->value.data, prefix);
a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2748 p = ngx_copy(p, replacement->data, replacement->len);
a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2749
a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2750 ngx_memcpy(p, h->value.data + prefix + len,
5676 fbfdf8017748 Proxy: fixed possible uninitialized memory access. Valentin Bartenev <vbart@nginx.com> parents: 5661 diff changeset	2751 h->value.len - len - prefix + 1);
4462 a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2752
a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2753 h->value.data = data;
a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2754
a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2755 } else {
a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2756 p = ngx_copy(h->value.data + prefix, replacement->data,
a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2757 replacement->len);
a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2758
a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2759 ngx_memmove(p, h->value.data + prefix + len,
5676 fbfdf8017748 Proxy: fixed possible uninitialized memory access. Valentin Bartenev <vbart@nginx.com> parents: 5661 diff changeset	2760 h->value.len - len - prefix + 1);
4398 3d51ba7f347b Fixed: proxy_redirect with regex might broke Refresh header. Valentin Bartenev <vbart@nginx.com> parents: 4385 diff changeset	2761 }
3d51ba7f347b Fixed: proxy_redirect with regex might broke Refresh header. Valentin Bartenev <vbart@nginx.com> parents: 4385 diff changeset	2762
4462 a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2763 h->value.len = new_len;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2764
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2765 return NGX_OK;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2766 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2767
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2768
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2769 static ngx_int_t
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2770 ngx_http_proxy_add_variables(ngx_conf_t *cf)
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2771 {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2772 ngx_http_variable_t var, v;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2773
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2774 for (v = ngx_http_proxy_vars; v->name.len; v++) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2775 var = ngx_http_add_variable(cf, &v->name, v->flags);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2776 if (var == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2777 return NGX_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2778 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2779
637 e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 629 diff changeset	2780 var->get_handler = v->get_handler;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2781 var->data = v->data;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2782 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2783
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2784 return NGX_OK;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2785 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2786
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2787
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2788 static void *
5951 610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2789 ngx_http_proxy_create_main_conf(ngx_conf_t *cf)
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2790 {
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2791 ngx_http_proxy_main_conf_t *conf;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2792
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2793 conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_proxy_main_conf_t));
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2794 if (conf == NULL) {
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2795 return NULL;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2796 }
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2797
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2798 #if (NGX_HTTP_CACHE)
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2799 if (ngx_array_init(&conf->caches, cf->pool, 4,
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2800 sizeof(ngx_http_file_cache_t *))
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2801 != NGX_OK)
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2802 {
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2803 return NULL;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2804 }
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2805 #endif
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2806
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2807 return conf;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2808 }
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2809
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2810
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2811 static void *
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2812 ngx_http_proxy_create_loc_conf(ngx_conf_t *cf)
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2813 {
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2814 ngx_http_proxy_loc_conf_t *conf;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2815
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2816 conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_proxy_loc_conf_t));
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2817 if (conf == NULL) {
2912 c7d57b539248 return NULL instead of NGX_CONF_ERROR on a create conf failure Igor Sysoev <igor@sysoev.ru> parents: 2895 diff changeset	2818 return NULL;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2819 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2820
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2821 /*
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2822 * set by ngx_pcalloc():
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2823 *
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2824 * conf->upstream.bufs.num = 0;
2786 4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2784 diff changeset	2825 * conf->upstream.ignore_headers = 0;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2826 * conf->upstream.next_upstream = 0;
5949 634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	2827 * conf->upstream.cache_zone = NULL;
2875 6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2786 diff changeset	2828 * conf->upstream.cache_use_stale = 0;
6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2786 diff changeset	2829 * conf->upstream.cache_methods = 0;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2830 * conf->upstream.temp_path = NULL;
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	2831 * conf->upstream.hide_headers_hash = { NULL, 0 };
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2832 * conf->upstream.uri = { 0, NULL };
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2833 * conf->upstream.location = NULL;
1295 5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	2834 * conf->upstream.store_lengths = NULL;
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	2835 * conf->upstream.store_values = NULL;
5660 7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	2836 * conf->upstream.ssl_name = NULL;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2837 *
6781 ca27074f8f0f Proxy: support variables for proxy_method directive. Dmitry Lazurkin <dilaz03@gmail.com> parents: 6747 diff changeset	2838 * conf->method = NULL;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2839 * conf->headers_source = NULL;
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	2840 * conf->headers.lengths = NULL;
f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	2841 * conf->headers.values = NULL;
f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	2842 * conf->headers.hash = { NULL, 0 };
5909 8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	2843 * conf->headers_cache.lengths = NULL;
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	2844 * conf->headers_cache.values = NULL;
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	2845 * conf->headers_cache.hash = { NULL, 0 };
5910 29fa5023bd6f Proxy: renamed and rearranged fields in proxy configuration. Roman Arutyunyan <arut@nginx.com> parents: 5909 diff changeset	2846 * conf->body_lengths = NULL;
29fa5023bd6f Proxy: renamed and rearranged fields in proxy configuration. Roman Arutyunyan <arut@nginx.com> parents: 5909 diff changeset	2847 * conf->body_values = NULL;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2848 * conf->body_source = { 0, NULL };
3470 b982f2dee8cf fix proxy_redirect name in error message Igor Sysoev <igor@sysoev.ru> parents: 3399 diff changeset	2849 * conf->redirects = NULL;
5385 7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	2850 * conf->ssl = 0;
7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	2851 * conf->ssl_protocols = 0;
5390 919d230ecdbe Proxy: added the "proxy_ssl_ciphers" directive. Piotr Sikora <piotr@cloudflare.com> parents: 5385 diff changeset	2852 * conf->ssl_ciphers = { 0, NULL };
5661 060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	2853 * conf->ssl_trusted_certificate = { 0, NULL };
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	2854 * conf->ssl_crl = { 0, NULL };
5900 20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	2855 * conf->ssl_certificate = { 0, NULL };
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	2856 * conf->ssl_certificate_key = { 0, NULL };
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2857 */
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2858
1295 5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	2859 conf->upstream.store = NGX_CONF_UNSET;
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	2860 conf->upstream.store_access = NGX_CONF_UNSET_UINT;
5832 d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5738 diff changeset	2861 conf->upstream.next_upstream_tries = NGX_CONF_UNSET_UINT;
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 579 diff changeset	2862 conf->upstream.buffering = NGX_CONF_UNSET;
6050 a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	2863 conf->upstream.request_buffering = NGX_CONF_UNSET;
629 65bf042c0b4f nginx-0.3.36-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 627 diff changeset	2864 conf->upstream.ignore_client_abort = NGX_CONF_UNSET;
5874 2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	2865 conf->upstream.force_ranges = NGX_CONF_UNSET;
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 579 diff changeset	2866
5008 fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 4962 diff changeset	2867 conf->upstream.local = NGX_CONF_UNSET_PTR;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 4962 diff changeset	2868
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2869 conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2870 conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2871 conf->upstream.read_timeout = NGX_CONF_UNSET_MSEC;
5832 d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5738 diff changeset	2872 conf->upstream.next_upstream_timeout = NGX_CONF_UNSET_MSEC;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2873
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2874 conf->upstream.send_lowat = NGX_CONF_UNSET_SIZE;
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 579 diff changeset	2875 conf->upstream.buffer_size = NGX_CONF_UNSET_SIZE;
5883 973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5874 diff changeset	2876 conf->upstream.limit_rate = NGX_CONF_UNSET_SIZE;
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	2877
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	2878 conf->upstream.busy_buffers_size_conf = NGX_CONF_UNSET_SIZE;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2879 conf->upstream.max_temp_file_size_conf = NGX_CONF_UNSET_SIZE;
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	2880 conf->upstream.temp_file_write_size_conf = NGX_CONF_UNSET_SIZE;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2881
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2882 conf->upstream.pass_request_headers = NGX_CONF_UNSET;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2883 conf->upstream.pass_request_body = NGX_CONF_UNSET;
561 e48ebafc6939 nginx-0.3.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 555 diff changeset	2884
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	2885 #if (NGX_HTTP_CACHE)
5949 634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	2886 conf->upstream.cache = NGX_CONF_UNSET;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	2887 conf->upstream.cache_min_uses = NGX_CONF_UNSET_UINT;
6793 0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6785 diff changeset	2888 conf->upstream.cache_max_range_offset = NGX_CONF_UNSET;
3699 b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3692 diff changeset	2889 conf->upstream.cache_bypass = NGX_CONF_UNSET_PTR;
3526 62a4fd1e6e2c proxy_no_cache and fastcgi_no_cache Igor Sysoev <igor@sysoev.ru> parents: 3523 diff changeset	2890 conf->upstream.no_cache = NGX_CONF_UNSET_PTR;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	2891 conf->upstream.cache_valid = NGX_CONF_UNSET_PTR;
4385 70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4377 diff changeset	2892 conf->upstream.cache_lock = NGX_CONF_UNSET;
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4377 diff changeset	2893 conf->upstream.cache_lock_timeout = NGX_CONF_UNSET_MSEC;
5905 2f7e557eab5b Cache: proxy_cache_lock_age and friends. Roman Arutyunyan <arut@nginx.com> parents: 5900 diff changeset	2894 conf->upstream.cache_lock_age = NGX_CONF_UNSET_MSEC;
5441 43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5391 diff changeset	2895 conf->upstream.cache_revalidate = NGX_CONF_UNSET;
6290 4d5ac1a31d44 Upstream: proxy_cache_convert_head directive. Roman Arutyunyan <arut@nginx.com> parents: 6157 diff changeset	2896 conf->upstream.cache_convert_head = NGX_CONF_UNSET;
6906 1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6793 diff changeset	2897 conf->upstream.cache_background_update = NGX_CONF_UNSET;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	2898 #endif
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	2899
1701 40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	2900 conf->upstream.hide_headers = NGX_CONF_UNSET_PTR;
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	2901 conf->upstream.pass_headers = NGX_CONF_UNSET_PTR;
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	2902
657 400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	2903 conf->upstream.intercept_errors = NGX_CONF_UNSET;
5660 7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	2904
2184 274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2135 diff changeset	2905 #if (NGX_HTTP_SSL)
274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2135 diff changeset	2906 conf->upstream.ssl_session_reuse = NGX_CONF_UNSET;
5660 7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	2907 conf->upstream.ssl_server_name = NGX_CONF_UNSET;
5661 060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	2908 conf->upstream.ssl_verify = NGX_CONF_UNSET;
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	2909 conf->ssl_verify_depth = NGX_CONF_UNSET_UINT;
5900 20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	2910 conf->ssl_passwords = NGX_CONF_UNSET_PTR;
2184 274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2135 diff changeset	2911 #endif
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2912
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2913 /* "proxy_cyclic_temp_file" is disabled */
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2914 conf->upstream.cyclic_temp_file = 0;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2915
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2916 conf->redirect = NGX_CONF_UNSET;
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	2917 conf->upstream.change_buffering = 1;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2918
4465 8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2919 conf->cookie_domains = NGX_CONF_UNSET_PTR;
4466 b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2920 conf->cookie_paths = NGX_CONF_UNSET_PTR;
4465 8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2921
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2922 conf->http_version = NGX_CONF_UNSET_UINT;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2923
1180 1666b7b0bafc proxy_headers_hash_max_size and proxy_headers_hash_bucket_size Igor Sysoev <igor@sysoev.ru> parents: 1125 diff changeset	2924 conf->headers_hash_max_size = NGX_CONF_UNSET_UINT;
1666b7b0bafc proxy_headers_hash_max_size and proxy_headers_hash_bucket_size Igor Sysoev <igor@sysoev.ru> parents: 1125 diff changeset	2925 conf->headers_hash_bucket_size = NGX_CONF_UNSET_UINT;
1666b7b0bafc proxy_headers_hash_max_size and proxy_headers_hash_bucket_size Igor Sysoev <igor@sysoev.ru> parents: 1125 diff changeset	2926
3976 215fe9223419 update r3945 with more descriptive error message Igor Sysoev <igor@sysoev.ru> parents: 3862 diff changeset	2927 ngx_str_set(&conf->upstream.module, "proxy");
215fe9223419 update r3945 with more descriptive error message Igor Sysoev <igor@sysoev.ru> parents: 3862 diff changeset	2928
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2929 return conf;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2930 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2931
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2932
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2933 static char *
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2934 ngx_http_proxy_merge_loc_conf(ngx_conf_t cf, void parent, void *child)
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2935 {
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2936 ngx_http_proxy_loc_conf_t *prev = parent;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2937 ngx_http_proxy_loc_conf_t *conf = child;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2938
3862 f4c49c9e4bb5 always test proxy_redirect with slash, this fixes a case when nginx uses Igor Sysoev <igor@sysoev.ru> parents: 3734 diff changeset	2939 u_char *p;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	2940 size_t size;
5909 8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	2941 ngx_int_t rc;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	2942 ngx_hash_init_t hash;
3731 72cc5b789021 inherit proxy_pass, fastcgi_pass, uwsgi_pass, scgi_pass inside Igor Sysoev <igor@sysoev.ru> parents: 3729 diff changeset	2943 ngx_http_core_loc_conf_t *clcf;
4461 103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	2944 ngx_http_proxy_rewrite_t *pr;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	2945 ngx_http_script_compile_t sc;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2946
5948 f2ff0aa89126 Upstream: mutually exclusive inheritance of "cache" and "store". Valentin Bartenev <vbart@nginx.com> parents: 5947 diff changeset	2947 #if (NGX_HTTP_CACHE)
f2ff0aa89126 Upstream: mutually exclusive inheritance of "cache" and "store". Valentin Bartenev <vbart@nginx.com> parents: 5947 diff changeset	2948
f2ff0aa89126 Upstream: mutually exclusive inheritance of "cache" and "store". Valentin Bartenev <vbart@nginx.com> parents: 5947 diff changeset	2949 if (conf->upstream.store > 0) {
5949 634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	2950 conf->upstream.cache = 0;
5948 f2ff0aa89126 Upstream: mutually exclusive inheritance of "cache" and "store". Valentin Bartenev <vbart@nginx.com> parents: 5947 diff changeset	2951 }
f2ff0aa89126 Upstream: mutually exclusive inheritance of "cache" and "store". Valentin Bartenev <vbart@nginx.com> parents: 5947 diff changeset	2952
5949 634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	2953 if (conf->upstream.cache > 0) {
5948 f2ff0aa89126 Upstream: mutually exclusive inheritance of "cache" and "store". Valentin Bartenev <vbart@nginx.com> parents: 5947 diff changeset	2954 conf->upstream.store = 0;
f2ff0aa89126 Upstream: mutually exclusive inheritance of "cache" and "store". Valentin Bartenev <vbart@nginx.com> parents: 5947 diff changeset	2955 }
f2ff0aa89126 Upstream: mutually exclusive inheritance of "cache" and "store". Valentin Bartenev <vbart@nginx.com> parents: 5947 diff changeset	2956
f2ff0aa89126 Upstream: mutually exclusive inheritance of "cache" and "store". Valentin Bartenev <vbart@nginx.com> parents: 5947 diff changeset	2957 #endif
f2ff0aa89126 Upstream: mutually exclusive inheritance of "cache" and "store". Valentin Bartenev <vbart@nginx.com> parents: 5947 diff changeset	2958
5940 e3b3b89d74e8 Upstream: fixed inheritance of proxy_store and friends. Valentin Bartenev <vbart@nginx.com> parents: 5939 diff changeset	2959 if (conf->upstream.store == NGX_CONF_UNSET) {
1295 5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	2960 ngx_conf_merge_value(conf->upstream.store,
2894 d26f4e80c71f style fix Igor Sysoev <igor@sysoev.ru> parents: 2875 diff changeset	2961 prev->upstream.store, 0);
1295 5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	2962
5947 d9025ea1f5a5 Upstream: simplified proxy_store and friends configuration code. Valentin Bartenev <vbart@nginx.com> parents: 5940 diff changeset	2963 conf->upstream.store_lengths = prev->upstream.store_lengths;
d9025ea1f5a5 Upstream: simplified proxy_store and friends configuration code. Valentin Bartenev <vbart@nginx.com> parents: 5940 diff changeset	2964 conf->upstream.store_values = prev->upstream.store_values;
1295 5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	2965 }
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	2966
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	2967 ngx_conf_merge_uint_value(conf->upstream.store_access,
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	2968 prev->upstream.store_access, 0600);
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1244 diff changeset	2969
5832 d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5738 diff changeset	2970 ngx_conf_merge_uint_value(conf->upstream.next_upstream_tries,
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5738 diff changeset	2971 prev->upstream.next_upstream_tries, 0);
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5738 diff changeset	2972
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 579 diff changeset	2973 ngx_conf_merge_value(conf->upstream.buffering,
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 579 diff changeset	2974 prev->upstream.buffering, 1);
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 579 diff changeset	2975
6050 a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	2976 ngx_conf_merge_value(conf->upstream.request_buffering,
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	2977 prev->upstream.request_buffering, 1);
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	2978
629 65bf042c0b4f nginx-0.3.36-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 627 diff changeset	2979 ngx_conf_merge_value(conf->upstream.ignore_client_abort,
65bf042c0b4f nginx-0.3.36-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 627 diff changeset	2980 prev->upstream.ignore_client_abort, 0);
65bf042c0b4f nginx-0.3.36-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 627 diff changeset	2981
5874 2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	2982 ngx_conf_merge_value(conf->upstream.force_ranges,
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	2983 prev->upstream.force_ranges, 0);
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	2984
5008 fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 4962 diff changeset	2985 ngx_conf_merge_ptr_value(conf->upstream.local,
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 4962 diff changeset	2986 prev->upstream.local, NULL);
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 4962 diff changeset	2987
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2988 ngx_conf_merge_msec_value(conf->upstream.connect_timeout,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2989 prev->upstream.connect_timeout, 60000);
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2990
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2991 ngx_conf_merge_msec_value(conf->upstream.send_timeout,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2992 prev->upstream.send_timeout, 60000);
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2993
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2994 ngx_conf_merge_msec_value(conf->upstream.read_timeout,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2995 prev->upstream.read_timeout, 60000);
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2996
5832 d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5738 diff changeset	2997 ngx_conf_merge_msec_value(conf->upstream.next_upstream_timeout,
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5738 diff changeset	2998 prev->upstream.next_upstream_timeout, 0);
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5738 diff changeset	2999
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3000 ngx_conf_merge_size_value(conf->upstream.send_lowat,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3001 prev->upstream.send_lowat, 0);
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3002
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 579 diff changeset	3003 ngx_conf_merge_size_value(conf->upstream.buffer_size,
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 579 diff changeset	3004 prev->upstream.buffer_size,
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3005 (size_t) ngx_pagesize);
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3006
5883 973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5874 diff changeset	3007 ngx_conf_merge_size_value(conf->upstream.limit_rate,
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5874 diff changeset	3008 prev->upstream.limit_rate, 0);
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5874 diff changeset	3009
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3010 ngx_conf_merge_bufs_value(conf->upstream.bufs, prev->upstream.bufs,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3011 8, ngx_pagesize);
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3012
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3013 if (conf->upstream.bufs.num < 2) {
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3014 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3015 "there must be at least 2 \"proxy_buffers\"");
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3016 return NGX_CONF_ERROR;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3017 }
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3018
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3019
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 579 diff changeset	3020 size = conf->upstream.buffer_size;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3021 if (size < conf->upstream.bufs.size) {
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3022 size = conf->upstream.bufs.size;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3023 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3024
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3025
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3026 ngx_conf_merge_size_value(conf->upstream.busy_buffers_size_conf,
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3027 prev->upstream.busy_buffers_size_conf,
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3028 NGX_CONF_UNSET_SIZE);
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3029
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3030 if (conf->upstream.busy_buffers_size_conf == NGX_CONF_UNSET_SIZE) {
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3031 conf->upstream.busy_buffers_size = 2 * size;
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3032 } else {
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3033 conf->upstream.busy_buffers_size =
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3034 conf->upstream.busy_buffers_size_conf;
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3035 }
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3036
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3037 if (conf->upstream.busy_buffers_size < size) {
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3038 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
4593 834049edae24 Fixed grammar in error messages. Ruslan Ermilov <ru@nginx.com> parents: 4529 diff changeset	3039 "\"proxy_busy_buffers_size\" must be equal to or greater than "
834049edae24 Fixed grammar in error messages. Ruslan Ermilov <ru@nginx.com> parents: 4529 diff changeset	3040 "the maximum of the value of \"proxy_buffer_size\" and "
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3041 "one of the \"proxy_buffers\"");
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3042
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3043 return NGX_CONF_ERROR;
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3044 }
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3045
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3046 if (conf->upstream.busy_buffers_size
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3047 > (conf->upstream.bufs.num - 1) * conf->upstream.bufs.size)
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3048 {
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3049 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3050 "\"proxy_busy_buffers_size\" must be less than "
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3051 "the size of all \"proxy_buffers\" minus one buffer");
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3052
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3053 return NGX_CONF_ERROR;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3054 }
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3055
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3056
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3057 ngx_conf_merge_size_value(conf->upstream.temp_file_write_size_conf,
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3058 prev->upstream.temp_file_write_size_conf,
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3059 NGX_CONF_UNSET_SIZE);
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3060
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3061 if (conf->upstream.temp_file_write_size_conf == NGX_CONF_UNSET_SIZE) {
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3062 conf->upstream.temp_file_write_size = 2 * size;
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3063 } else {
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3064 conf->upstream.temp_file_write_size =
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3065 conf->upstream.temp_file_write_size_conf;
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3066 }
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3067
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3068 if (conf->upstream.temp_file_write_size < size) {
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3069 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
4593 834049edae24 Fixed grammar in error messages. Ruslan Ermilov <ru@nginx.com> parents: 4529 diff changeset	3070 "\"proxy_temp_file_write_size\" must be equal to or greater "
834049edae24 Fixed grammar in error messages. Ruslan Ermilov <ru@nginx.com> parents: 4529 diff changeset	3071 "than the maximum of the value of \"proxy_buffer_size\" and "
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3072 "one of the \"proxy_buffers\"");
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3073
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3074 return NGX_CONF_ERROR;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3075 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3076
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3077 ngx_conf_merge_size_value(conf->upstream.max_temp_file_size_conf,
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3078 prev->upstream.max_temp_file_size_conf,
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3079 NGX_CONF_UNSET_SIZE);
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3080
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3081 if (conf->upstream.max_temp_file_size_conf == NGX_CONF_UNSET_SIZE) {
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3082 conf->upstream.max_temp_file_size = 1024 * 1024 * 1024;
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3083 } else {
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3084 conf->upstream.max_temp_file_size =
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3085 conf->upstream.max_temp_file_size_conf;
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3086 }
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3087
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3088 if (conf->upstream.max_temp_file_size != 0
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3089 && conf->upstream.max_temp_file_size < size)
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3090 {
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3091 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
561 e48ebafc6939 nginx-0.3.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 555 diff changeset	3092 "\"proxy_max_temp_file_size\" must be equal to zero to disable "
4593 834049edae24 Fixed grammar in error messages. Ruslan Ermilov <ru@nginx.com> parents: 4529 diff changeset	3093 "temporary files usage or must be equal to or greater than "
834049edae24 Fixed grammar in error messages. Ruslan Ermilov <ru@nginx.com> parents: 4529 diff changeset	3094 "the maximum of the value of \"proxy_buffer_size\" and "
561 e48ebafc6939 nginx-0.3.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 555 diff changeset	3095 "one of the \"proxy_buffers\"");
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3096
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3097 return NGX_CONF_ERROR;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3098 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3099
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3100
2786 4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2784 diff changeset	3101 ngx_conf_merge_bitmask_value(conf->upstream.ignore_headers,
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2784 diff changeset	3102 prev->upstream.ignore_headers,
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2784 diff changeset	3103 NGX_CONF_BITMASK_SET);
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2784 diff changeset	3104
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2784 diff changeset	3105
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3106 ngx_conf_merge_bitmask_value(conf->upstream.next_upstream,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3107 prev->upstream.next_upstream,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3108 (NGX_CONF_BITMASK_SET
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3109 \|NGX_HTTP_UPSTREAM_FT_ERROR
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3110 \|NGX_HTTP_UPSTREAM_FT_TIMEOUT));
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3111
665 5fd7a5e99047 nginx-0.3.54-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	3112 if (conf->upstream.next_upstream & NGX_HTTP_UPSTREAM_FT_OFF) {
5fd7a5e99047 nginx-0.3.54-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	3113 conf->upstream.next_upstream = NGX_CONF_BITMASK_SET
5fd7a5e99047 nginx-0.3.54-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	3114 \|NGX_HTTP_UPSTREAM_FT_OFF;
5fd7a5e99047 nginx-0.3.54-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	3115 }
5fd7a5e99047 nginx-0.3.54-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	3116
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3117 if (ngx_conf_merge_path_value(cf, &conf->upstream.temp_path,
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3118 prev->upstream.temp_path,
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3119 &ngx_http_proxy_temp_path)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3120 != NGX_OK)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3121 {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3122 return NGX_CONF_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3123 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3124
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3125
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3126 #if (NGX_HTTP_CACHE)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3127
5949 634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	3128 if (conf->upstream.cache == NGX_CONF_UNSET) {
634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	3129 ngx_conf_merge_value(conf->upstream.cache,
634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	3130 prev->upstream.cache, 0);
634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	3131
634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	3132 conf->upstream.cache_zone = prev->upstream.cache_zone;
5951 610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	3133 conf->upstream.cache_value = prev->upstream.cache_value;
5949 634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	3134 }
634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	3135
634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	3136 if (conf->upstream.cache_zone && conf->upstream.cache_zone->data == NULL) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3137 ngx_shm_zone_t *shm_zone;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3138
5949 634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	3139 shm_zone = conf->upstream.cache_zone;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3140
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3141 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3142 "\"proxy_cache\" zone \"%V\" is unknown",
2716 d5896f6608e8 move zone name from ngx_shm_zone_t to ngx_shm_t to use Win32 shared memory Igor Sysoev <igor@sysoev.ru> parents: 2706 diff changeset	3143 &shm_zone->shm.name);
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3144
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3145 return NGX_CONF_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3146 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3147
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3148 ngx_conf_merge_uint_value(conf->upstream.cache_min_uses,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3149 prev->upstream.cache_min_uses, 1);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3150
6793 0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6785 diff changeset	3151 ngx_conf_merge_off_value(conf->upstream.cache_max_range_offset,
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6785 diff changeset	3152 prev->upstream.cache_max_range_offset,
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6785 diff changeset	3153 NGX_MAX_OFF_T_VALUE);
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6785 diff changeset	3154
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3155 ngx_conf_merge_bitmask_value(conf->upstream.cache_use_stale,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3156 prev->upstream.cache_use_stale,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3157 (NGX_CONF_BITMASK_SET
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3158 \|NGX_HTTP_UPSTREAM_FT_OFF));
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3159
4401 d45742815c90 Fixed proxy_cache_use_stale in "no live upstreams" case. Maxim Dounin <mdounin@mdounin.ru> parents: 4400 diff changeset	3160 if (conf->upstream.cache_use_stale & NGX_HTTP_UPSTREAM_FT_OFF) {
d45742815c90 Fixed proxy_cache_use_stale in "no live upstreams" case. Maxim Dounin <mdounin@mdounin.ru> parents: 4400 diff changeset	3161 conf->upstream.cache_use_stale = NGX_CONF_BITMASK_SET
d45742815c90 Fixed proxy_cache_use_stale in "no live upstreams" case. Maxim Dounin <mdounin@mdounin.ru> parents: 4400 diff changeset	3162 \|NGX_HTTP_UPSTREAM_FT_OFF;
d45742815c90 Fixed proxy_cache_use_stale in "no live upstreams" case. Maxim Dounin <mdounin@mdounin.ru> parents: 4400 diff changeset	3163 }
d45742815c90 Fixed proxy_cache_use_stale in "no live upstreams" case. Maxim Dounin <mdounin@mdounin.ru> parents: 4400 diff changeset	3164
d45742815c90 Fixed proxy_cache_use_stale in "no live upstreams" case. Maxim Dounin <mdounin@mdounin.ru> parents: 4400 diff changeset	3165 if (conf->upstream.cache_use_stale & NGX_HTTP_UPSTREAM_FT_ERROR) {
d45742815c90 Fixed proxy_cache_use_stale in "no live upstreams" case. Maxim Dounin <mdounin@mdounin.ru> parents: 4400 diff changeset	3166 conf->upstream.cache_use_stale \|= NGX_HTTP_UPSTREAM_FT_NOLIVE;
d45742815c90 Fixed proxy_cache_use_stale in "no live upstreams" case. Maxim Dounin <mdounin@mdounin.ru> parents: 4400 diff changeset	3167 }
d45742815c90 Fixed proxy_cache_use_stale in "no live upstreams" case. Maxim Dounin <mdounin@mdounin.ru> parents: 4400 diff changeset	3168
2875 6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2786 diff changeset	3169 if (conf->upstream.cache_methods == 0) {
6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2786 diff changeset	3170 conf->upstream.cache_methods = prev->upstream.cache_methods;
6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2786 diff changeset	3171 }
6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2786 diff changeset	3172
6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2786 diff changeset	3173 conf->upstream.cache_methods \|= NGX_HTTP_GET\|NGX_HTTP_HEAD;
6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2786 diff changeset	3174
3699 b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3692 diff changeset	3175 ngx_conf_merge_ptr_value(conf->upstream.cache_bypass,
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3692 diff changeset	3176 prev->upstream.cache_bypass, NULL);
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3692 diff changeset	3177
3526 62a4fd1e6e2c proxy_no_cache and fastcgi_no_cache Igor Sysoev <igor@sysoev.ru> parents: 3523 diff changeset	3178 ngx_conf_merge_ptr_value(conf->upstream.no_cache,
62a4fd1e6e2c proxy_no_cache and fastcgi_no_cache Igor Sysoev <igor@sysoev.ru> parents: 3523 diff changeset	3179 prev->upstream.no_cache, NULL);
62a4fd1e6e2c proxy_no_cache and fastcgi_no_cache Igor Sysoev <igor@sysoev.ru> parents: 3523 diff changeset	3180
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3181 ngx_conf_merge_ptr_value(conf->upstream.cache_valid,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3182 prev->upstream.cache_valid, NULL);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3183
2672 b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	3184 if (conf->cache_key.value.data == NULL) {
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	3185 conf->cache_key = prev->cache_key;
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	3186 }
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	3187
4385 70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4377 diff changeset	3188 ngx_conf_merge_value(conf->upstream.cache_lock,
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4377 diff changeset	3189 prev->upstream.cache_lock, 0);
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4377 diff changeset	3190
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4377 diff changeset	3191 ngx_conf_merge_msec_value(conf->upstream.cache_lock_timeout,
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4377 diff changeset	3192 prev->upstream.cache_lock_timeout, 5000);
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4377 diff changeset	3193
5905 2f7e557eab5b Cache: proxy_cache_lock_age and friends. Roman Arutyunyan <arut@nginx.com> parents: 5900 diff changeset	3194 ngx_conf_merge_msec_value(conf->upstream.cache_lock_age,
2f7e557eab5b Cache: proxy_cache_lock_age and friends. Roman Arutyunyan <arut@nginx.com> parents: 5900 diff changeset	3195 prev->upstream.cache_lock_age, 5000);
2f7e557eab5b Cache: proxy_cache_lock_age and friends. Roman Arutyunyan <arut@nginx.com> parents: 5900 diff changeset	3196
5441 43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5391 diff changeset	3197 ngx_conf_merge_value(conf->upstream.cache_revalidate,
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5391 diff changeset	3198 prev->upstream.cache_revalidate, 0);
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5391 diff changeset	3199
6290 4d5ac1a31d44 Upstream: proxy_cache_convert_head directive. Roman Arutyunyan <arut@nginx.com> parents: 6157 diff changeset	3200 ngx_conf_merge_value(conf->upstream.cache_convert_head,
4d5ac1a31d44 Upstream: proxy_cache_convert_head directive. Roman Arutyunyan <arut@nginx.com> parents: 6157 diff changeset	3201 prev->upstream.cache_convert_head, 1);
4d5ac1a31d44 Upstream: proxy_cache_convert_head directive. Roman Arutyunyan <arut@nginx.com> parents: 6157 diff changeset	3202
6906 1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6793 diff changeset	3203 ngx_conf_merge_value(conf->upstream.cache_background_update,
1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6793 diff changeset	3204 prev->upstream.cache_background_update, 0);
1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6793 diff changeset	3205
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3206 #endif
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3207
6781 ca27074f8f0f Proxy: support variables for proxy_method directive. Dmitry Lazurkin <dilaz03@gmail.com> parents: 6747 diff changeset	3208 if (conf->method == NULL) {
ca27074f8f0f Proxy: support variables for proxy_method directive. Dmitry Lazurkin <dilaz03@gmail.com> parents: 6747 diff changeset	3209 conf->method = prev->method;
ca27074f8f0f Proxy: support variables for proxy_method directive. Dmitry Lazurkin <dilaz03@gmail.com> parents: 6747 diff changeset	3210 }
5012 bbdb172f0927 Proxy: fixed proxy_method to always add space. Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3211
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3212 ngx_conf_merge_value(conf->upstream.pass_request_headers,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3213 prev->upstream.pass_request_headers, 1);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3214 ngx_conf_merge_value(conf->upstream.pass_request_body,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3215 prev->upstream.pass_request_body, 1);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3216
657 400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	3217 ngx_conf_merge_value(conf->upstream.intercept_errors,
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	3218 prev->upstream.intercept_errors, 0);
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3219
2184 274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2135 diff changeset	3220 #if (NGX_HTTP_SSL)
5660 7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	3221
2184 274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2135 diff changeset	3222 ngx_conf_merge_value(conf->upstream.ssl_session_reuse,
274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2135 diff changeset	3223 prev->upstream.ssl_session_reuse, 1);
5385 7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	3224
7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	3225 ngx_conf_merge_bitmask_value(conf->ssl_protocols, prev->ssl_protocols,
6157 b2899e7d0ef8 Disabled SSLv3 by default (ticket #653). Maxim Dounin <mdounin@mdounin.ru> parents: 6056 diff changeset	3226 (NGX_CONF_BITMASK_SET\|NGX_SSL_TLSv1
b2899e7d0ef8 Disabled SSLv3 by default (ticket #653). Maxim Dounin <mdounin@mdounin.ru> parents: 6056 diff changeset	3227 \|NGX_SSL_TLSv1_1\|NGX_SSL_TLSv1_2));
5385 7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	3228
5390 919d230ecdbe Proxy: added the "proxy_ssl_ciphers" directive. Piotr Sikora <piotr@cloudflare.com> parents: 5385 diff changeset	3229 ngx_conf_merge_str_value(conf->ssl_ciphers, prev->ssl_ciphers,
919d230ecdbe Proxy: added the "proxy_ssl_ciphers" directive. Piotr Sikora <piotr@cloudflare.com> parents: 5385 diff changeset	3230 "DEFAULT");
919d230ecdbe Proxy: added the "proxy_ssl_ciphers" directive. Piotr Sikora <piotr@cloudflare.com> parents: 5385 diff changeset	3231
5660 7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	3232 if (conf->upstream.ssl_name == NULL) {
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	3233 conf->upstream.ssl_name = prev->upstream.ssl_name;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	3234 }
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	3235
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	3236 ngx_conf_merge_value(conf->upstream.ssl_server_name,
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	3237 prev->upstream.ssl_server_name, 0);
5661 060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	3238 ngx_conf_merge_value(conf->upstream.ssl_verify,
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	3239 prev->upstream.ssl_verify, 0);
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	3240 ngx_conf_merge_uint_value(conf->ssl_verify_depth,
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	3241 prev->ssl_verify_depth, 1);
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	3242 ngx_conf_merge_str_value(conf->ssl_trusted_certificate,
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	3243 prev->ssl_trusted_certificate, "");
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	3244 ngx_conf_merge_str_value(conf->ssl_crl, prev->ssl_crl, "");
5660 7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	3245
5900 20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	3246 ngx_conf_merge_str_value(conf->ssl_certificate,
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	3247 prev->ssl_certificate, "");
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	3248 ngx_conf_merge_str_value(conf->ssl_certificate_key,
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	3249 prev->ssl_certificate_key, "");
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	3250 ngx_conf_merge_ptr_value(conf->ssl_passwords, prev->ssl_passwords, NULL);
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	3251
5385 7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	3252 if (conf->ssl && ngx_http_proxy_set_ssl(cf, conf) != NGX_OK) {
7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	3253 return NGX_CONF_ERROR;
7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	3254 }
5660 7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	3255
2184 274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2135 diff changeset	3256 #endif
274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2135 diff changeset	3257
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3258 ngx_conf_merge_value(conf->redirect, prev->redirect, 1);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3259
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3260 if (conf->redirect) {
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3261
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3262 if (conf->redirects == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3263 conf->redirects = prev->redirects;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3264 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3265
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3266 if (conf->redirects == NULL && conf->url.data) {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3267
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3268 conf->redirects = ngx_array_create(cf->pool, 1,
4461 103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	3269 sizeof(ngx_http_proxy_rewrite_t));
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3270 if (conf->redirects == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3271 return NGX_CONF_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3272 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3273
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3274 pr = ngx_array_push(conf->redirects);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3275 if (pr == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3276 return NGX_CONF_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3277 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3278
4461 103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	3279 ngx_memzero(&pr->pattern.complex,
4336 99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3280 sizeof(ngx_http_complex_value_t));
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3281
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3282 ngx_memzero(&pr->replacement, sizeof(ngx_http_complex_value_t));
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3283
4461 103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	3284 pr->handler = ngx_http_proxy_rewrite_complex_handler;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3285
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3286 if (conf->vars.uri.len) {
4461 103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	3287 pr->pattern.complex.value = conf->url;
4336 99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3288 pr->replacement.value = conf->location;
653 7cbef16c71a1 nginx-0.3.48-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 651 diff changeset	3289
7cbef16c71a1 nginx-0.3.48-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 651 diff changeset	3290 } else {
4461 103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	3291 pr->pattern.complex.value.len = conf->url.len
103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	3292 + sizeof("/") - 1;
103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	3293
103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	3294 p = ngx_pnalloc(cf->pool, pr->pattern.complex.value.len);
3862 f4c49c9e4bb5 always test proxy_redirect with slash, this fixes a case when nginx uses Igor Sysoev <igor@sysoev.ru> parents: 3734 diff changeset	3295 if (p == NULL) {
f4c49c9e4bb5 always test proxy_redirect with slash, this fixes a case when nginx uses Igor Sysoev <igor@sysoev.ru> parents: 3734 diff changeset	3296 return NGX_CONF_ERROR;
f4c49c9e4bb5 always test proxy_redirect with slash, this fixes a case when nginx uses Igor Sysoev <igor@sysoev.ru> parents: 3734 diff changeset	3297 }
f4c49c9e4bb5 always test proxy_redirect with slash, this fixes a case when nginx uses Igor Sysoev <igor@sysoev.ru> parents: 3734 diff changeset	3298
4461 103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	3299 pr->pattern.complex.value.data = p;
3862 f4c49c9e4bb5 always test proxy_redirect with slash, this fixes a case when nginx uses Igor Sysoev <igor@sysoev.ru> parents: 3734 diff changeset	3300
f4c49c9e4bb5 always test proxy_redirect with slash, this fixes a case when nginx uses Igor Sysoev <igor@sysoev.ru> parents: 3734 diff changeset	3301 p = ngx_cpymem(p, conf->url.data, conf->url.len);
f4c49c9e4bb5 always test proxy_redirect with slash, this fixes a case when nginx uses Igor Sysoev <igor@sysoev.ru> parents: 3734 diff changeset	3302 *p = '/';
f4c49c9e4bb5 always test proxy_redirect with slash, this fixes a case when nginx uses Igor Sysoev <igor@sysoev.ru> parents: 3734 diff changeset	3303
4336 99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3304 ngx_str_set(&pr->replacement.value, "/");
653 7cbef16c71a1 nginx-0.3.48-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 651 diff changeset	3305 }
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3306 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3307 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3308
4465 8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3309 ngx_conf_merge_ptr_value(conf->cookie_domains, prev->cookie_domains, NULL);
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3310
4466 b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3311 ngx_conf_merge_ptr_value(conf->cookie_paths, prev->cookie_paths, NULL);
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3312
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	3313 ngx_conf_merge_uint_value(conf->http_version, prev->http_version,
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	3314 NGX_HTTP_VERSION_10);
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	3315
1180 1666b7b0bafc proxy_headers_hash_max_size and proxy_headers_hash_bucket_size Igor Sysoev <igor@sysoev.ru> parents: 1125 diff changeset	3316 ngx_conf_merge_uint_value(conf->headers_hash_max_size,
1666b7b0bafc proxy_headers_hash_max_size and proxy_headers_hash_bucket_size Igor Sysoev <igor@sysoev.ru> parents: 1125 diff changeset	3317 prev->headers_hash_max_size, 512);
1666b7b0bafc proxy_headers_hash_max_size and proxy_headers_hash_bucket_size Igor Sysoev <igor@sysoev.ru> parents: 1125 diff changeset	3318
1666b7b0bafc proxy_headers_hash_max_size and proxy_headers_hash_bucket_size Igor Sysoev <igor@sysoev.ru> parents: 1125 diff changeset	3319 ngx_conf_merge_uint_value(conf->headers_hash_bucket_size,
1666b7b0bafc proxy_headers_hash_max_size and proxy_headers_hash_bucket_size Igor Sysoev <igor@sysoev.ru> parents: 1125 diff changeset	3320 prev->headers_hash_bucket_size, 64);
1666b7b0bafc proxy_headers_hash_max_size and proxy_headers_hash_bucket_size Igor Sysoev <igor@sysoev.ru> parents: 1125 diff changeset	3321
1666b7b0bafc proxy_headers_hash_max_size and proxy_headers_hash_bucket_size Igor Sysoev <igor@sysoev.ru> parents: 1125 diff changeset	3322 conf->headers_hash_bucket_size = ngx_align(conf->headers_hash_bucket_size,
1666b7b0bafc proxy_headers_hash_max_size and proxy_headers_hash_bucket_size Igor Sysoev <igor@sysoev.ru> parents: 1125 diff changeset	3323 ngx_cacheline_size);
1666b7b0bafc proxy_headers_hash_max_size and proxy_headers_hash_bucket_size Igor Sysoev <igor@sysoev.ru> parents: 1125 diff changeset	3324
1701 40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	3325 hash.max_size = conf->headers_hash_max_size;
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	3326 hash.bucket_size = conf->headers_hash_bucket_size;
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	3327 hash.name = "proxy_headers_hash";
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	3328
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	3329 if (ngx_http_upstream_hide_headers_hash(cf, &conf->upstream,
3670 2728c4e4a9ae do not use a cache headers set to hide Igor Sysoev <igor@sysoev.ru> parents: 3667 diff changeset	3330 &prev->upstream, ngx_http_proxy_hide_headers, &hash)
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	3331 != NGX_OK)
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	3332 {
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	3333 return NGX_CONF_ERROR;
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	3334 }
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	3335
5938 cd2abf7e7740 Upstream: fixed unexpected inheritance into limit_except blocks. Maxim Dounin <mdounin@mdounin.ru> parents: 5937 diff changeset	3336 clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module);
cd2abf7e7740 Upstream: fixed unexpected inheritance into limit_except blocks. Maxim Dounin <mdounin@mdounin.ru> parents: 5937 diff changeset	3337
cd2abf7e7740 Upstream: fixed unexpected inheritance into limit_except blocks. Maxim Dounin <mdounin@mdounin.ru> parents: 5937 diff changeset	3338 if (clcf->noname
cd2abf7e7740 Upstream: fixed unexpected inheritance into limit_except blocks. Maxim Dounin <mdounin@mdounin.ru> parents: 5937 diff changeset	3339 && conf->upstream.upstream == NULL && conf->proxy_lengths == NULL)
cd2abf7e7740 Upstream: fixed unexpected inheritance into limit_except blocks. Maxim Dounin <mdounin@mdounin.ru> parents: 5937 diff changeset	3340 {
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 843 diff changeset	3341 conf->upstream.upstream = prev->upstream.upstream;
5939 aeea0522332f Proxy: fixed incorrect URI change due to if (ticket #86). Maxim Dounin <mdounin@mdounin.ru> parents: 5938 diff changeset	3342 conf->location = prev->location;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3343 conf->vars = prev->vars;
5937 5b9f711dc819 Upstream: inheritance of proxy_pass and friends (ticket #645). Maxim Dounin <mdounin@mdounin.ru> parents: 5936 diff changeset	3344
3734 e3a6785b5be4 ) make code consistent to fastcgi, etc Igor Sysoev <igor@sysoev.ru>* parents: 3733 diff changeset	3345 conf->proxy_lengths = prev->proxy_lengths;
e3a6785b5be4 ) make code consistent to fastcgi, etc Igor Sysoev <igor@sysoev.ru>* parents: 3733 diff changeset	3346 conf->proxy_values = prev->proxy_values;
5937 5b9f711dc819 Upstream: inheritance of proxy_pass and friends (ticket #645). Maxim Dounin <mdounin@mdounin.ru> parents: 5936 diff changeset	3347
5b9f711dc819 Upstream: inheritance of proxy_pass and friends (ticket #645). Maxim Dounin <mdounin@mdounin.ru> parents: 5936 diff changeset	3348 #if (NGX_HTTP_SSL)
5b9f711dc819 Upstream: inheritance of proxy_pass and friends (ticket #645). Maxim Dounin <mdounin@mdounin.ru> parents: 5936 diff changeset	3349 conf->upstream.ssl = prev->upstream.ssl;
5b9f711dc819 Upstream: inheritance of proxy_pass and friends (ticket #645). Maxim Dounin <mdounin@mdounin.ru> parents: 5936 diff changeset	3350 #endif
3734 e3a6785b5be4 ) make code consistent to fastcgi, etc Igor Sysoev <igor@sysoev.ru>* parents: 3733 diff changeset	3351 }
e3a6785b5be4 ) make code consistent to fastcgi, etc Igor Sysoev <igor@sysoev.ru>* parents: 3733 diff changeset	3352
5938 cd2abf7e7740 Upstream: fixed unexpected inheritance into limit_except blocks. Maxim Dounin <mdounin@mdounin.ru> parents: 5937 diff changeset	3353 if (clcf->lmt_excpt && clcf->handler == NULL
cd2abf7e7740 Upstream: fixed unexpected inheritance into limit_except blocks. Maxim Dounin <mdounin@mdounin.ru> parents: 5937 diff changeset	3354 && (conf->upstream.upstream \|\| conf->proxy_lengths))
cd2abf7e7740 Upstream: fixed unexpected inheritance into limit_except blocks. Maxim Dounin <mdounin@mdounin.ru> parents: 5937 diff changeset	3355 {
cd2abf7e7740 Upstream: fixed unexpected inheritance into limit_except blocks. Maxim Dounin <mdounin@mdounin.ru> parents: 5937 diff changeset	3356 clcf->handler = ngx_http_proxy_handler;
3731 72cc5b789021 inherit proxy_pass, fastcgi_pass, uwsgi_pass, scgi_pass inside Igor Sysoev <igor@sysoev.ru> parents: 3729 diff changeset	3357 }
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3358
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3359 if (conf->body_source.data == NULL) {
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	3360 conf->body_flushes = prev->body_flushes;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3361 conf->body_source = prev->body_source;
5910 29fa5023bd6f Proxy: renamed and rearranged fields in proxy configuration. Roman Arutyunyan <arut@nginx.com> parents: 5909 diff changeset	3362 conf->body_lengths = prev->body_lengths;
29fa5023bd6f Proxy: renamed and rearranged fields in proxy configuration. Roman Arutyunyan <arut@nginx.com> parents: 5909 diff changeset	3363 conf->body_values = prev->body_values;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3364 }
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3365
5910 29fa5023bd6f Proxy: renamed and rearranged fields in proxy configuration. Roman Arutyunyan <arut@nginx.com> parents: 5909 diff changeset	3366 if (conf->body_source.data && conf->body_lengths == NULL) {
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3367
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3368 ngx_memzero(&sc, sizeof(ngx_http_script_compile_t));
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3369
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3370 sc.cf = cf;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3371 sc.source = &conf->body_source;
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	3372 sc.flushes = &conf->body_flushes;
5910 29fa5023bd6f Proxy: renamed and rearranged fields in proxy configuration. Roman Arutyunyan <arut@nginx.com> parents: 5909 diff changeset	3373 sc.lengths = &conf->body_lengths;
29fa5023bd6f Proxy: renamed and rearranged fields in proxy configuration. Roman Arutyunyan <arut@nginx.com> parents: 5909 diff changeset	3374 sc.values = &conf->body_values;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3375 sc.complete_lengths = 1;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3376 sc.complete_values = 1;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3377
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3378 if (ngx_http_script_compile(&sc) != NGX_OK) {
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3379 return NGX_CONF_ERROR;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3380 }
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3381 }
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3382
5907 195561ef367f Upstream: moved header initializations to separate functions. Roman Arutyunyan <arut@nginx.com> parents: 5905 diff changeset	3383 if (conf->headers_source == NULL) {
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	3384 conf->headers = prev->headers;
5909 8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	3385 #if (NGX_HTTP_CACHE)
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	3386 conf->headers_cache = prev->headers_cache;
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	3387 #endif
5907 195561ef367f Upstream: moved header initializations to separate functions. Roman Arutyunyan <arut@nginx.com> parents: 5905 diff changeset	3388 conf->headers_source = prev->headers_source;
195561ef367f Upstream: moved header initializations to separate functions. Roman Arutyunyan <arut@nginx.com> parents: 5905 diff changeset	3389 }
195561ef367f Upstream: moved header initializations to separate functions. Roman Arutyunyan <arut@nginx.com> parents: 5905 diff changeset	3390
5909 8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	3391 rc = ngx_http_proxy_init_headers(cf, conf, &conf->headers,
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	3392 ngx_http_proxy_headers);
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	3393 if (rc != NGX_OK) {
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	3394 return NGX_CONF_ERROR;
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	3395 }
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	3396
5907 195561ef367f Upstream: moved header initializations to separate functions. Roman Arutyunyan <arut@nginx.com> parents: 5905 diff changeset	3397 #if (NGX_HTTP_CACHE)
5909 8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	3398
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	3399 if (conf->upstream.cache) {
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	3400 rc = ngx_http_proxy_init_headers(cf, conf, &conf->headers_cache,
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	3401 ngx_http_proxy_cache_headers);
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	3402 if (rc != NGX_OK) {
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	3403 return NGX_CONF_ERROR;
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	3404 }
5907 195561ef367f Upstream: moved header initializations to separate functions. Roman Arutyunyan <arut@nginx.com> parents: 5905 diff changeset	3405 }
5909 8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	3406
5907 195561ef367f Upstream: moved header initializations to separate functions. Roman Arutyunyan <arut@nginx.com> parents: 5905 diff changeset	3407 #endif
195561ef367f Upstream: moved header initializations to separate functions. Roman Arutyunyan <arut@nginx.com> parents: 5905 diff changeset	3408
6747 20eb4587225b Upstream: handling of proxy_set_header at http level. Maxim Dounin <mdounin@mdounin.ru> parents: 6746 diff changeset	3409 /*
20eb4587225b Upstream: handling of proxy_set_header at http level. Maxim Dounin <mdounin@mdounin.ru> parents: 6746 diff changeset	3410 * special handling to preserve conf->headers in the "http" section
20eb4587225b Upstream: handling of proxy_set_header at http level. Maxim Dounin <mdounin@mdounin.ru> parents: 6746 diff changeset	3411 * to inherit it to all servers
20eb4587225b Upstream: handling of proxy_set_header at http level. Maxim Dounin <mdounin@mdounin.ru> parents: 6746 diff changeset	3412 */
20eb4587225b Upstream: handling of proxy_set_header at http level. Maxim Dounin <mdounin@mdounin.ru> parents: 6746 diff changeset	3413
20eb4587225b Upstream: handling of proxy_set_header at http level. Maxim Dounin <mdounin@mdounin.ru> parents: 6746 diff changeset	3414 if (prev->headers.hash.buckets == NULL
20eb4587225b Upstream: handling of proxy_set_header at http level. Maxim Dounin <mdounin@mdounin.ru> parents: 6746 diff changeset	3415 && conf->headers_source == prev->headers_source)
20eb4587225b Upstream: handling of proxy_set_header at http level. Maxim Dounin <mdounin@mdounin.ru> parents: 6746 diff changeset	3416 {
20eb4587225b Upstream: handling of proxy_set_header at http level. Maxim Dounin <mdounin@mdounin.ru> parents: 6746 diff changeset	3417 prev->headers = conf->headers;
20eb4587225b Upstream: handling of proxy_set_header at http level. Maxim Dounin <mdounin@mdounin.ru> parents: 6746 diff changeset	3418 #if (NGX_HTTP_CACHE)
20eb4587225b Upstream: handling of proxy_set_header at http level. Maxim Dounin <mdounin@mdounin.ru> parents: 6746 diff changeset	3419 prev->headers_cache = conf->headers_cache;
20eb4587225b Upstream: handling of proxy_set_header at http level. Maxim Dounin <mdounin@mdounin.ru> parents: 6746 diff changeset	3420 #endif
20eb4587225b Upstream: handling of proxy_set_header at http level. Maxim Dounin <mdounin@mdounin.ru> parents: 6746 diff changeset	3421 }
20eb4587225b Upstream: handling of proxy_set_header at http level. Maxim Dounin <mdounin@mdounin.ru> parents: 6746 diff changeset	3422
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3423 return NGX_CONF_OK;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3424 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3425
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3426
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3427 static ngx_int_t
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	3428 ngx_http_proxy_init_headers(ngx_conf_t cf, ngx_http_proxy_loc_conf_t conf,
5909 8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	3429 ngx_http_proxy_headers_t headers, ngx_keyval_t default_headers)
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3430 {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3431 u_char *p;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3432 size_t size;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3433 uintptr_t *code;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3434 ngx_uint_t i;
4274 595560d9dcbf Fixed proxy_set_header inheritance with proxy_cache (ticket #45). Maxim Dounin <mdounin@mdounin.ru> parents: 4205 diff changeset	3435 ngx_array_t headers_names, headers_merged;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3436 ngx_keyval_t src, s, *h;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3437 ngx_hash_key_t *hk;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3438 ngx_hash_init_t hash;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3439 ngx_http_script_compile_t sc;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3440 ngx_http_script_copy_code_t *copy;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3441
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	3442 if (headers->hash.buckets) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3443 return NGX_OK;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3444 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3445
3561 20708cffd6dc use local headers_names array instead of stored in configuration Igor Sysoev <igor@sysoev.ru> parents: 3526 diff changeset	3446 if (ngx_array_init(&headers_names, cf->temp_pool, 4, sizeof(ngx_hash_key_t))
20708cffd6dc use local headers_names array instead of stored in configuration Igor Sysoev <igor@sysoev.ru> parents: 3526 diff changeset	3447 != NGX_OK)
20708cffd6dc use local headers_names array instead of stored in configuration Igor Sysoev <igor@sysoev.ru> parents: 3526 diff changeset	3448 {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3449 return NGX_ERROR;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3450 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3451
4274 595560d9dcbf Fixed proxy_set_header inheritance with proxy_cache (ticket #45). Maxim Dounin <mdounin@mdounin.ru> parents: 4205 diff changeset	3452 if (ngx_array_init(&headers_merged, cf->temp_pool, 4, sizeof(ngx_keyval_t))
595560d9dcbf Fixed proxy_set_header inheritance with proxy_cache (ticket #45). Maxim Dounin <mdounin@mdounin.ru> parents: 4205 diff changeset	3453 != NGX_OK)
595560d9dcbf Fixed proxy_set_header inheritance with proxy_cache (ticket #45). Maxim Dounin <mdounin@mdounin.ru> parents: 4205 diff changeset	3454 {
595560d9dcbf Fixed proxy_set_header inheritance with proxy_cache (ticket #45). Maxim Dounin <mdounin@mdounin.ru> parents: 4205 diff changeset	3455 return NGX_ERROR;
595560d9dcbf Fixed proxy_set_header inheritance with proxy_cache (ticket #45). Maxim Dounin <mdounin@mdounin.ru> parents: 4205 diff changeset	3456 }
595560d9dcbf Fixed proxy_set_header inheritance with proxy_cache (ticket #45). Maxim Dounin <mdounin@mdounin.ru> parents: 4205 diff changeset	3457
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	3458 headers->lengths = ngx_array_create(cf->pool, 64, 1);
f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	3459 if (headers->lengths == NULL) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3460 return NGX_ERROR;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3461 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3462
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	3463 headers->values = ngx_array_create(cf->pool, 512, 1);
f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	3464 if (headers->values == NULL) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3465 return NGX_ERROR;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3466 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3467
6746 63991ab67b3a Proxy: do not create conf->headers_source when not needed. Maxim Dounin <mdounin@mdounin.ru> parents: 6591 diff changeset	3468 if (conf->headers_source) {
63991ab67b3a Proxy: do not create conf->headers_source when not needed. Maxim Dounin <mdounin@mdounin.ru> parents: 6591 diff changeset	3469
63991ab67b3a Proxy: do not create conf->headers_source when not needed. Maxim Dounin <mdounin@mdounin.ru> parents: 6591 diff changeset	3470 src = conf->headers_source->elts;
63991ab67b3a Proxy: do not create conf->headers_source when not needed. Maxim Dounin <mdounin@mdounin.ru> parents: 6591 diff changeset	3471 for (i = 0; i < conf->headers_source->nelts; i++) {
63991ab67b3a Proxy: do not create conf->headers_source when not needed. Maxim Dounin <mdounin@mdounin.ru> parents: 6591 diff changeset	3472
63991ab67b3a Proxy: do not create conf->headers_source when not needed. Maxim Dounin <mdounin@mdounin.ru> parents: 6591 diff changeset	3473 s = ngx_array_push(&headers_merged);
63991ab67b3a Proxy: do not create conf->headers_source when not needed. Maxim Dounin <mdounin@mdounin.ru> parents: 6591 diff changeset	3474 if (s == NULL) {
63991ab67b3a Proxy: do not create conf->headers_source when not needed. Maxim Dounin <mdounin@mdounin.ru> parents: 6591 diff changeset	3475 return NGX_ERROR;
63991ab67b3a Proxy: do not create conf->headers_source when not needed. Maxim Dounin <mdounin@mdounin.ru> parents: 6591 diff changeset	3476 }
63991ab67b3a Proxy: do not create conf->headers_source when not needed. Maxim Dounin <mdounin@mdounin.ru> parents: 6591 diff changeset	3477
63991ab67b3a Proxy: do not create conf->headers_source when not needed. Maxim Dounin <mdounin@mdounin.ru> parents: 6591 diff changeset	3478 *s = src[i];
4274 595560d9dcbf Fixed proxy_set_header inheritance with proxy_cache (ticket #45). Maxim Dounin <mdounin@mdounin.ru> parents: 4205 diff changeset	3479 }
595560d9dcbf Fixed proxy_set_header inheritance with proxy_cache (ticket #45). Maxim Dounin <mdounin@mdounin.ru> parents: 4205 diff changeset	3480 }
595560d9dcbf Fixed proxy_set_header inheritance with proxy_cache (ticket #45). Maxim Dounin <mdounin@mdounin.ru> parents: 4205 diff changeset	3481
5909 8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	3482 h = default_headers;
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	3483
2705 d040c3786239 do not pass if-... headers for cacheable responses Igor Sysoev <igor@sysoev.ru> parents: 2672 diff changeset	3484 while (h->key.len) {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3485
4274 595560d9dcbf Fixed proxy_set_header inheritance with proxy_cache (ticket #45). Maxim Dounin <mdounin@mdounin.ru> parents: 4205 diff changeset	3486 src = headers_merged.elts;
595560d9dcbf Fixed proxy_set_header inheritance with proxy_cache (ticket #45). Maxim Dounin <mdounin@mdounin.ru> parents: 4205 diff changeset	3487 for (i = 0; i < headers_merged.nelts; i++) {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3488 if (ngx_strcasecmp(h->key.data, src[i].key.data) == 0) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3489 goto next;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3490 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3491 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3492
4274 595560d9dcbf Fixed proxy_set_header inheritance with proxy_cache (ticket #45). Maxim Dounin <mdounin@mdounin.ru> parents: 4205 diff changeset	3493 s = ngx_array_push(&headers_merged);
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3494 if (s == NULL) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3495 return NGX_ERROR;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3496 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3497
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3498 s = h;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3499
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3500 next:
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3501
2705 d040c3786239 do not pass if-... headers for cacheable responses Igor Sysoev <igor@sysoev.ru> parents: 2672 diff changeset	3502 h++;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3503 }
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3504
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3505
4274 595560d9dcbf Fixed proxy_set_header inheritance with proxy_cache (ticket #45). Maxim Dounin <mdounin@mdounin.ru> parents: 4205 diff changeset	3506 src = headers_merged.elts;
595560d9dcbf Fixed proxy_set_header inheritance with proxy_cache (ticket #45). Maxim Dounin <mdounin@mdounin.ru> parents: 4205 diff changeset	3507 for (i = 0; i < headers_merged.nelts; i++) {
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3508
3561 20708cffd6dc use local headers_names array instead of stored in configuration Igor Sysoev <igor@sysoev.ru> parents: 3526 diff changeset	3509 hk = ngx_array_push(&headers_names);
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	3510 if (hk == NULL) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3511 return NGX_ERROR;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3512 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3513
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	3514 hk->key = src[i].key;
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	3515 hk->key_hash = ngx_hash_key_lc(src[i].key.data, src[i].key.len);
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	3516 hk->value = (void *) 1;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3517
519 12234c998d83 nginx-0.1.34-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 517 diff changeset	3518 if (src[i].value.len == 0) {
12234c998d83 nginx-0.1.34-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 517 diff changeset	3519 continue;
12234c998d83 nginx-0.1.34-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 517 diff changeset	3520 }
12234c998d83 nginx-0.1.34-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 517 diff changeset	3521
7047 3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	3522 copy = ngx_array_push_n(headers->lengths,
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	3523 sizeof(ngx_http_script_copy_code_t));
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	3524 if (copy == NULL) {
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	3525 return NGX_ERROR;
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	3526 }
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	3527
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	3528 copy->code = (ngx_http_script_code_pt) ngx_http_script_copy_len_code;
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	3529 copy->len = src[i].key.len;
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	3530
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	3531 size = (sizeof(ngx_http_script_copy_code_t)
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	3532 + src[i].key.len + sizeof(uintptr_t) - 1)
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	3533 & ~(sizeof(uintptr_t) - 1);
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	3534
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	3535 copy = ngx_array_push_n(headers->values, size);
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	3536 if (copy == NULL) {
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	3537 return NGX_ERROR;
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	3538 }
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	3539
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	3540 copy->code = ngx_http_script_copy_code;
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	3541 copy->len = src[i].key.len;
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	3542
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	3543 p = (u_char *) copy + sizeof(ngx_http_script_copy_code_t);
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	3544 ngx_memcpy(p, src[i].key.data, src[i].key.len);
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	3545
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	3546 ngx_memzero(&sc, sizeof(ngx_http_script_compile_t));
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	3547
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	3548 sc.cf = cf;
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	3549 sc.source = &src[i].value;
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	3550 sc.flushes = &headers->flushes;
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	3551 sc.lengths = &headers->lengths;
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	3552 sc.values = &headers->values;
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	3553
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	3554 if (ngx_http_script_compile(&sc) != NGX_OK) {
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	3555 return NGX_ERROR;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3556 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3557
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	3558 code = ngx_array_push_n(headers->lengths, sizeof(uintptr_t));
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3559 if (code == NULL) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3560 return NGX_ERROR;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3561 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3562
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3563 *code = (uintptr_t) NULL;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3564
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	3565 code = ngx_array_push_n(headers->values, sizeof(uintptr_t));
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3566 if (code == NULL) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3567 return NGX_ERROR;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3568 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3569
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3570 *code = (uintptr_t) NULL;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3571 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3572
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	3573 code = ngx_array_push_n(headers->lengths, sizeof(uintptr_t));
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3574 if (code == NULL) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3575 return NGX_ERROR;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3576 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3577
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3578 *code = (uintptr_t) NULL;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3579
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3580
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	3581 hash.hash = &headers->hash;
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	3582 hash.key = ngx_hash_key_lc;
1180 1666b7b0bafc proxy_headers_hash_max_size and proxy_headers_hash_bucket_size Igor Sysoev <igor@sysoev.ru> parents: 1125 diff changeset	3583 hash.max_size = conf->headers_hash_max_size;
1666b7b0bafc proxy_headers_hash_max_size and proxy_headers_hash_bucket_size Igor Sysoev <igor@sysoev.ru> parents: 1125 diff changeset	3584 hash.bucket_size = conf->headers_hash_bucket_size;
1666b7b0bafc proxy_headers_hash_max_size and proxy_headers_hash_bucket_size Igor Sysoev <igor@sysoev.ru> parents: 1125 diff changeset	3585 hash.name = "proxy_headers_hash";
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	3586 hash.pool = cf->pool;
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	3587 hash.temp_pool = NULL;
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	3588
3561 20708cffd6dc use local headers_names array instead of stored in configuration Igor Sysoev <igor@sysoev.ru> parents: 3526 diff changeset	3589 return ngx_hash_init(&hash, headers_names.elts, headers_names.nelts);
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3590 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3591
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3592
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3593 static char *
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3594 ngx_http_proxy_pass(ngx_conf_t cf, ngx_command_t cmd, void *conf)
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3595 {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3596 ngx_http_proxy_loc_conf_t *plcf = conf;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3597
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3598 size_t add;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3599 u_short port;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3600 ngx_str_t value, url;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3601 ngx_url_t u;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3602 ngx_uint_t n;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3603 ngx_http_core_loc_conf_t *clcf;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3604 ngx_http_script_compile_t sc;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3605
2391 d88e757cc7d8 delete surplus upstream.schema field Igor Sysoev <igor@sysoev.ru> parents: 2285 diff changeset	3606 if (plcf->upstream.upstream \|\| plcf->proxy_lengths) {
555 7bd37aef1e7e nginx-0.2.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 551 diff changeset	3607 return "is duplicate";
7bd37aef1e7e nginx-0.2.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 551 diff changeset	3608 }
7bd37aef1e7e nginx-0.2.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 551 diff changeset	3609
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3610 clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module);
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3611
2989 dff9764eaca2 do auto redirect for proxy_pass/fastcgi_pass with variables Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	3612 clcf->handler = ngx_http_proxy_handler;
dff9764eaca2 do auto redirect for proxy_pass/fastcgi_pass with variables Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	3613
dff9764eaca2 do auto redirect for proxy_pass/fastcgi_pass with variables Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	3614 if (clcf->name.data[clcf->name.len - 1] == '/') {
dff9764eaca2 do auto redirect for proxy_pass/fastcgi_pass with variables Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	3615 clcf->auto_redirect = 1;
dff9764eaca2 do auto redirect for proxy_pass/fastcgi_pass with variables Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	3616 }
dff9764eaca2 do auto redirect for proxy_pass/fastcgi_pass with variables Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	3617
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3618 value = cf->args->elts;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3619
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3620 url = &value[1];
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3621
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3622 n = ngx_http_script_variables_count(url);
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3623
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3624 if (n) {
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3625
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3626 ngx_memzero(&sc, sizeof(ngx_http_script_compile_t));
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3627
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3628 sc.cf = cf;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3629 sc.source = url;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3630 sc.lengths = &plcf->proxy_lengths;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3631 sc.values = &plcf->proxy_values;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3632 sc.variables = n;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3633 sc.complete_lengths = 1;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3634 sc.complete_values = 1;
1679 ca317d9b5c09 style fix: remove trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 1671 diff changeset	3635
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3636 if (ngx_http_script_compile(&sc) != NGX_OK) {
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3637 return NGX_CONF_ERROR;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3638 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3639
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3640 #if (NGX_HTTP_SSL)
5385 7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	3641 plcf->ssl = 1;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3642 #endif
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3643
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3644 return NGX_CONF_OK;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3645 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3646
1107 db7c468c447d ngx_strcasecmp()/ngx_strncasecmp() Igor Sysoev <igor@sysoev.ru> parents: 969 diff changeset	3647 if (ngx_strncasecmp(url->data, (u_char *) "http://", 7) == 0) {
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3648 add = 7;
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	3649 port = 80;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3650
1107 db7c468c447d ngx_strcasecmp()/ngx_strncasecmp() Igor Sysoev <igor@sysoev.ru> parents: 969 diff changeset	3651 } else if (ngx_strncasecmp(url->data, (u_char *) "https://", 8) == 0) {
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3652
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3653 #if (NGX_HTTP_SSL)
5385 7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	3654 plcf->ssl = 1;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3655
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3656 add = 8;
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	3657 port = 443;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3658 #else
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3659 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3660 "https protocol requires SSL support");
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3661 return NGX_CONF_ERROR;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3662 #endif
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3663
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3664 } else {
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3665 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "invalid URL prefix");
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3666 return NGX_CONF_ERROR;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3667 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3668
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	3669 ngx_memzero(&u, sizeof(ngx_url_t));
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	3670
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	3671 u.url.len = url->len - add;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	3672 u.url.data = url->data + add;
906 a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 896 diff changeset	3673 u.default_port = port;
a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 896 diff changeset	3674 u.uri_part = 1;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 843 diff changeset	3675 u.no_resolve = 1;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 843 diff changeset	3676
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 843 diff changeset	3677 plcf->upstream.upstream = ngx_http_upstream_add(cf, &u, 0);
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 843 diff changeset	3678 if (plcf->upstream.upstream == NULL) {
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3679 return NGX_CONF_ERROR;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3680 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3681
2391 d88e757cc7d8 delete surplus upstream.schema field Igor Sysoev <igor@sysoev.ru> parents: 2285 diff changeset	3682 plcf->vars.schema.len = add;
d88e757cc7d8 delete surplus upstream.schema field Igor Sysoev <igor@sysoev.ru> parents: 2285 diff changeset	3683 plcf->vars.schema.data = url->data;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3684 plcf->vars.key_start = plcf->vars.schema;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3685
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3686 ngx_http_proxy_set_vars(&u, &plcf->vars);
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3687
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3688 plcf->location = clcf->name;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3689
1353 7443fbe0b013 named location Igor Sysoev <igor@sysoev.ru> parents: 1339 diff changeset	3690 if (clcf->named
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3691 #if (NGX_PCRE)
1353 7443fbe0b013 named location Igor Sysoev <igor@sysoev.ru> parents: 1339 diff changeset	3692 \|\| clcf->regex
7443fbe0b013 named location Igor Sysoev <igor@sysoev.ru> parents: 1339 diff changeset	3693 #endif
7443fbe0b013 named location Igor Sysoev <igor@sysoev.ru> parents: 1339 diff changeset	3694 \|\| clcf->noname)
7443fbe0b013 named location Igor Sysoev <igor@sysoev.ru> parents: 1339 diff changeset	3695 {
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3696 if (plcf->vars.uri.len) {
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	3697 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
4593 834049edae24 Fixed grammar in error messages. Ruslan Ermilov <ru@nginx.com> parents: 4529 diff changeset	3698 "\"proxy_pass\" cannot have URI part in "
843 ebab9490204c allow proxy_pass inside limit_except Igor Sysoev <igor@sysoev.ru> parents: 812 diff changeset	3699 "location given by regular expression, "
1353 7443fbe0b013 named location Igor Sysoev <igor@sysoev.ru> parents: 1339 diff changeset	3700 "or inside named location, "
4593 834049edae24 Fixed grammar in error messages. Ruslan Ermilov <ru@nginx.com> parents: 4529 diff changeset	3701 "or inside \"if\" statement, "
834049edae24 Fixed grammar in error messages. Ruslan Ermilov <ru@nginx.com> parents: 4529 diff changeset	3702 "or inside \"limit_except\" block");
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	3703 return NGX_CONF_ERROR;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	3704 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	3705
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3706 plcf->location.len = 0;
555 7bd37aef1e7e nginx-0.2.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 551 diff changeset	3707 }
7bd37aef1e7e nginx-0.2.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 551 diff changeset	3708
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3709 plcf->url = *url;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3710
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3711 return NGX_CONF_OK;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3712 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3713
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3714
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3715 static char *
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3716 ngx_http_proxy_redirect(ngx_conf_t cf, ngx_command_t cmd, void *conf)
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3717 {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3718 ngx_http_proxy_loc_conf_t *plcf = conf;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3719
4336 99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3720 u_char *p;
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3721 ngx_str_t *value;
4461 103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	3722 ngx_http_proxy_rewrite_t *pr;
4336 99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3723 ngx_http_compile_complex_value_t ccv;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3724
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3725 if (plcf->redirect == 0) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3726 return NGX_CONF_OK;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3727 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3728
4422 b1a9d725ab69 Fixed proxy_redirect off inheritance. Valentin Bartenev <vbart@nginx.com> parents: 4412 diff changeset	3729 plcf->redirect = 1;
b1a9d725ab69 Fixed proxy_redirect off inheritance. Valentin Bartenev <vbart@nginx.com> parents: 4412 diff changeset	3730
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3731 value = cf->args->elts;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3732
2784 c2230102df6f ) check a proxy_redirect single parameter Igor Sysoev <igor@sysoev.ru>* parents: 2753 diff changeset	3733 if (cf->args->nelts == 2) {
c2230102df6f ) check a proxy_redirect single parameter Igor Sysoev <igor@sysoev.ru>* parents: 2753 diff changeset	3734 if (ngx_strcmp(value[1].data, "off") == 0) {
c2230102df6f ) check a proxy_redirect single parameter Igor Sysoev <igor@sysoev.ru>* parents: 2753 diff changeset	3735 plcf->redirect = 0;
c2230102df6f ) check a proxy_redirect single parameter Igor Sysoev <igor@sysoev.ru>* parents: 2753 diff changeset	3736 plcf->redirects = NULL;
c2230102df6f ) check a proxy_redirect single parameter Igor Sysoev <igor@sysoev.ru>* parents: 2753 diff changeset	3737 return NGX_CONF_OK;
c2230102df6f ) check a proxy_redirect single parameter Igor Sysoev <igor@sysoev.ru>* parents: 2753 diff changeset	3738 }
c2230102df6f ) check a proxy_redirect single parameter Igor Sysoev <igor@sysoev.ru>* parents: 2753 diff changeset	3739
c2230102df6f ) check a proxy_redirect single parameter Igor Sysoev <igor@sysoev.ru>* parents: 2753 diff changeset	3740 if (ngx_strcmp(value[1].data, "false") == 0) {
c2230102df6f ) check a proxy_redirect single parameter Igor Sysoev <igor@sysoev.ru>* parents: 2753 diff changeset	3741 ngx_conf_log_error(NGX_LOG_ERR, cf, 0,
c2230102df6f ) check a proxy_redirect single parameter Igor Sysoev <igor@sysoev.ru>* parents: 2753 diff changeset	3742 "invalid parameter \"false\", use \"off\" instead");
c2230102df6f ) check a proxy_redirect single parameter Igor Sysoev <igor@sysoev.ru>* parents: 2753 diff changeset	3743 plcf->redirect = 0;
c2230102df6f ) check a proxy_redirect single parameter Igor Sysoev <igor@sysoev.ru>* parents: 2753 diff changeset	3744 plcf->redirects = NULL;
c2230102df6f ) check a proxy_redirect single parameter Igor Sysoev <igor@sysoev.ru>* parents: 2753 diff changeset	3745 return NGX_CONF_OK;
c2230102df6f ) check a proxy_redirect single parameter Igor Sysoev <igor@sysoev.ru>* parents: 2753 diff changeset	3746 }
c2230102df6f ) check a proxy_redirect single parameter Igor Sysoev <igor@sysoev.ru>* parents: 2753 diff changeset	3747
c2230102df6f ) check a proxy_redirect single parameter Igor Sysoev <igor@sysoev.ru>* parents: 2753 diff changeset	3748 if (ngx_strcmp(value[1].data, "default") != 0) {
c2230102df6f ) check a proxy_redirect single parameter Igor Sysoev <igor@sysoev.ru>* parents: 2753 diff changeset	3749 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
c2230102df6f ) check a proxy_redirect single parameter Igor Sysoev <igor@sysoev.ru>* parents: 2753 diff changeset	3750 "invalid parameter \"%V\"", &value[1]);
c2230102df6f ) check a proxy_redirect single parameter Igor Sysoev <igor@sysoev.ru>* parents: 2753 diff changeset	3751 return NGX_CONF_ERROR;
c2230102df6f ) check a proxy_redirect single parameter Igor Sysoev <igor@sysoev.ru>* parents: 2753 diff changeset	3752 }
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3753 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3754
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3755 if (plcf->redirects == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3756 plcf->redirects = ngx_array_create(cf->pool, 1,
4461 103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	3757 sizeof(ngx_http_proxy_rewrite_t));
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3758 if (plcf->redirects == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3759 return NGX_CONF_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3760 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3761 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3762
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3763 pr = ngx_array_push(plcf->redirects);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3764 if (pr == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3765 return NGX_CONF_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3766 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3767
2784 c2230102df6f ) check a proxy_redirect single parameter Igor Sysoev <igor@sysoev.ru>* parents: 2753 diff changeset	3768 if (ngx_strcmp(value[1].data, "default") == 0) {
3471 d8c56e7851b8 "proxy_redirect default" may not be used if a proxy_pass uses variables Igor Sysoev <igor@sysoev.ru> parents: 3470 diff changeset	3769 if (plcf->proxy_lengths) {
d8c56e7851b8 "proxy_redirect default" may not be used if a proxy_pass uses variables Igor Sysoev <igor@sysoev.ru> parents: 3470 diff changeset	3770 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
4593 834049edae24 Fixed grammar in error messages. Ruslan Ermilov <ru@nginx.com> parents: 4529 diff changeset	3771 "\"proxy_redirect default\" cannot be used "
3471 d8c56e7851b8 "proxy_redirect default" may not be used if a proxy_pass uses variables Igor Sysoev <igor@sysoev.ru> parents: 3470 diff changeset	3772 "with \"proxy_pass\" directive with variables");
d8c56e7851b8 "proxy_redirect default" may not be used if a proxy_pass uses variables Igor Sysoev <igor@sysoev.ru> parents: 3470 diff changeset	3773 return NGX_CONF_ERROR;
d8c56e7851b8 "proxy_redirect default" may not be used if a proxy_pass uses variables Igor Sysoev <igor@sysoev.ru> parents: 3470 diff changeset	3774 }
d8c56e7851b8 "proxy_redirect default" may not be used if a proxy_pass uses variables Igor Sysoev <igor@sysoev.ru> parents: 3470 diff changeset	3775
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3776 if (plcf->url.data == NULL) {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3777 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
4593 834049edae24 Fixed grammar in error messages. Ruslan Ermilov <ru@nginx.com> parents: 4529 diff changeset	3778 "\"proxy_redirect default\" should be placed "
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3779 "after the \"proxy_pass\" directive");
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3780 return NGX_CONF_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3781 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3782
4461 103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	3783 pr->handler = ngx_http_proxy_rewrite_complex_handler;
103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	3784
103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	3785 ngx_memzero(&pr->pattern.complex, sizeof(ngx_http_complex_value_t));
4336 99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3786
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3787 ngx_memzero(&pr->replacement, sizeof(ngx_http_complex_value_t));
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3788
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3789 if (plcf->vars.uri.len) {
4461 103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	3790 pr->pattern.complex.value = plcf->url;
4336 99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3791 pr->replacement.value = plcf->location;
653 7cbef16c71a1 nginx-0.3.48-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 651 diff changeset	3792
7cbef16c71a1 nginx-0.3.48-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 651 diff changeset	3793 } else {
4461 103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	3794 pr->pattern.complex.value.len = plcf->url.len + sizeof("/") - 1;
103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	3795
103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	3796 p = ngx_pnalloc(cf->pool, pr->pattern.complex.value.len);
3862 f4c49c9e4bb5 always test proxy_redirect with slash, this fixes a case when nginx uses Igor Sysoev <igor@sysoev.ru> parents: 3734 diff changeset	3797 if (p == NULL) {
f4c49c9e4bb5 always test proxy_redirect with slash, this fixes a case when nginx uses Igor Sysoev <igor@sysoev.ru> parents: 3734 diff changeset	3798 return NGX_CONF_ERROR;
f4c49c9e4bb5 always test proxy_redirect with slash, this fixes a case when nginx uses Igor Sysoev <igor@sysoev.ru> parents: 3734 diff changeset	3799 }
f4c49c9e4bb5 always test proxy_redirect with slash, this fixes a case when nginx uses Igor Sysoev <igor@sysoev.ru> parents: 3734 diff changeset	3800
4461 103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	3801 pr->pattern.complex.value.data = p;
3862 f4c49c9e4bb5 always test proxy_redirect with slash, this fixes a case when nginx uses Igor Sysoev <igor@sysoev.ru> parents: 3734 diff changeset	3802
f4c49c9e4bb5 always test proxy_redirect with slash, this fixes a case when nginx uses Igor Sysoev <igor@sysoev.ru> parents: 3734 diff changeset	3803 p = ngx_cpymem(p, plcf->url.data, plcf->url.len);
f4c49c9e4bb5 always test proxy_redirect with slash, this fixes a case when nginx uses Igor Sysoev <igor@sysoev.ru> parents: 3734 diff changeset	3804 *p = '/';
f4c49c9e4bb5 always test proxy_redirect with slash, this fixes a case when nginx uses Igor Sysoev <igor@sysoev.ru> parents: 3734 diff changeset	3805
4336 99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3806 ngx_str_set(&pr->replacement.value, "/");
653 7cbef16c71a1 nginx-0.3.48-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 651 diff changeset	3807 }
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3808
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3809 return NGX_CONF_OK;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3810 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3811
4336 99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3812
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3813 if (value[1].data[0] == '~') {
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3814 value[1].len--;
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3815 value[1].data++;
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3816
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3817 if (value[1].data[0] == '*') {
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3818 value[1].len--;
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3819 value[1].data++;
4463 a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	3820
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	3821 if (ngx_http_proxy_rewrite_regex(cf, pr, &value[1], 1) != NGX_OK) {
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	3822 return NGX_CONF_ERROR;
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	3823 }
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	3824
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	3825 } else {
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	3826 if (ngx_http_proxy_rewrite_regex(cf, pr, &value[1], 0) != NGX_OK) {
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	3827 return NGX_CONF_ERROR;
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	3828 }
4336 99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3829 }
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3830
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3831 } else {
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3832
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3833 ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3834
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3835 ccv.cf = cf;
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3836 ccv.value = &value[1];
4461 103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	3837 ccv.complex_value = &pr->pattern.complex;
4336 99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3838
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3839 if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3840 return NGX_CONF_ERROR;
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3841 }
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3842
4461 103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	3843 pr->handler = ngx_http_proxy_rewrite_complex_handler;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3844 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3845
4336 99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3846
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3847 ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3848
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3849 ccv.cf = cf;
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3850 ccv.value = &value[2];
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3851 ccv.complex_value = &pr->replacement;
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3852
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3853 if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3854 return NGX_CONF_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3855 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3856
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3857 return NGX_CONF_OK;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3858 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3859
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3860
4465 8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3861 static char *
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3862 ngx_http_proxy_cookie_domain(ngx_conf_t cf, ngx_command_t cmd, void *conf)
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3863 {
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3864 ngx_http_proxy_loc_conf_t *plcf = conf;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3865
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3866 ngx_str_t *value;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3867 ngx_http_proxy_rewrite_t *pr;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3868 ngx_http_compile_complex_value_t ccv;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3869
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3870 if (plcf->cookie_domains == NULL) {
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3871 return NGX_CONF_OK;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3872 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3873
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3874 value = cf->args->elts;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3875
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3876 if (cf->args->nelts == 2) {
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3877
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3878 if (ngx_strcmp(value[1].data, "off") == 0) {
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3879 plcf->cookie_domains = NULL;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3880 return NGX_CONF_OK;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3881 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3882
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3883 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3884 "invalid parameter \"%V\"", &value[1]);
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3885 return NGX_CONF_ERROR;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3886 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3887
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3888 if (plcf->cookie_domains == NGX_CONF_UNSET_PTR) {
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3889 plcf->cookie_domains = ngx_array_create(cf->pool, 1,
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3890 sizeof(ngx_http_proxy_rewrite_t));
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3891 if (plcf->cookie_domains == NULL) {
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3892 return NGX_CONF_ERROR;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3893 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3894 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3895
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3896 pr = ngx_array_push(plcf->cookie_domains);
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3897 if (pr == NULL) {
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3898 return NGX_CONF_ERROR;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3899 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3900
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3901 if (value[1].data[0] == '~') {
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3902 value[1].len--;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3903 value[1].data++;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3904
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3905 if (ngx_http_proxy_rewrite_regex(cf, pr, &value[1], 1) != NGX_OK) {
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3906 return NGX_CONF_ERROR;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3907 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3908
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3909 } else {
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3910
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3911 if (value[1].data[0] == '.') {
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3912 value[1].len--;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3913 value[1].data++;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3914 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3915
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3916 ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3917
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3918 ccv.cf = cf;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3919 ccv.value = &value[1];
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3920 ccv.complex_value = &pr->pattern.complex;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3921
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3922 if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3923 return NGX_CONF_ERROR;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3924 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3925
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3926 pr->handler = ngx_http_proxy_rewrite_domain_handler;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3927
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3928 if (value[2].data[0] == '.') {
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3929 value[2].len--;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3930 value[2].data++;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3931 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3932 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3933
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3934 ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3935
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3936 ccv.cf = cf;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3937 ccv.value = &value[2];
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3938 ccv.complex_value = &pr->replacement;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3939
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3940 if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3941 return NGX_CONF_ERROR;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3942 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3943
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3944 return NGX_CONF_OK;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3945 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3946
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3947
4466 b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3948 static char *
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3949 ngx_http_proxy_cookie_path(ngx_conf_t cf, ngx_command_t cmd, void *conf)
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3950 {
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3951 ngx_http_proxy_loc_conf_t *plcf = conf;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3952
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3953 ngx_str_t *value;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3954 ngx_http_proxy_rewrite_t *pr;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3955 ngx_http_compile_complex_value_t ccv;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3956
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3957 if (plcf->cookie_paths == NULL) {
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3958 return NGX_CONF_OK;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3959 }
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3960
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3961 value = cf->args->elts;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3962
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3963 if (cf->args->nelts == 2) {
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3964
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3965 if (ngx_strcmp(value[1].data, "off") == 0) {
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3966 plcf->cookie_paths = NULL;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3967 return NGX_CONF_OK;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3968 }
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3969
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3970 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3971 "invalid parameter \"%V\"", &value[1]);
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3972 return NGX_CONF_ERROR;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3973 }
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3974
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3975 if (plcf->cookie_paths == NGX_CONF_UNSET_PTR) {
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3976 plcf->cookie_paths = ngx_array_create(cf->pool, 1,
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3977 sizeof(ngx_http_proxy_rewrite_t));
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3978 if (plcf->cookie_paths == NULL) {
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3979 return NGX_CONF_ERROR;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3980 }
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3981 }
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3982
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3983 pr = ngx_array_push(plcf->cookie_paths);
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3984 if (pr == NULL) {
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3985 return NGX_CONF_ERROR;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3986 }
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3987
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3988 if (value[1].data[0] == '~') {
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3989 value[1].len--;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3990 value[1].data++;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3991
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3992 if (value[1].data[0] == '*') {
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3993 value[1].len--;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3994 value[1].data++;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3995
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3996 if (ngx_http_proxy_rewrite_regex(cf, pr, &value[1], 1) != NGX_OK) {
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3997 return NGX_CONF_ERROR;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3998 }
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3999
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4000 } else {
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4001 if (ngx_http_proxy_rewrite_regex(cf, pr, &value[1], 0) != NGX_OK) {
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4002 return NGX_CONF_ERROR;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4003 }
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4004 }
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4005
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4006 } else {
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4007
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4008 ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4009
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4010 ccv.cf = cf;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4011 ccv.value = &value[1];
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4012 ccv.complex_value = &pr->pattern.complex;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4013
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4014 if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4015 return NGX_CONF_ERROR;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4016 }
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4017
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4018 pr->handler = ngx_http_proxy_rewrite_complex_handler;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4019 }
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4020
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4021 ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4022
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4023 ccv.cf = cf;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4024 ccv.value = &value[2];
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4025 ccv.complex_value = &pr->replacement;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4026
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4027 if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4028 return NGX_CONF_ERROR;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4029 }
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4030
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4031 return NGX_CONF_OK;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4032 }
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4033
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4034
4463 a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4035 static ngx_int_t
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4036 ngx_http_proxy_rewrite_regex(ngx_conf_t cf, ngx_http_proxy_rewrite_t pr,
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4037 ngx_str_t *regex, ngx_uint_t caseless)
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4038 {
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4039 #if (NGX_PCRE)
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4040 u_char errstr[NGX_MAX_CONF_ERRSTR];
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4041 ngx_regex_compile_t rc;
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4042
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4043 ngx_memzero(&rc, sizeof(ngx_regex_compile_t));
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4044
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4045 rc.pattern = *regex;
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4046 rc.err.len = NGX_MAX_CONF_ERRSTR;
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4047 rc.err.data = errstr;
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4048
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4049 if (caseless) {
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4050 rc.options = NGX_REGEX_CASELESS;
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4051 }
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4052
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4053 pr->pattern.regex = ngx_http_regex_compile(cf, &rc);
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4054 if (pr->pattern.regex == NULL) {
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4055 return NGX_ERROR;
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4056 }
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4057
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4058 pr->handler = ngx_http_proxy_rewrite_regex_handler;
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4059
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4060 return NGX_OK;
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4061
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4062 #else
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4063
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4064 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4065 "using regex \"%V\" requires PCRE library", regex);
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4066 return NGX_ERROR;
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4067
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4068 #endif
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4069 }
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4070
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4071
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4072 static char *
1295 5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4073 ngx_http_proxy_store(ngx_conf_t cf, ngx_command_t cmd, void *conf)
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4074 {
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4075 ngx_http_proxy_loc_conf_t *plcf = conf;
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4076
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4077 ngx_str_t *value;
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4078 ngx_http_script_compile_t sc;
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4079
5947 d9025ea1f5a5 Upstream: simplified proxy_store and friends configuration code. Valentin Bartenev <vbart@nginx.com> parents: 5940 diff changeset	4080 if (plcf->upstream.store != NGX_CONF_UNSET) {
1295 5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4081 return "is duplicate";
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4082 }
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4083
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4084 value = cf->args->elts;
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4085
2895 d65e58a8d3a4 report about proxy/fastcgi_store and proxy/fastcgi_cache incompatibility Igor Sysoev <igor@sysoev.ru> parents: 2894 diff changeset	4086 if (ngx_strcmp(value[1].data, "off") == 0) {
d65e58a8d3a4 report about proxy/fastcgi_store and proxy/fastcgi_cache incompatibility Igor Sysoev <igor@sysoev.ru> parents: 2894 diff changeset	4087 plcf->upstream.store = 0;
1295 5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4088 return NGX_CONF_OK;
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4089 }
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4090
2895 d65e58a8d3a4 report about proxy/fastcgi_store and proxy/fastcgi_cache incompatibility Igor Sysoev <igor@sysoev.ru> parents: 2894 diff changeset	4091 #if (NGX_HTTP_CACHE)
5949 634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	4092 if (plcf->upstream.cache > 0) {
2895 d65e58a8d3a4 report about proxy/fastcgi_store and proxy/fastcgi_cache incompatibility Igor Sysoev <igor@sysoev.ru> parents: 2894 diff changeset	4093 return "is incompatible with \"proxy_cache\"";
d65e58a8d3a4 report about proxy/fastcgi_store and proxy/fastcgi_cache incompatibility Igor Sysoev <igor@sysoev.ru> parents: 2894 diff changeset	4094 }
d65e58a8d3a4 report about proxy/fastcgi_store and proxy/fastcgi_cache incompatibility Igor Sysoev <igor@sysoev.ru> parents: 2894 diff changeset	4095 #endif
d65e58a8d3a4 report about proxy/fastcgi_store and proxy/fastcgi_cache incompatibility Igor Sysoev <igor@sysoev.ru> parents: 2894 diff changeset	4096
5947 d9025ea1f5a5 Upstream: simplified proxy_store and friends configuration code. Valentin Bartenev <vbart@nginx.com> parents: 5940 diff changeset	4097 plcf->upstream.store = 1;
d9025ea1f5a5 Upstream: simplified proxy_store and friends configuration code. Valentin Bartenev <vbart@nginx.com> parents: 5940 diff changeset	4098
2895 d65e58a8d3a4 report about proxy/fastcgi_store and proxy/fastcgi_cache incompatibility Igor Sysoev <igor@sysoev.ru> parents: 2894 diff changeset	4099 if (ngx_strcmp(value[1].data, "on") == 0) {
1295 5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4100 return NGX_CONF_OK;
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4101 }
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4102
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4103 /* include the terminating '\0' into script */
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4104 value[1].len++;
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4105
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4106 ngx_memzero(&sc, sizeof(ngx_http_script_compile_t));
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4107
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4108 sc.cf = cf;
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4109 sc.source = &value[1];
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4110 sc.lengths = &plcf->upstream.store_lengths;
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4111 sc.values = &plcf->upstream.store_values;
1563 022ec9420f80 style fix: remove double semicolons Igor Sysoev <igor@sysoev.ru> parents: 1488 diff changeset	4112 sc.variables = ngx_http_script_variables_count(&value[1]);
1295 5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4113 sc.complete_lengths = 1;
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4114 sc.complete_values = 1;
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4115
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4116 if (ngx_http_script_compile(&sc) != NGX_OK) {
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4117 return NGX_CONF_ERROR;
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4118 }
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4119
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4120 return NGX_CONF_OK;
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4121 }
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4122
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4123
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4124 #if (NGX_HTTP_CACHE)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4125
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4126 static char *
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4127 ngx_http_proxy_cache(ngx_conf_t cf, ngx_command_t cmd, void *conf)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4128 {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4129 ngx_http_proxy_loc_conf_t *plcf = conf;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4130
5951 610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4131 ngx_str_t *value;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4132 ngx_http_complex_value_t cv;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4133 ngx_http_compile_complex_value_t ccv;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4134
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4135 value = cf->args->elts;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4136
5949 634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	4137 if (plcf->upstream.cache != NGX_CONF_UNSET) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4138 return "is duplicate";
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4139 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4140
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4141 if (ngx_strcmp(value[1].data, "off") == 0) {
5949 634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	4142 plcf->upstream.cache = 0;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4143 return NGX_CONF_OK;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4144 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4145
5947 d9025ea1f5a5 Upstream: simplified proxy_store and friends configuration code. Valentin Bartenev <vbart@nginx.com> parents: 5940 diff changeset	4146 if (plcf->upstream.store > 0) {
2895 d65e58a8d3a4 report about proxy/fastcgi_store and proxy/fastcgi_cache incompatibility Igor Sysoev <igor@sysoev.ru> parents: 2894 diff changeset	4147 return "is incompatible with \"proxy_store\"";
d65e58a8d3a4 report about proxy/fastcgi_store and proxy/fastcgi_cache incompatibility Igor Sysoev <igor@sysoev.ru> parents: 2894 diff changeset	4148 }
d65e58a8d3a4 report about proxy/fastcgi_store and proxy/fastcgi_cache incompatibility Igor Sysoev <igor@sysoev.ru> parents: 2894 diff changeset	4149
5949 634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	4150 plcf->upstream.cache = 1;
634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	4151
5951 610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4152 ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4153
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4154 ccv.cf = cf;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4155 ccv.value = &value[1];
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4156 ccv.complex_value = &cv;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4157
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4158 if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4159 return NGX_CONF_ERROR;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4160 }
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4161
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4162 if (cv.lengths != NULL) {
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4163
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4164 plcf->upstream.cache_value = ngx_palloc(cf->pool,
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4165 sizeof(ngx_http_complex_value_t));
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4166 if (plcf->upstream.cache_value == NULL) {
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4167 return NGX_CONF_ERROR;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4168 }
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4169
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4170 *plcf->upstream.cache_value = cv;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4171
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4172 return NGX_CONF_OK;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4173 }
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4174
5949 634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	4175 plcf->upstream.cache_zone = ngx_shared_memory_add(cf, &value[1], 0,
634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	4176 &ngx_http_proxy_module);
634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	4177 if (plcf->upstream.cache_zone == NULL) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4178 return NGX_CONF_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4179 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4180
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4181 return NGX_CONF_OK;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4182 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4183
2672 b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4184
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4185 static char *
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4186 ngx_http_proxy_cache_key(ngx_conf_t cf, ngx_command_t cmd, void *conf)
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4187 {
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4188 ngx_http_proxy_loc_conf_t *plcf = conf;
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4189
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4190 ngx_str_t *value;
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4191 ngx_http_compile_complex_value_t ccv;
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4192
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4193 value = cf->args->elts;
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4194
4947 4251e72b8bb4 Allow the complex value to be defined as an empty string. Ruslan Ermilov <ru@nginx.com> parents: 4927 diff changeset	4195 if (plcf->cache_key.value.data) {
2672 b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4196 return "is duplicate";
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4197 }
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4198
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4199 ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4200
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4201 ccv.cf = cf;
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4202 ccv.value = &value[1];
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4203 ccv.complex_value = &plcf->cache_key;
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4204
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4205 if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4206 return NGX_CONF_ERROR;
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4207 }
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4208
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4209 return NGX_CONF_OK;
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4210 }
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4211
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4212 #endif
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4213
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4214
5900 20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4215 #if (NGX_HTTP_SSL)
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4216
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4217 static char *
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4218 ngx_http_proxy_ssl_password_file(ngx_conf_t cf, ngx_command_t cmd, void *conf)
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4219 {
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4220 ngx_http_proxy_loc_conf_t *plcf = conf;
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4221
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4222 ngx_str_t *value;
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4223
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4224 if (plcf->ssl_passwords != NGX_CONF_UNSET_PTR) {
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4225 return "is duplicate";
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4226 }
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4227
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4228 value = cf->args->elts;
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4229
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4230 plcf->ssl_passwords = ngx_ssl_read_password_file(cf, &value[1]);
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4231
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4232 if (plcf->ssl_passwords == NULL) {
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4233 return NGX_CONF_ERROR;
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4234 }
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4235
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4236 return NGX_CONF_OK;
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4237 }
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4238
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4239 #endif
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4240
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4241
1295 5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4242 static char *
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4243 ngx_http_proxy_lowat_check(ngx_conf_t cf, void post, void *data)
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4244 {
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4245 #if (NGX_FREEBSD)
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4246 ssize_t *np = data;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4247
673 b80f94fa2197 nginx-0.3.58-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 667 diff changeset	4248 if ((u_long) *np >= ngx_freebsd_net_inet_tcp_sendspace) {
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4249 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4250 "\"proxy_send_lowat\" must be less than %d "
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4251 "(sysctl net.inet.tcp.sendspace)",
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4252 ngx_freebsd_net_inet_tcp_sendspace);
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4253
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4254 return NGX_CONF_ERROR;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4255 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4256
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4257 #elif !(NGX_HAVE_SO_SNDLOWAT)
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4258 ssize_t *np = data;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4259
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4260 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4261 "\"proxy_send_lowat\" is not supported, ignored");
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4262
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4263 *np = 0;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4264
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4265 #endif
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4266
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4267 return NGX_CONF_OK;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4268 }
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 843 diff changeset	4269
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 843 diff changeset	4270
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4271 #if (NGX_HTTP_SSL)
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4272
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4273 static ngx_int_t
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4274 ngx_http_proxy_set_ssl(ngx_conf_t cf, ngx_http_proxy_loc_conf_t plcf)
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4275 {
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4276 ngx_pool_cleanup_t *cln;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4277
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4278 plcf->upstream.ssl = ngx_pcalloc(cf->pool, sizeof(ngx_ssl_t));
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4279 if (plcf->upstream.ssl == NULL) {
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4280 return NGX_ERROR;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4281 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4282
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4283 plcf->upstream.ssl->log = cf->log;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4284
5385 7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	4285 if (ngx_ssl_create(plcf->upstream.ssl, plcf->ssl_protocols, NULL)
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4286 != NGX_OK)
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4287 {
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4288 return NGX_ERROR;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4289 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4290
5659 3fb6615bb87f Upstream: plugged potential memory leak on reload. Maxim Dounin <mdounin@mdounin.ru> parents: 5575 diff changeset	4291 cln = ngx_pool_cleanup_add(cf->pool, 0);
3fb6615bb87f Upstream: plugged potential memory leak on reload. Maxim Dounin <mdounin@mdounin.ru> parents: 5575 diff changeset	4292 if (cln == NULL) {
3fb6615bb87f Upstream: plugged potential memory leak on reload. Maxim Dounin <mdounin@mdounin.ru> parents: 5575 diff changeset	4293 return NGX_ERROR;
3fb6615bb87f Upstream: plugged potential memory leak on reload. Maxim Dounin <mdounin@mdounin.ru> parents: 5575 diff changeset	4294 }
3fb6615bb87f Upstream: plugged potential memory leak on reload. Maxim Dounin <mdounin@mdounin.ru> parents: 5575 diff changeset	4295
3fb6615bb87f Upstream: plugged potential memory leak on reload. Maxim Dounin <mdounin@mdounin.ru> parents: 5575 diff changeset	4296 cln->handler = ngx_ssl_cleanup_ctx;
3fb6615bb87f Upstream: plugged potential memory leak on reload. Maxim Dounin <mdounin@mdounin.ru> parents: 5575 diff changeset	4297 cln->data = plcf->upstream.ssl;
3fb6615bb87f Upstream: plugged potential memory leak on reload. Maxim Dounin <mdounin@mdounin.ru> parents: 5575 diff changeset	4298
5900 20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4299 if (plcf->ssl_certificate.len) {
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4300
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4301 if (plcf->ssl_certificate_key.len == 0) {
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4302 ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4303 "no \"proxy_ssl_certificate_key\" is defined "
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4304 "for certificate \"%V\"", &plcf->ssl_certificate);
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4305 return NGX_ERROR;
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4306 }
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4307
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4308 if (ngx_ssl_certificate(cf, plcf->upstream.ssl, &plcf->ssl_certificate,
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4309 &plcf->ssl_certificate_key, plcf->ssl_passwords)
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4310 != NGX_OK)
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4311 {
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4312 return NGX_ERROR;
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4313 }
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4314 }
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4315
6591 04d8d1f85649 SSL: ngx_ssl_ciphers() to set list of ciphers. Tim Taubert <tim@timtaubert.de> parents: 6530 diff changeset	4316 if (ngx_ssl_ciphers(cf, plcf->upstream.ssl, &plcf->ssl_ciphers, 0)
04d8d1f85649 SSL: ngx_ssl_ciphers() to set list of ciphers. Tim Taubert <tim@timtaubert.de> parents: 6530 diff changeset	4317 != NGX_OK)
5390 919d230ecdbe Proxy: added the "proxy_ssl_ciphers" directive. Piotr Sikora <piotr@cloudflare.com> parents: 5385 diff changeset	4318 {
919d230ecdbe Proxy: added the "proxy_ssl_ciphers" directive. Piotr Sikora <piotr@cloudflare.com> parents: 5385 diff changeset	4319 return NGX_ERROR;
919d230ecdbe Proxy: added the "proxy_ssl_ciphers" directive. Piotr Sikora <piotr@cloudflare.com> parents: 5385 diff changeset	4320 }
919d230ecdbe Proxy: added the "proxy_ssl_ciphers" directive. Piotr Sikora <piotr@cloudflare.com> parents: 5385 diff changeset	4321
5661 060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	4322 if (plcf->upstream.ssl_verify) {
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	4323 if (plcf->ssl_trusted_certificate.len == 0) {
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	4324 ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	4325 "no proxy_ssl_trusted_certificate for proxy_ssl_verify");
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	4326 return NGX_ERROR;
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	4327 }
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	4328
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	4329 if (ngx_ssl_trusted_certificate(cf, plcf->upstream.ssl,
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	4330 &plcf->ssl_trusted_certificate,
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	4331 plcf->ssl_verify_depth)
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	4332 != NGX_OK)
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	4333 {
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	4334 return NGX_ERROR;
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	4335 }
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	4336
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	4337 if (ngx_ssl_crl(cf, plcf->upstream.ssl, &plcf->ssl_crl) != NGX_OK) {
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	4338 return NGX_ERROR;
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	4339 }
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	4340 }
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	4341
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4342 return NGX_OK;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4343 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4344
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4345 #endif
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4346
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4347
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4348 static void
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4349 ngx_http_proxy_set_vars(ngx_url_t u, ngx_http_proxy_vars_t v)
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4350 {
2203 8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2184 diff changeset	4351 if (u->family != AF_UNIX) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4352
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4353 if (u->no_port \|\| u->port == u->default_port) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4354
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4355 v->host_header = u->host;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4356
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4357 if (u->default_port == 80) {
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3477 diff changeset	4358 ngx_str_set(&v->port, "80");
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4359
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4360 } else {
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3477 diff changeset	4361 ngx_str_set(&v->port, "443");
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4362 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4363
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4364 } else {
1671 8075179cae21 ngx_parse_url() saves port text, this allows to use it in proxy host header Igor Sysoev <igor@sysoev.ru> parents: 1667 diff changeset	4365 v->host_header.len = u->host.len + 1 + u->port_text.len;
8075179cae21 ngx_parse_url() saves port text, this allows to use it in proxy host header Igor Sysoev <igor@sysoev.ru> parents: 1667 diff changeset	4366 v->host_header.data = u->host.data;
8075179cae21 ngx_parse_url() saves port text, this allows to use it in proxy host header Igor Sysoev <igor@sysoev.ru> parents: 1667 diff changeset	4367 v->port = u->port_text;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4368 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4369
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4370 v->key_start.len += v->host_header.len;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4371
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4372 } else {
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3477 diff changeset	4373 ngx_str_set(&v->host_header, "localhost");
dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3477 diff changeset	4374 ngx_str_null(&v->port);
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4375 v->key_start.len += sizeof("unix:") - 1 + u->host.len + 1;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4376 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4377
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4378 v->uri = u->uri;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4379 }

Mercurial > hg > nginx

annotate src/http/modules/ngx_http_proxy_module.c @ 7047:3fef8c5caa75