nginx: src/http/modules/ngx_http_proxy

annotate src/http/modules/ngx_http_proxy_module.c @ 6640:e78eca6bfaf0

HTTP/2: fixed send timer handling. Checking for return value of c->send_chain() isn't sufficient since there are data can be left in the SSL buffer. Now the wew->ready flag is used instead. In particular, this fixed a connection leak in cases when all streams were closed, but there's still some data to be sent in the SSL buffer and the client forgot about the connection.

author	Valentin Bartenev <vbart@nginx.com>
date	Tue, 19 Jul 2016 20:31:09 +0300
parents	04d8d1f85649
children	63991ab67b3a

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
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	76 ngx_str_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 },
2927 55ceaef03d34 proxy_cache_use_stale/fastcgi_cache_use_stale updating Igor Sysoev <igor@sysoev.ru> parents: 2912 diff changeset	223 { 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	224 { ngx_string("off"), NGX_HTTP_UPSTREAM_FT_OFF },
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	225 { ngx_null_string, 0 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	226 };
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
5385 7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	229 #if (NGX_HTTP_SSL)
7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	230
7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	231 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	232 { ngx_string("SSLv2"), NGX_SSL_SSLv2 },
7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	233 { ngx_string("SSLv3"), NGX_SSL_SSLv3 },
7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	234 { ngx_string("TLSv1"), NGX_SSL_TLSv1 },
7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	235 { 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	236 { ngx_string("TLSv1.2"), NGX_SSL_TLSv1_2 },
7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	237 { ngx_null_string, 0 }
7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	238 };
7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	239
7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	240 #endif
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
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	243 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	244 { 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	245 { 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	246 { ngx_null_string, 0 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	247 };
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	248
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	249
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	250 ngx_module_t ngx_http_proxy_module;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	251
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	252
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	253 static ngx_command_t ngx_http_proxy_commands[] = {
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	254
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	255 { ngx_string("proxy_pass"),
843 ebab9490204c allow proxy_pass inside limit_except Igor Sysoev <igor@sysoev.ru> parents: 812 diff changeset	256 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	257 ngx_http_proxy_pass,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	258 NGX_HTTP_LOC_CONF_OFFSET,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	259 0,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	260 NULL },
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	261
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	262 { ngx_string("proxy_redirect"),
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	263 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	264 ngx_http_proxy_redirect,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	265 NGX_HTTP_LOC_CONF_OFFSET,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	266 0,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	267 NULL },
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	268
4465 8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	269 { ngx_string("proxy_cookie_domain"),
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	270 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	271 ngx_http_proxy_cookie_domain,
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	272 NGX_HTTP_LOC_CONF_OFFSET,
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	273 0,
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	274 NULL },
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	275
4466 b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	276 { ngx_string("proxy_cookie_path"),
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	277 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	278 ngx_http_proxy_cookie_path,
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	279 NGX_HTTP_LOC_CONF_OFFSET,
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	280 0,
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	281 NULL },
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	282
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1244 diff changeset	283 { ngx_string("proxy_store"),
1295 5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	284 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	285 ngx_http_proxy_store,
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	286 NGX_HTTP_LOC_CONF_OFFSET,
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	287 0,
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	288 NULL },
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	289
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	290 { ngx_string("proxy_store_access"),
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1244 diff changeset	291 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	292 ngx_conf_set_access_slot,
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1244 diff changeset	293 NGX_HTTP_LOC_CONF_OFFSET,
1295 5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	294 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	295 NULL },
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1244 diff changeset	296
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 579 diff changeset	297 { ngx_string("proxy_buffering"),
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 579 diff changeset	298 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	299 ngx_conf_set_flag_slot,
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 579 diff changeset	300 NGX_HTTP_LOC_CONF_OFFSET,
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 579 diff changeset	301 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	302 NULL },
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 579 diff changeset	303
6050 a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	304 { ngx_string("proxy_request_buffering"),
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	305 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	306 ngx_conf_set_flag_slot,
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	307 NGX_HTTP_LOC_CONF_OFFSET,
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	308 offsetof(ngx_http_proxy_loc_conf_t, upstream.request_buffering),
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	309 NULL },
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	310
629 65bf042c0b4f nginx-0.3.36-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 627 diff changeset	311 { ngx_string("proxy_ignore_client_abort"),
65bf042c0b4f nginx-0.3.36-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 627 diff changeset	312 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	313 ngx_conf_set_flag_slot,
65bf042c0b4f nginx-0.3.36-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 627 diff changeset	314 NGX_HTTP_LOC_CONF_OFFSET,
65bf042c0b4f nginx-0.3.36-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 627 diff changeset	315 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	316 NULL },
65bf042c0b4f nginx-0.3.36-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 627 diff changeset	317
3271 fcd98af88df3 proxy_bind, fastcgi_bind, and memcached_bind Igor Sysoev <igor@sysoev.ru> parents: 3006 diff changeset	318 { ngx_string("proxy_bind"),
6530 1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6480 diff changeset	319 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	320 ngx_http_upstream_bind_set_slot,
3271 fcd98af88df3 proxy_bind, fastcgi_bind, and memcached_bind Igor Sysoev <igor@sysoev.ru> parents: 3006 diff changeset	321 NGX_HTTP_LOC_CONF_OFFSET,
fcd98af88df3 proxy_bind, fastcgi_bind, and memcached_bind Igor Sysoev <igor@sysoev.ru> parents: 3006 diff changeset	322 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	323 NULL },
fcd98af88df3 proxy_bind, fastcgi_bind, and memcached_bind Igor Sysoev <igor@sysoev.ru> parents: 3006 diff changeset	324
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	325 { ngx_string("proxy_connect_timeout"),
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	326 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	327 ngx_conf_set_msec_slot,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	328 NGX_HTTP_LOC_CONF_OFFSET,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	329 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	330 NULL },
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	331
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	332 { ngx_string("proxy_send_timeout"),
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	333 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	334 ngx_conf_set_msec_slot,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	335 NGX_HTTP_LOC_CONF_OFFSET,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	336 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	337 NULL },
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	338
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	339 { ngx_string("proxy_send_lowat"),
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	340 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	341 ngx_conf_set_size_slot,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	342 NGX_HTTP_LOC_CONF_OFFSET,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	343 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	344 &ngx_http_proxy_lowat_post },
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	345
657 400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	346 { ngx_string("proxy_intercept_errors"),
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	347 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	348 ngx_conf_set_flag_slot,
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	349 NGX_HTTP_LOC_CONF_OFFSET,
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	350 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	351 NULL },
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	352
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	353 { ngx_string("proxy_set_header"),
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	354 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	355 ngx_conf_set_keyval_slot,
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	356 NGX_HTTP_LOC_CONF_OFFSET,
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	357 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	358 NULL },
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	359
1180 1666b7b0bafc proxy_headers_hash_max_size and proxy_headers_hash_bucket_size Igor Sysoev <igor@sysoev.ru> parents: 1125 diff changeset	360 { 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	361 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	362 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	363 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	364 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	365 NULL },
1666b7b0bafc proxy_headers_hash_max_size and proxy_headers_hash_bucket_size Igor Sysoev <igor@sysoev.ru> parents: 1125 diff changeset	366
1666b7b0bafc proxy_headers_hash_max_size and proxy_headers_hash_bucket_size Igor Sysoev <igor@sysoev.ru> parents: 1125 diff changeset	367 { 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	368 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	369 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	370 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	371 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	372 NULL },
1666b7b0bafc proxy_headers_hash_max_size and proxy_headers_hash_bucket_size Igor Sysoev <igor@sysoev.ru> parents: 1125 diff changeset	373
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	374 { ngx_string("proxy_set_body"),
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	375 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	376 ngx_conf_set_str_slot,
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	377 NGX_HTTP_LOC_CONF_OFFSET,
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	378 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	379 NULL },
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	380
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	381 { ngx_string("proxy_method"),
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	382 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
561 e48ebafc6939 nginx-0.3.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 555 diff changeset	383 ngx_conf_set_str_slot,
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	384 NGX_HTTP_LOC_CONF_OFFSET,
561 e48ebafc6939 nginx-0.3.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 555 diff changeset	385 offsetof(ngx_http_proxy_loc_conf_t, method),
e48ebafc6939 nginx-0.3.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 555 diff changeset	386 NULL },
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	387
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	388 { ngx_string("proxy_pass_request_headers"),
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	389 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	390 ngx_conf_set_flag_slot,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	391 NGX_HTTP_LOC_CONF_OFFSET,
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	392 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	393 NULL },
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	394
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	395 { ngx_string("proxy_pass_request_body"),
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	396 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	397 ngx_conf_set_flag_slot,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	398 NGX_HTTP_LOC_CONF_OFFSET,
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	399 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	400 NULL },
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	401
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 579 diff changeset	402 { ngx_string("proxy_buffer_size"),
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 579 diff changeset	403 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	404 ngx_conf_set_size_slot,
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 579 diff changeset	405 NGX_HTTP_LOC_CONF_OFFSET,
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 579 diff changeset	406 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	407 NULL },
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 579 diff changeset	408
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	409 { ngx_string("proxy_read_timeout"),
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	410 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	411 ngx_conf_set_msec_slot,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	412 NGX_HTTP_LOC_CONF_OFFSET,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	413 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	414 NULL },
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	415
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	416 { ngx_string("proxy_buffers"),
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	417 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	418 ngx_conf_set_bufs_slot,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	419 NGX_HTTP_LOC_CONF_OFFSET,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	420 offsetof(ngx_http_proxy_loc_conf_t, upstream.bufs),
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	421 NULL },
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	422
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	423 { ngx_string("proxy_busy_buffers_size"),
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	424 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	425 ngx_conf_set_size_slot,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	426 NGX_HTTP_LOC_CONF_OFFSET,
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	427 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	428 NULL },
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	429
5874 2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	430 { ngx_string("proxy_force_ranges"),
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	431 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	432 ngx_conf_set_flag_slot,
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	433 NGX_HTTP_LOC_CONF_OFFSET,
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	434 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	435 NULL },
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	436
5883 973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5874 diff changeset	437 { ngx_string("proxy_limit_rate"),
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5874 diff changeset	438 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	439 ngx_conf_set_size_slot,
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5874 diff changeset	440 NGX_HTTP_LOC_CONF_OFFSET,
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5874 diff changeset	441 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	442 NULL },
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5874 diff changeset	443
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	444 #if (NGX_HTTP_CACHE)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	445
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	446 { ngx_string("proxy_cache"),
3729 4b773fc06336 fix directive type Igor Sysoev <igor@sysoev.ru> parents: 3700 diff changeset	447 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	448 ngx_http_proxy_cache,
2597 86967878cd76 fix the previous commit Igor Sysoev <igor@sysoev.ru> parents: 2596 diff changeset	449 NGX_HTTP_LOC_CONF_OFFSET,
2596 9a265cd00ba5 axe old definition fields Igor Sysoev <igor@sysoev.ru> parents: 2592 diff changeset	450 0,
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	451 NULL },
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	452
2672 b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	453 { ngx_string("proxy_cache_key"),
3729 4b773fc06336 fix directive type Igor Sysoev <igor@sysoev.ru> parents: 3700 diff changeset	454 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	455 ngx_http_proxy_cache_key,
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	456 NGX_HTTP_LOC_CONF_OFFSET,
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	457 0,
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	458 NULL },
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	459
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	460 { ngx_string("proxy_cache_path"),
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	461 NGX_HTTP_MAIN_CONF\|NGX_CONF_2MORE,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	462 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	463 NGX_HTTP_MAIN_CONF_OFFSET,
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	464 offsetof(ngx_http_proxy_main_conf_t, caches),
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	465 &ngx_http_proxy_module },
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	466
3699 b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3692 diff changeset	467 { 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	468 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	469 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	470 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	471 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	472 NULL },
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3692 diff changeset	473
3526 62a4fd1e6e2c proxy_no_cache and fastcgi_no_cache Igor Sysoev <igor@sysoev.ru> parents: 3523 diff changeset	474 { ngx_string("proxy_no_cache"),
62a4fd1e6e2c proxy_no_cache and fastcgi_no_cache Igor Sysoev <igor@sysoev.ru> parents: 3523 diff changeset	475 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	476 ngx_http_set_predicate_slot,
3526 62a4fd1e6e2c proxy_no_cache and fastcgi_no_cache Igor Sysoev <igor@sysoev.ru> parents: 3523 diff changeset	477 NGX_HTTP_LOC_CONF_OFFSET,
62a4fd1e6e2c proxy_no_cache and fastcgi_no_cache Igor Sysoev <igor@sysoev.ru> parents: 3523 diff changeset	478 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	479 NULL },
62a4fd1e6e2c proxy_no_cache and fastcgi_no_cache Igor Sysoev <igor@sysoev.ru> parents: 3523 diff changeset	480
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	481 { ngx_string("proxy_cache_valid"),
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	482 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	483 ngx_http_file_cache_valid_set_slot,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	484 NGX_HTTP_LOC_CONF_OFFSET,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	485 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	486 NULL },
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	487
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	488 { ngx_string("proxy_cache_min_uses"),
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	489 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	490 ngx_conf_set_num_slot,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	491 NGX_HTTP_LOC_CONF_OFFSET,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	492 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	493 NULL },
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	494
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	495 { ngx_string("proxy_cache_use_stale"),
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	496 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	497 ngx_conf_set_bitmask_slot,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	498 NGX_HTTP_LOC_CONF_OFFSET,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	499 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	500 &ngx_http_proxy_next_upstream_masks },
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	501
2875 6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2786 diff changeset	502 { ngx_string("proxy_cache_methods"),
6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2786 diff changeset	503 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	504 ngx_conf_set_bitmask_slot,
6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2786 diff changeset	505 NGX_HTTP_LOC_CONF_OFFSET,
6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2786 diff changeset	506 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	507 &ngx_http_upstream_cache_method_mask },
6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2786 diff changeset	508
4385 70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4377 diff changeset	509 { ngx_string("proxy_cache_lock"),
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4377 diff changeset	510 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	511 ngx_conf_set_flag_slot,
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4377 diff changeset	512 NGX_HTTP_LOC_CONF_OFFSET,
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4377 diff changeset	513 offsetof(ngx_http_proxy_loc_conf_t, upstream.cache_lock),
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4377 diff changeset	514 NULL },
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4377 diff changeset	515
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4377 diff changeset	516 { ngx_string("proxy_cache_lock_timeout"),
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4377 diff changeset	517 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	518 ngx_conf_set_msec_slot,
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4377 diff changeset	519 NGX_HTTP_LOC_CONF_OFFSET,
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4377 diff changeset	520 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	521 NULL },
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4377 diff changeset	522
5905 2f7e557eab5b Cache: proxy_cache_lock_age and friends. Roman Arutyunyan <arut@nginx.com> parents: 5900 diff changeset	523 { ngx_string("proxy_cache_lock_age"),
2f7e557eab5b Cache: proxy_cache_lock_age and friends. Roman Arutyunyan <arut@nginx.com> parents: 5900 diff changeset	524 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	525 ngx_conf_set_msec_slot,
2f7e557eab5b Cache: proxy_cache_lock_age and friends. Roman Arutyunyan <arut@nginx.com> parents: 5900 diff changeset	526 NGX_HTTP_LOC_CONF_OFFSET,
2f7e557eab5b Cache: proxy_cache_lock_age and friends. Roman Arutyunyan <arut@nginx.com> parents: 5900 diff changeset	527 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	528 NULL },
2f7e557eab5b Cache: proxy_cache_lock_age and friends. Roman Arutyunyan <arut@nginx.com> parents: 5900 diff changeset	529
5441 43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5391 diff changeset	530 { ngx_string("proxy_cache_revalidate"),
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5391 diff changeset	531 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	532 ngx_conf_set_flag_slot,
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5391 diff changeset	533 NGX_HTTP_LOC_CONF_OFFSET,
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5391 diff changeset	534 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	535 NULL },
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5391 diff changeset	536
6290 4d5ac1a31d44 Upstream: proxy_cache_convert_head directive. Roman Arutyunyan <arut@nginx.com> parents: 6157 diff changeset	537 { ngx_string("proxy_cache_convert_head"),
4d5ac1a31d44 Upstream: proxy_cache_convert_head directive. Roman Arutyunyan <arut@nginx.com> parents: 6157 diff changeset	538 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	539 ngx_conf_set_flag_slot,
4d5ac1a31d44 Upstream: proxy_cache_convert_head directive. Roman Arutyunyan <arut@nginx.com> parents: 6157 diff changeset	540 NGX_HTTP_LOC_CONF_OFFSET,
4d5ac1a31d44 Upstream: proxy_cache_convert_head directive. Roman Arutyunyan <arut@nginx.com> parents: 6157 diff changeset	541 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	542 NULL },
4d5ac1a31d44 Upstream: proxy_cache_convert_head directive. Roman Arutyunyan <arut@nginx.com> parents: 6157 diff changeset	543
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	544 #endif
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	545
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	546 { ngx_string("proxy_temp_path"),
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	547 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	548 ngx_conf_set_path_slot,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	549 NGX_HTTP_LOC_CONF_OFFSET,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	550 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	551 NULL },
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	552
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	553 { ngx_string("proxy_max_temp_file_size"),
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	554 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	555 ngx_conf_set_size_slot,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	556 NGX_HTTP_LOC_CONF_OFFSET,
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	557 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	558 NULL },
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	559
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	560 { ngx_string("proxy_temp_file_write_size"),
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	561 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	562 ngx_conf_set_size_slot,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	563 NGX_HTTP_LOC_CONF_OFFSET,
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	564 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	565 NULL },
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	566
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	567 { ngx_string("proxy_next_upstream"),
547 818fbd4750b9 nginx-0.2.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 543 diff changeset	568 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	569 ngx_conf_set_bitmask_slot,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	570 NGX_HTTP_LOC_CONF_OFFSET,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	571 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	572 &ngx_http_proxy_next_upstream_masks },
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	573
5832 d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5738 diff changeset	574 { 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	575 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	576 ngx_conf_set_num_slot,
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5738 diff changeset	577 NGX_HTTP_LOC_CONF_OFFSET,
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5738 diff changeset	578 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	579 NULL },
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5738 diff changeset	580
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5738 diff changeset	581 { 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	582 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	583 ngx_conf_set_msec_slot,
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5738 diff changeset	584 NGX_HTTP_LOC_CONF_OFFSET,
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5738 diff changeset	585 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	586 NULL },
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5738 diff changeset	587
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	588 { ngx_string("proxy_pass_header"),
3729 4b773fc06336 fix directive type Igor Sysoev <igor@sysoev.ru> parents: 3700 diff changeset	589 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	590 ngx_conf_set_str_array_slot,
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	591 NGX_HTTP_LOC_CONF_OFFSET,
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	592 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	593 NULL },
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	594
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	595 { ngx_string("proxy_hide_header"),
3729 4b773fc06336 fix directive type Igor Sysoev <igor@sysoev.ru> parents: 3700 diff changeset	596 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	597 ngx_conf_set_str_array_slot,
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	598 NGX_HTTP_LOC_CONF_OFFSET,
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	599 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	600 NULL },
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	601
2786 4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2784 diff changeset	602 { ngx_string("proxy_ignore_headers"),
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2784 diff changeset	603 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	604 ngx_conf_set_bitmask_slot,
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2784 diff changeset	605 NGX_HTTP_LOC_CONF_OFFSET,
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2784 diff changeset	606 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	607 &ngx_http_upstream_ignore_headers_masks },
2786 4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2784 diff changeset	608
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	609 { ngx_string("proxy_http_version"),
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	610 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	611 ngx_conf_set_enum_slot,
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	612 NGX_HTTP_LOC_CONF_OFFSET,
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	613 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	614 &ngx_http_proxy_http_version },
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	615
2184 274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2135 diff changeset	616 #if (NGX_HTTP_SSL)
274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2135 diff changeset	617
274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2135 diff changeset	618 { ngx_string("proxy_ssl_session_reuse"),
274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2135 diff changeset	619 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	620 ngx_conf_set_flag_slot,
274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2135 diff changeset	621 NGX_HTTP_LOC_CONF_OFFSET,
274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2135 diff changeset	622 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	623 NULL },
274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2135 diff changeset	624
5385 7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	625 { ngx_string("proxy_ssl_protocols"),
7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	626 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	627 ngx_conf_set_bitmask_slot,
7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	628 NGX_HTTP_LOC_CONF_OFFSET,
7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	629 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	630 &ngx_http_proxy_ssl_protocols },
7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	631
5390 919d230ecdbe Proxy: added the "proxy_ssl_ciphers" directive. Piotr Sikora <piotr@cloudflare.com> parents: 5385 diff changeset	632 { ngx_string("proxy_ssl_ciphers"),
919d230ecdbe Proxy: added the "proxy_ssl_ciphers" directive. Piotr Sikora <piotr@cloudflare.com> parents: 5385 diff changeset	633 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	634 ngx_conf_set_str_slot,
919d230ecdbe Proxy: added the "proxy_ssl_ciphers" directive. Piotr Sikora <piotr@cloudflare.com> parents: 5385 diff changeset	635 NGX_HTTP_LOC_CONF_OFFSET,
919d230ecdbe Proxy: added the "proxy_ssl_ciphers" directive. Piotr Sikora <piotr@cloudflare.com> parents: 5385 diff changeset	636 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	637 NULL },
919d230ecdbe Proxy: added the "proxy_ssl_ciphers" directive. Piotr Sikora <piotr@cloudflare.com> parents: 5385 diff changeset	638
5660 7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	639 { 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	640 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	641 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	642 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	643 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	644 NULL },
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	645
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	646 { 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	647 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	648 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	649 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	650 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	651 NULL },
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	652
5661 060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	653 { ngx_string("proxy_ssl_verify"),
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	654 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	655 ngx_conf_set_flag_slot,
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	656 NGX_HTTP_LOC_CONF_OFFSET,
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	657 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	658 NULL },
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	659
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	660 { ngx_string("proxy_ssl_verify_depth"),
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	661 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	662 ngx_conf_set_num_slot,
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	663 NGX_HTTP_LOC_CONF_OFFSET,
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	664 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	665 NULL },
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	666
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	667 { ngx_string("proxy_ssl_trusted_certificate"),
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	668 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	669 ngx_conf_set_str_slot,
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	670 NGX_HTTP_LOC_CONF_OFFSET,
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	671 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	672 NULL },
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	673
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	674 { ngx_string("proxy_ssl_crl"),
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	675 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	676 ngx_conf_set_str_slot,
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	677 NGX_HTTP_LOC_CONF_OFFSET,
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	678 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	679 NULL },
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	680
5900 20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	681 { ngx_string("proxy_ssl_certificate"),
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	682 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	683 ngx_conf_set_str_slot,
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	684 NGX_HTTP_LOC_CONF_OFFSET,
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	685 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	686 NULL },
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	687
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	688 { ngx_string("proxy_ssl_certificate_key"),
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	689 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	690 ngx_conf_set_str_slot,
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	691 NGX_HTTP_LOC_CONF_OFFSET,
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	692 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	693 NULL },
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	694
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	695 { ngx_string("proxy_ssl_password_file"),
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	696 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	697 ngx_http_proxy_ssl_password_file,
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	698 NGX_HTTP_LOC_CONF_OFFSET,
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	699 0,
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	700 NULL },
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	701
2184 274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2135 diff changeset	702 #endif
274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2135 diff changeset	703
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	704 ngx_null_command
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	705 };
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	706
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	707
667 63a820b0bc6c nginx-0.3.55-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 665 diff changeset	708 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	709 ngx_http_proxy_add_variables, /* preconfiguration */
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	710 NULL, /* postconfiguration */
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	711
5951 610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	712 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	713 NULL, /* init main configuration */
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	714
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	715 NULL, /* create server configuration */
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	716 NULL, /* merge server configuration */
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	717
4499 778ef9c3fd2d Fixed spelling in single-line comments. Ruslan Ermilov <ru@nginx.com> parents: 4466 diff changeset	718 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	719 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	720 };
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 ngx_module_t ngx_http_proxy_module = {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	724 NGX_MODULE_V1,
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	725 &ngx_http_proxy_module_ctx, /* module context */
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	726 ngx_http_proxy_commands, /* module directives */
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	727 NGX_HTTP_MODULE, /* module type */
541 b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 539 diff changeset	728 NULL, /* init master */
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	729 NULL, /* init module */
541 b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 539 diff changeset	730 NULL, /* init process */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 539 diff changeset	731 NULL, /* init thread */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 539 diff changeset	732 NULL, /* exit thread */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 539 diff changeset	733 NULL, /* exit process */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 539 diff changeset	734 NULL, /* exit master */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 539 diff changeset	735 NGX_MODULE_V1_PADDING
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 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	740 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	741
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	742
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	743 static ngx_keyval_t ngx_http_proxy_headers[] = {
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	744 { ngx_string("Host"), ngx_string("$proxy_host") },
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	745 { 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	746 { 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	747 { 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	748 { ngx_string("TE"), ngx_string("") },
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	749 { ngx_string("Keep-Alive"), ngx_string("") },
2067 5657037448d1 the "Expect" header support Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	750 { ngx_string("Expect"), ngx_string("") },
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	751 { ngx_string("Upgrade"), ngx_string("") },
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	752 { ngx_null_string, ngx_null_string }
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	753 };
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	754
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	755
2706 f905a6ab0ca8 hide cacheable Set-Cookie and P3P response headers Igor Sysoev <igor@sysoev.ru> parents: 2705 diff changeset	756 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	757 ngx_string("Date"),
f905a6ab0ca8 hide cacheable Set-Cookie and P3P response headers Igor Sysoev <igor@sysoev.ru> parents: 2705 diff changeset	758 ngx_string("Server"),
f905a6ab0ca8 hide cacheable Set-Cookie and P3P response headers Igor Sysoev <igor@sysoev.ru> parents: 2705 diff changeset	759 ngx_string("X-Pad"),
f905a6ab0ca8 hide cacheable Set-Cookie and P3P response headers Igor Sysoev <igor@sysoev.ru> parents: 2705 diff changeset	760 ngx_string("X-Accel-Expires"),
f905a6ab0ca8 hide cacheable Set-Cookie and P3P response headers Igor Sysoev <igor@sysoev.ru> parents: 2705 diff changeset	761 ngx_string("X-Accel-Redirect"),
f905a6ab0ca8 hide cacheable Set-Cookie and P3P response headers Igor Sysoev <igor@sysoev.ru> parents: 2705 diff changeset	762 ngx_string("X-Accel-Limit-Rate"),
f905a6ab0ca8 hide cacheable Set-Cookie and P3P response headers Igor Sysoev <igor@sysoev.ru> parents: 2705 diff changeset	763 ngx_string("X-Accel-Buffering"),
f905a6ab0ca8 hide cacheable Set-Cookie and P3P response headers Igor Sysoev <igor@sysoev.ru> parents: 2705 diff changeset	764 ngx_string("X-Accel-Charset"),
f905a6ab0ca8 hide cacheable Set-Cookie and P3P response headers Igor Sysoev <igor@sysoev.ru> parents: 2705 diff changeset	765 ngx_null_string
f905a6ab0ca8 hide cacheable Set-Cookie and P3P response headers Igor Sysoev <igor@sysoev.ru> parents: 2705 diff changeset	766 };
f905a6ab0ca8 hide cacheable Set-Cookie and P3P response headers Igor Sysoev <igor@sysoev.ru> parents: 2705 diff changeset	767
f905a6ab0ca8 hide cacheable Set-Cookie and P3P response headers Igor Sysoev <igor@sysoev.ru> parents: 2705 diff changeset	768
2705 d040c3786239 do not pass if-... headers for cacheable responses Igor Sysoev <igor@sysoev.ru> parents: 2672 diff changeset	769 #if (NGX_HTTP_CACHE)
d040c3786239 do not pass if-... headers for cacheable responses Igor Sysoev <igor@sysoev.ru> parents: 2672 diff changeset	770
d040c3786239 do not pass if-... headers for cacheable responses Igor Sysoev <igor@sysoev.ru> parents: 2672 diff changeset	771 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	772 { 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	773 { 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	774 { 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	775 { 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	776 { ngx_string("TE"), ngx_string("") },
2705 d040c3786239 do not pass if-... headers for cacheable responses Igor Sysoev <igor@sysoev.ru> parents: 2672 diff changeset	777 { ngx_string("Keep-Alive"), ngx_string("") },
d040c3786239 do not pass if-... headers for cacheable responses Igor Sysoev <igor@sysoev.ru> parents: 2672 diff changeset	778 { ngx_string("Expect"), ngx_string("") },
4276 a0f18c78db3b Fixed Upgrade header clearing with proxy_cache. Maxim Dounin <mdounin@mdounin.ru> parents: 4275 diff changeset	779 { ngx_string("Upgrade"), ngx_string("") },
5441 43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5391 diff changeset	780 { ngx_string("If-Modified-Since"),
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5391 diff changeset	781 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	782 { 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	783 { 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	784 { ngx_string("If-Match"), ngx_string("") },
d040c3786239 do not pass if-... headers for cacheable responses Igor Sysoev <igor@sysoev.ru> parents: 2672 diff changeset	785 { ngx_string("Range"), ngx_string("") },
d040c3786239 do not pass if-... headers for cacheable responses Igor Sysoev <igor@sysoev.ru> parents: 2672 diff changeset	786 { ngx_string("If-Range"), ngx_string("") },
d040c3786239 do not pass if-... headers for cacheable responses Igor Sysoev <igor@sysoev.ru> parents: 2672 diff changeset	787 { ngx_null_string, ngx_null_string }
d040c3786239 do not pass if-... headers for cacheable responses Igor Sysoev <igor@sysoev.ru> parents: 2672 diff changeset	788 };
d040c3786239 do not pass if-... headers for cacheable responses Igor Sysoev <igor@sysoev.ru> parents: 2672 diff changeset	789
2706 f905a6ab0ca8 hide cacheable Set-Cookie and P3P response headers Igor Sysoev <igor@sysoev.ru> parents: 2705 diff changeset	790 #endif
f905a6ab0ca8 hide cacheable Set-Cookie and P3P response headers Igor Sysoev <igor@sysoev.ru> parents: 2705 diff changeset	791
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	792
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	793 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	794
637 e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 629 diff changeset	795 { 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	796 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	797
637 e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 629 diff changeset	798 { 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	799 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	800
637 e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 629 diff changeset	801 { 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	802 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	803
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	804 #if 0
637 e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 629 diff changeset	805 { 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	806 #endif
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	807
637 e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 629 diff changeset	808 { ngx_string("proxy_internal_body_length"), NULL,
5203 bfb99b75833b Proxy: $proxy_internal_body_length fixed. Maxim Dounin <mdounin@mdounin.ru> parents: 5188 diff changeset	809 ngx_http_proxy_internal_body_length_variable, 0,
bfb99b75833b Proxy: $proxy_internal_body_length fixed. Maxim Dounin <mdounin@mdounin.ru> parents: 5188 diff changeset	810 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	811
6051 d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	812 { ngx_string("proxy_internal_chunked"), NULL,
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	813 ngx_http_proxy_internal_chunked_variable, 0,
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	814 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	815
637 e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 629 diff changeset	816 { 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	817 };
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	818
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	819
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	820 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	821 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	822 };
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	823
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	824
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	825 static ngx_int_t
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	826 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	827 {
5951 610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	828 ngx_int_t rc;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	829 ngx_http_upstream_t *u;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	830 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	831 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	832 #if (NGX_HTTP_CACHE)
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	833 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	834 #endif
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	835
3006 95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 2989 diff changeset	836 if (ngx_http_upstream_create(r) != NGX_OK) {
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	837 return NGX_HTTP_INTERNAL_SERVER_ERROR;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	838 }
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	839
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	840 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	841 if (ctx == NULL) {
6003 cf2f8d91cf09 Proxy: use an appropriate error on memory allocation failure. Ruslan Ermilov <ru@nginx.com> parents: 5951 diff changeset	842 return NGX_HTTP_INTERNAL_SERVER_ERROR;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	843 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	844
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	845 ngx_http_set_ctx(r, ctx, ngx_http_proxy_module);
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	846
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	847 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	848
3006 95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 2989 diff changeset	849 u = r->upstream;
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 2989 diff changeset	850
3733 527a0f8cae2a use NULL instead of 0 Igor Sysoev <igor@sysoev.ru> parents: 3731 diff changeset	851 if (plcf->proxy_lengths == NULL) {
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	852 ctx->vars = plcf->vars;
2391 d88e757cc7d8 delete surplus upstream.schema field Igor Sysoev <igor@sysoev.ru> parents: 2285 diff changeset	853 u->schema = plcf->vars.schema;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	854 #if (NGX_HTTP_SSL)
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	855 u->ssl = (plcf->upstream.ssl != NULL);
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	856 #endif
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	857
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	858 } else {
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	859 if (ngx_http_proxy_eval(r, ctx, plcf) != NGX_OK) {
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	860 return NGX_HTTP_INTERNAL_SERVER_ERROR;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	861 }
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
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	864 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	865
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	866 u->conf = &plcf->upstream;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	867
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	868 #if (NGX_HTTP_CACHE)
5951 610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	869 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	870
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	871 u->caches = &pmcf->caches;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	872 u->create_key = ngx_http_proxy_create_key;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	873 #endif
5951 610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	874
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	875 u->create_request = ngx_http_proxy_create_request;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	876 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	877 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	878 u->abort_request = ngx_http_proxy_abort_request;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	879 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	880 r->state = 0;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	881
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	882 if (plcf->redirects) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	883 u->rewrite_redirect = ngx_http_proxy_rewrite_redirect;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	884 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	885
4466 b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	886 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	887 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	888 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	889
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	890 u->buffering = plcf->upstream.buffering;
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	891
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	892 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	893 if (u->pipe == NULL) {
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	894 return NGX_HTTP_INTERNAL_SERVER_ERROR;
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 579 diff changeset	895 }
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	896
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	897 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	898 u->pipe->input_ctx = r;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	899
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	900 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	901 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	902 u->input_filter_ctx = r;
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	903
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	904 u->accel = 1;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	905
6050 a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	906 if (!plcf->upstream.request_buffering
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	907 && 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	908 && (!r->headers_in.chunked
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	909 \|\| plcf->http_version == NGX_HTTP_VERSION_11))
6050 a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	910 {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	911 r->request_body_no_buffering = 1;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	912 }
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	913
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	914 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	915
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	916 if (rc >= NGX_HTTP_SPECIAL_RESPONSE) {
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	917 return rc;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	918 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	919
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	920 return NGX_DONE;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	921 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	922
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	923
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	924 static ngx_int_t
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	925 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	926 ngx_http_proxy_loc_conf_t *plcf)
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	927 {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	928 u_char *p;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	929 size_t add;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	930 u_short port;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	931 ngx_str_t proxy;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	932 ngx_url_t url;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	933 ngx_http_upstream_t *u;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	934
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	935 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	936 plcf->proxy_values->elts)
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	937 == NULL)
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	938 {
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	939 return NGX_ERROR;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	940 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	941
3977 2527cdb8d31f test length of proxy_pass with variables Igor Sysoev <igor@sysoev.ru> parents: 3976 diff changeset	942 if (proxy.len > 7
2527cdb8d31f test length of proxy_pass with variables Igor Sysoev <igor@sysoev.ru> parents: 3976 diff changeset	943 && 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	944 {
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	945 add = 7;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	946 port = 80;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	947
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	948 #if (NGX_HTTP_SSL)
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	949
3977 2527cdb8d31f test length of proxy_pass with variables Igor Sysoev <igor@sysoev.ru> parents: 3976 diff changeset	950 } else if (proxy.len > 8
2527cdb8d31f test length of proxy_pass with variables Igor Sysoev <igor@sysoev.ru> parents: 3976 diff changeset	951 && 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	952 {
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	953 add = 8;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	954 port = 443;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	955 r->upstream->ssl = 1;
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 #endif
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	958
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	959 } else {
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	960 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	961 "invalid URL prefix in \"%V\"", &proxy);
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	962 return NGX_ERROR;
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
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	965 u = r->upstream;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	966
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	967 u->schema.len = add;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	968 u->schema.data = proxy.data;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	969
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	970 ngx_memzero(&url, sizeof(ngx_url_t));
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	971
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	972 url.url.len = proxy.len - add;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	973 url.url.data = proxy.data + add;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	974 url.default_port = port;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	975 url.uri_part = 1;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	976 url.no_resolve = 1;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	977
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	978 if (ngx_parse_url(r->pool, &url) != NGX_OK) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	979 if (url.err) {
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	980 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	981 "%s in upstream \"%V\"", url.err, &url.url);
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	982 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	983
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	984 return NGX_ERROR;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	985 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	986
3323 9421e997c2c4 allow "proxy_pass http://$backend" without URI part Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	987 if (url.uri.len) {
9421e997c2c4 allow "proxy_pass http://$backend" without URI part Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	988 if (url.uri.data[0] == '?') {
9421e997c2c4 allow "proxy_pass http://$backend" without URI part Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	989 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	990 if (p == NULL) {
9421e997c2c4 allow "proxy_pass http://$backend" without URI part Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	991 return NGX_ERROR;
9421e997c2c4 allow "proxy_pass http://$backend" without URI part Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	992 }
9421e997c2c4 allow "proxy_pass http://$backend" without URI part Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	993
9421e997c2c4 allow "proxy_pass http://$backend" without URI part Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	994 *p++ = '/';
9421e997c2c4 allow "proxy_pass http://$backend" without URI part Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	995 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	996
9421e997c2c4 allow "proxy_pass http://$backend" without URI part Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	997 url.uri.len++;
9421e997c2c4 allow "proxy_pass http://$backend" without URI part Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	998 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	999 }
c3035feb6638 fix case proxy_pass URL is evaluted to http://host?args Igor Sysoev <igor@sysoev.ru> parents: 2268 diff changeset	1000 }
c3035feb6638 fix case proxy_pass URL is evaluted to http://host?args Igor Sysoev <igor@sysoev.ru> parents: 2268 diff changeset	1001
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1002 ctx->vars.key_start = u->schema;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1003
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1004 ngx_http_proxy_set_vars(&url, &ctx->vars);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1005
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1006 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	1007 if (u->resolved == NULL) {
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1008 return NGX_ERROR;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1009 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1010
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1011 if (url.addrs && url.addrs[0].sockaddr) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1012 u->resolved->sockaddr = url.addrs[0].sockaddr;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1013 u->resolved->socklen = url.addrs[0].socklen;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1014 u->resolved->naddrs = 1;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1015 u->resolved->host = url.addrs[0].name;
2422 7af1e5fe102c variable support for unix sockets in fastcgi_pass and proxy_pass Igor Sysoev <igor@sysoev.ru> parents: 2391 diff changeset	1016
7af1e5fe102c variable support for unix sockets in fastcgi_pass and proxy_pass Igor Sysoev <igor@sysoev.ru> parents: 2391 diff changeset	1017 } else {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1018 u->resolved->host = url.host;
2422 7af1e5fe102c variable support for unix sockets in fastcgi_pass and proxy_pass Igor Sysoev <igor@sysoev.ru> parents: 2391 diff changeset	1019 }
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1020
6303 a93345ee8f52 Upstream: fixed "no port" detection in evaluated upstreams. Ruslan Ermilov <ru@nginx.com> parents: 6290 diff changeset	1021 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	1022 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	1023
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1024 return NGX_OK;
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
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1027
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1028 #if (NGX_HTTP_CACHE)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1029
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1030 static ngx_int_t
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1031 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	1032 {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1033 size_t len, loc_len;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1034 u_char *p;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1035 uintptr_t escape;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1036 ngx_str_t *key;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1037 ngx_http_upstream_t *u;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1038 ngx_http_proxy_ctx_t *ctx;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1039 ngx_http_proxy_loc_conf_t *plcf;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1040
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1041 u = r->upstream;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1042
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1043 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	1044
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1045 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	1046
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1047 key = ngx_array_push(&r->cache->keys);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1048 if (key == NULL) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1049 return NGX_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1050 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1051
4947 4251e72b8bb4 Allow the complex value to be defined as an empty string. Ruslan Ermilov <ru@nginx.com> parents: 4927 diff changeset	1052 if (plcf->cache_key.value.data) {
2672 b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	1053
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	1054 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	1055 return NGX_ERROR;
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	1056 }
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	1057
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	1058 return NGX_OK;
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	1059 }
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	1060
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1061 *key = ctx->vars.key_start;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1062
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1063 key = ngx_array_push(&r->cache->keys);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1064 if (key == NULL) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1065 return NGX_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1066 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1067
4377 726a1ca9b52b Proxy: made proxy_pass with variables more consistent. Maxim Dounin <mdounin@mdounin.ru> parents: 4336 diff changeset	1068 if (plcf->proxy_lengths && ctx->vars.uri.len) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1069
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1070 *key = ctx->vars.uri;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1071 u->uri = ctx->vars.uri;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1072
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1073 return NGX_OK;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1074
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1075 } 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	1076 {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1077 *key = r->unparsed_uri;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1078 u->uri = r->unparsed_uri;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1079
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1080 return NGX_OK;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1081 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1082
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1083 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	1084
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1085 if (r->quoted_uri \|\| r->internal) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1086 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	1087 r->uri.len - loc_len, NGX_ESCAPE_URI);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1088 } else {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1089 escape = 0;
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
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1092 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	1093 + sizeof("?") - 1 + r->args.len;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1094
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1095 p = ngx_pnalloc(r->pool, len);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1096 if (p == NULL) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1097 return NGX_ERROR;
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
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1100 key->data = p;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1101
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1102 if (r->valid_location) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1103 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	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 if (escape) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1107 ngx_escape_uri(p, r->uri.data + loc_len,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1108 r->uri.len - loc_len, NGX_ESCAPE_URI);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1109 p += r->uri.len - loc_len + escape;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1110
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1111 } else {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1112 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	1113 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1114
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1115 if (r->args.len > 0) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1116 *p++ = '?';
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1117 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	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 key->len = p - key->data;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1121 u->uri = *key;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1122
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1123 return NGX_OK;
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
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1126 #endif
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
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1129 static ngx_int_t
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1130 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	1131 {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1132 size_t len, uri_len, loc_len, body_len;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1133 uintptr_t escape;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1134 ngx_buf_t *b;
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1135 ngx_str_t method;
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1136 ngx_uint_t i, unparsed_uri;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1137 ngx_chain_t cl, body;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1138 ngx_list_part_t *part;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1139 ngx_table_elt_t *header;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1140 ngx_http_upstream_t *u;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1141 ngx_http_proxy_ctx_t *ctx;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1142 ngx_http_script_code_pt code;
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	1143 ngx_http_proxy_headers_t *headers;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1144 ngx_http_script_engine_t e, le;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1145 ngx_http_proxy_loc_conf_t *plcf;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1146 ngx_http_script_len_code_pt lcode;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1147
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1148 u = r->upstream;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1149
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1150 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	1151
5909 8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	1152 #if (NGX_HTTP_CACHE)
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	1153 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	1154 #else
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	1155 headers = &plcf->headers;
5909 8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	1156 #endif
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	1157
561 e48ebafc6939 nginx-0.3.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 555 diff changeset	1158 if (u->method.len) {
e48ebafc6939 nginx-0.3.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 555 diff changeset	1159 /* HEAD was changed to GET to cache response */
e48ebafc6939 nginx-0.3.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 555 diff changeset	1160 method = u->method;
e48ebafc6939 nginx-0.3.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 555 diff changeset	1161
e48ebafc6939 nginx-0.3.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 555 diff changeset	1162 } else if (plcf->method.len) {
e48ebafc6939 nginx-0.3.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 555 diff changeset	1163 method = plcf->method;
e48ebafc6939 nginx-0.3.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 555 diff changeset	1164
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1165 } else {
561 e48ebafc6939 nginx-0.3.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 555 diff changeset	1166 method = r->method_name;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1167 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1168
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1169 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	1170
6311 44122bddd9a1 Proxy: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 6303 diff changeset	1171 if (method.len == 4
44122bddd9a1 Proxy: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 6303 diff changeset	1172 && 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	1173 {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1174 ctx->head = 1;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1175 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1176
6311 44122bddd9a1 Proxy: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 6303 diff changeset	1177 len = method.len + 1 + sizeof(ngx_http_proxy_version) - 1
44122bddd9a1 Proxy: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 6303 diff changeset	1178 + sizeof(CRLF) - 1;
1667 e9bd042134cb fix segfault Igor Sysoev <igor@sysoev.ru> parents: 1658 diff changeset	1179
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1180 escape = 0;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1181 loc_len = 0;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1182 unparsed_uri = 0;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1183
4377 726a1ca9b52b Proxy: made proxy_pass with variables more consistent. Maxim Dounin <mdounin@mdounin.ru> parents: 4336 diff changeset	1184 if (plcf->proxy_lengths && ctx->vars.uri.len) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1185 uri_len = ctx->vars.uri.len;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1186
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1187 } 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	1188 {
609 608cf78b24ef nginx-0.3.26-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 605 diff changeset	1189 unparsed_uri = 1;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1190 uri_len = r->unparsed_uri.len;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1191
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1192 } else {
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1193 loc_len = (r->valid_location && ctx->vars.uri.len) ?
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1194 plcf->location.len : 0;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1195
3615 31e9677b15a1 allow spaces in URI Igor Sysoev <igor@sysoev.ru> parents: 3606 diff changeset	1196 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	1197 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	1198 r->uri.len - loc_len, NGX_ESCAPE_URI);
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1199 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1200
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1201 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	1202 + sizeof("?") - 1 + r->args.len;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1203 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1204
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1205 if (uri_len == 0) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1206 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	1207 "zero length URI to proxy");
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1208 return NGX_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1209 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1210
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1211 len += uri_len;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1212
5211 ecd762770729 Proxy: clear script engine used to calculate lengths. Maxim Dounin <mdounin@mdounin.ru> parents: 5203 diff changeset	1213 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	1214
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	1215 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	1216 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	1217
5910 29fa5023bd6f Proxy: renamed and rearranged fields in proxy configuration. Roman Arutyunyan <arut@nginx.com> parents: 5909 diff changeset	1218 if (plcf->body_lengths) {
29fa5023bd6f Proxy: renamed and rearranged fields in proxy configuration. Roman Arutyunyan <arut@nginx.com> parents: 5909 diff changeset	1219 le.ip = plcf->body_lengths->elts;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1220 le.request = r;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1221 le.flushed = 1;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1222 body_len = 0;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1223
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1224 while ((uintptr_t ) le.ip) {
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1225 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	1226 body_len += lcode(&le);
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1227 }
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1228
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1229 ctx->internal_body_length = body_len;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1230 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	1231
6051 d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1232 } 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	1233 ctx->internal_body_length = -1;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1234 ctx->internal_chunked = 1;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1235
4927 93294110728f Request body: always use calculated size of a request body in proxy. Maxim Dounin <mdounin@mdounin.ru> parents: 4925 diff changeset	1236 } else {
93294110728f Request body: always use calculated size of a request body in proxy. Maxim Dounin <mdounin@mdounin.ru> parents: 4925 diff changeset	1237 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	1238 }
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1239
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	1240 le.ip = headers->lengths->elts;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1241 le.request = r;
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	1242 le.flushed = 1;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1243
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1244 while ((uintptr_t ) le.ip) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1245 while ((uintptr_t ) le.ip) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1246 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	1247 len += lcode(&le);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1248 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1249 le.ip += sizeof(uintptr_t);
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1250 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1251
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1252
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1253 if (plcf->upstream.pass_request_headers) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1254 part = &r->headers_in.headers.part;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1255 header = part->elts;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1256
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1257 for (i = 0; /* void */; i++) {
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1258
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1259 if (i >= part->nelts) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1260 if (part->next == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1261 break;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1262 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1263
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1264 part = part->next;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1265 header = part->elts;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1266 i = 0;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1267 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1268
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	1269 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	1270 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	1271 {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1272 continue;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1273 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1274
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1275 len += header[i].key.len + sizeof(": ") - 1
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1276 + header[i].value.len + sizeof(CRLF) - 1;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1277 }
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1278 }
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1279
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1280
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1281 b = ngx_create_temp_buf(r->pool, len);
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1282 if (b == NULL) {
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1283 return NGX_ERROR;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1284 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1285
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1286 cl = ngx_alloc_chain_link(r->pool);
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1287 if (cl == NULL) {
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1288 return NGX_ERROR;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1289 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1290
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1291 cl->buf = b;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1292
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 /* the request line */
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1295
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	1296 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	1297 *b->last++ = ' ';
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1298
555 7bd37aef1e7e nginx-0.2.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 551 diff changeset	1299 u->uri.data = b->last;
7bd37aef1e7e nginx-0.2.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 551 diff changeset	1300
4377 726a1ca9b52b Proxy: made proxy_pass with variables more consistent. Maxim Dounin <mdounin@mdounin.ru> parents: 4336 diff changeset	1301 if (plcf->proxy_lengths && ctx->vars.uri.len) {
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1302 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	1303
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1304 } else if (unparsed_uri) {
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	1305 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	1306
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1307 } else {
555 7bd37aef1e7e nginx-0.2.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 551 diff changeset	1308 if (r->valid_location) {
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1309 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	1310 }
551 483cca230603 nginx-0.2.4-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 547 diff changeset	1311
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1312 if (escape) {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1313 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	1314 r->uri.len - loc_len, NGX_ESCAPE_URI);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1315 b->last += r->uri.len - loc_len + escape;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1316
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1317 } else {
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	1318 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	1319 r->uri.len - loc_len);
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1320 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1321
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1322 if (r->args.len > 0) {
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1323 *b->last++ = '?';
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	1324 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	1325 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1326 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1327
555 7bd37aef1e7e nginx-0.2.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 551 diff changeset	1328 u->uri.len = b->last - u->uri.data;
7bd37aef1e7e nginx-0.2.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 551 diff changeset	1329
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1330 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	1331 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	1332 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	1333
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1334 } else {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1335 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	1336 sizeof(ngx_http_proxy_version) - 1);
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1337 }
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1338
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1339 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	1340
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	1341 e.ip = headers->values->elts;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1342 e.pos = b->last;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1343 e.request = r;
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	1344 e.flushed = 1;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1345
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	1346 le.ip = headers->lengths->elts;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1347
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1348 while ((uintptr_t ) le.ip) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1349 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	1350
417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	1351 /* skip the header line name length */
417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	1352 (void) lcode(&le);
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1353
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1354 if ((ngx_http_script_len_code_pt ) le.ip) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1355
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1356 for (len = 0; (uintptr_t ) le.ip; len += lcode(&le)) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1357 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	1358 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1359
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1360 e.skip = (len == sizeof(CRLF) - 1) ? 1 : 0;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1361
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1362 } else {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1363 e.skip = 0;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1364 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1365
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1366 le.ip += sizeof(uintptr_t);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1367
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1368 while ((uintptr_t ) e.ip) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1369 code = (ngx_http_script_code_pt ) e.ip;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1370 code((ngx_http_script_engine_t *) &e);
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1371 }
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1372 e.ip += sizeof(uintptr_t);
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1373 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1374
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1375 b->last = e.pos;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1376
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1377
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1378 if (plcf->upstream.pass_request_headers) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1379 part = &r->headers_in.headers.part;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1380 header = part->elts;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1381
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1382 for (i = 0; /* void */; i++) {
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1383
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1384 if (i >= part->nelts) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1385 if (part->next == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1386 break;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1387 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1388
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1389 part = part->next;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1390 header = part->elts;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1391 i = 0;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1392 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1393
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	1394 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	1395 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	1396 {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1397 continue;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1398 }
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1399
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	1400 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	1401
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1402 b->last++ = ':'; b->last++ = ' ';
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1403
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	1404 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	1405 header[i].value.len);
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1406
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1407 b->last++ = CR; b->last++ = LF;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1408
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1409 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	1410 "http proxy header: \"%V: %V\"",
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1411 &header[i].key, &header[i].value);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1412 }
507 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
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1415
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1416 /* add "\r\n" at the header end */
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1417 b->last++ = CR; b->last++ = LF;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1418
5910 29fa5023bd6f Proxy: renamed and rearranged fields in proxy configuration. Roman Arutyunyan <arut@nginx.com> parents: 5909 diff changeset	1419 if (plcf->body_values) {
29fa5023bd6f Proxy: renamed and rearranged fields in proxy configuration. Roman Arutyunyan <arut@nginx.com> parents: 5909 diff changeset	1420 e.ip = plcf->body_values->elts;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1421 e.pos = b->last;
6043 613b14b305c7 Proxy: fixed proxy_set_body with proxy_cache. Maxim Dounin <mdounin@mdounin.ru> parents: 6003 diff changeset	1422 e.skip = 0;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1423
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1424 while ((uintptr_t ) e.ip) {
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1425 code = (ngx_http_script_code_pt ) e.ip;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1426 code((ngx_http_script_engine_t *) &e);
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1427 }
579 4c5c2c55975c nginx-0.3.11-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	1428
4c5c2c55975c nginx-0.3.11-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	1429 b->last = e.pos;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1430 }
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1431
1774 68d21fd1dc64 use %s format Igor Sysoev <igor@sysoev.ru>* parents: 1701 diff changeset	1432 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	1433 "http proxy header:%N\"%*s\"",
1774 68d21fd1dc64 use %s format Igor Sysoev <igor@sysoev.ru>* parents: 1701 diff changeset	1434 (size_t) (b->last - b->pos), b->pos);
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1435
6050 a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	1436 if (r->request_body_no_buffering) {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	1437
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	1438 u->request_bufs = cl;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	1439
6051 d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1440 if (ctx->internal_chunked) {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1441 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	1442 u->output.filter_ctx = r;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1443 }
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1444
6050 a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	1445 } 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	1446
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1447 body = u->request_bufs;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1448 u->request_bufs = cl;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1449
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1450 while (body) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1451 b = ngx_alloc_buf(r->pool);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1452 if (b == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1453 return NGX_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1454 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1455
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1456 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	1457
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1458 cl->next = ngx_alloc_chain_link(r->pool);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1459 if (cl->next == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1460 return NGX_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1461 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1462
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1463 cl = cl->next;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1464 cl->buf = b;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1465
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1466 body = body->next;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1467 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1468
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1469 } else {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1470 u->request_bufs = cl;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1471 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1472
4009 3183165283cc Fixing proxy_set_body and proxy_pass_request_body with SSL. Maxim Dounin <mdounin@mdounin.ru> parents: 3977 diff changeset	1473 b->flush = 1;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1474 cl->next = NULL;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1475
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1476 return NGX_OK;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1477 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1478
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1479
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1480 static ngx_int_t
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1481 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	1482 {
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1483 ngx_http_proxy_ctx_t *ctx;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1484
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1485 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	1486
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1487 if (ctx == NULL) {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1488 return NGX_OK;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1489 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1490
3627 9061fdb2ed8c use ngx_http_parse_status_line() Igor Sysoev <igor@sysoev.ru> parents: 3615 diff changeset	1491 ctx->status.code = 0;
9061fdb2ed8c use ngx_http_parse_status_line() Igor Sysoev <igor@sysoev.ru> parents: 3615 diff changeset	1492 ctx->status.count = 0;
9061fdb2ed8c use ngx_http_parse_status_line() Igor Sysoev <igor@sysoev.ru> parents: 3615 diff changeset	1493 ctx->status.start = NULL;
9061fdb2ed8c use ngx_http_parse_status_line() Igor Sysoev <igor@sysoev.ru> parents: 3615 diff changeset	1494 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	1495 ctx->chunked.state = 0;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1496
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1497 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	1498 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	1499 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	1500 r->state = 0;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1501
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1502 return NGX_OK;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1503 }
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 static ngx_int_t
6051 d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1507 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	1508 {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1509 ngx_http_request_t *r = data;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1510
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1511 off_t size;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1512 u_char *chunk;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1513 ngx_int_t rc;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1514 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	1515 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	1516 ngx_http_proxy_ctx_t *ctx;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1517
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1518 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	1519 "proxy output filter");
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1520
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1521 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	1522
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1523 if (in == NULL) {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1524 out = in;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1525 goto out;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1526 }
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1527
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1528 out = NULL;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1529 ll = &out;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1530
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1531 if (!ctx->header_sent) {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1532 /* first buffer contains headers, pass it unmodified */
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1533
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1534 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	1535 "proxy output header");
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1536
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1537 ctx->header_sent = 1;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1538
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1539 tl = ngx_alloc_chain_link(r->pool);
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1540 if (tl == NULL) {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1541 return NGX_ERROR;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1542 }
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1543
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1544 tl->buf = in->buf;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1545 *ll = tl;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1546 ll = &tl->next;
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 in = in->next;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1549
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1550 if (in == NULL) {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1551 tl->next = NULL;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1552 goto out;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1553 }
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
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1556 size = 0;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1557 cl = in;
6056 24ccec3c4a87 Proxy: fixed proxy_request_buffering and chunked with preread body. Maxim Dounin <mdounin@mdounin.ru> parents: 6051 diff changeset	1558 fl = ll;
6051 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 for ( ;; ) {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1561 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
6480 f01ab2dbcfdc Fixed logging. Sergey Kandaurov <pluknet@nginx.com> parents: 6467 diff changeset	1562 "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	1563
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1564 size += ngx_buf_size(cl->buf);
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1565
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1566 if (cl->buf->flush
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1567 \|\| cl->buf->sync
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1568 \|\| ngx_buf_in_memory(cl->buf)
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1569 \|\| cl->buf->in_file)
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 tl = ngx_alloc_chain_link(r->pool);
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1572 if (tl == NULL) {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1573 return NGX_ERROR;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1574 }
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->buf = cl->buf;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1577 *ll = tl;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1578 ll = &tl->next;
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 if (cl->next == NULL) {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1582 break;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1583 }
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 cl = cl->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
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1588 if (size) {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1589 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	1590 if (tl == NULL) {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1591 return NGX_ERROR;
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
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1594 b = tl->buf;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1595 chunk = b->start;
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 if (chunk == NULL) {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1598 /* the "0000000000000000" is 64-bit hexadecimal string */
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1599
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1600 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	1601 if (chunk == NULL) {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1602 return NGX_ERROR;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1603 }
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1604
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1605 b->start = chunk;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1606 b->end = chunk + sizeof("0000000000000000" CRLF) - 1;
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
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1609 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	1610 b->memory = 0;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1611 b->temporary = 1;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1612 b->pos = chunk;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1613 b->last = ngx_sprintf(chunk, "%xO" CRLF, size);
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1614
6056 24ccec3c4a87 Proxy: fixed proxy_request_buffering and chunked with preread body. Maxim Dounin <mdounin@mdounin.ru> parents: 6051 diff changeset	1615 tl->next = *fl;
24ccec3c4a87 Proxy: fixed proxy_request_buffering and chunked with preread body. Maxim Dounin <mdounin@mdounin.ru> parents: 6051 diff changeset	1616 *fl = tl;
6051 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
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1619 if (cl->buf->last_buf) {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1620 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	1621 if (tl == NULL) {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1622 return NGX_ERROR;
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 b = tl->buf;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1626
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1627 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	1628 b->temporary = 0;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1629 b->memory = 1;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1630 b->last_buf = 1;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1631 b->pos = (u_char *) CRLF "0" CRLF CRLF;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1632 b->last = b->pos + 7;
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 cl->buf->last_buf = 0;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1635
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1636 *ll = tl;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1637
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1638 if (size == 0) {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1639 b->pos += 2;
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 } else if (size > 0) {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1643 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	1644 if (tl == NULL) {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1645 return NGX_ERROR;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1646 }
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1647
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1648 b = tl->buf;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1649
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1650 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	1651 b->temporary = 0;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1652 b->memory = 1;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1653 b->pos = (u_char *) CRLF;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1654 b->last = b->pos + 2;
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 *ll = tl;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1657
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1658 } else {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1659 *ll = NULL;
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 out:
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 rc = ngx_chain_writer(&r->upstream->writer, out);
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1665
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1666 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	1667 (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	1668
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1669 return rc;
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
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 static ngx_int_t
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1674 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	1675 {
3628 cf47471a9eda make code more obviuos Igor Sysoev <igor@sysoev.ru> parents: 3627 diff changeset	1676 size_t len;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1677 ngx_int_t rc;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1678 ngx_http_upstream_t *u;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1679 ngx_http_proxy_ctx_t *ctx;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1680
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1681 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	1682
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1683 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	1684 return NGX_ERROR;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1685 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1686
3627 9061fdb2ed8c use ngx_http_parse_status_line() Igor Sysoev <igor@sysoev.ru> parents: 3615 diff changeset	1687 u = r->upstream;
9061fdb2ed8c use ngx_http_parse_status_line() Igor Sysoev <igor@sysoev.ru> parents: 3615 diff changeset	1688
9061fdb2ed8c use ngx_http_parse_status_line() Igor Sysoev <igor@sysoev.ru> parents: 3615 diff changeset	1689 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	1690
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1691 if (rc == NGX_AGAIN) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1692 return rc;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1693 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1694
3627 9061fdb2ed8c use ngx_http_parse_status_line() Igor Sysoev <igor@sysoev.ru> parents: 3615 diff changeset	1695 if (rc == NGX_ERROR) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1696
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1697 #if (NGX_HTTP_CACHE)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1698
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1699 if (r->cache) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1700 r->http_version = NGX_HTTP_VERSION_9;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1701 return NGX_OK;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1702 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1703
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1704 #endif
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1705
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1706 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	1707 "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	1708
619 7a16e281c01f nginx-0.3.31-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 611 diff changeset	1709 #if 0
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1710 if (u->accel) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1711 return NGX_HTTP_UPSTREAM_INVALID_HEADER;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1712 }
619 7a16e281c01f nginx-0.3.31-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 611 diff changeset	1713 #endif
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1714
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1715 r->http_version = NGX_HTTP_VERSION_9;
1616 0a293900d21b set status in correct place Igor Sysoev <igor@sysoev.ru> parents: 1565 diff changeset	1716 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	1717 u->headers_in.connection_close = 1;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1718
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1719 return NGX_OK;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1720 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1721
5575 d15822784cf9 Upstream: fix $upstream_status variable. Piotr Sikora <piotr@cloudflare.com> parents: 5466 diff changeset	1722 if (u->state && u->state->status == 0) {
3627 9061fdb2ed8c use ngx_http_parse_status_line() Igor Sysoev <igor@sysoev.ru> parents: 3615 diff changeset	1723 u->state->status = ctx->status.code;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1724 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1725
3627 9061fdb2ed8c use ngx_http_parse_status_line() Igor Sysoev <igor@sysoev.ru> parents: 3615 diff changeset	1726 u->headers_in.status_n = ctx->status.code;
9061fdb2ed8c use ngx_http_parse_status_line() Igor Sysoev <igor@sysoev.ru> parents: 3615 diff changeset	1727
3628 cf47471a9eda make code more obviuos Igor Sysoev <igor@sysoev.ru> parents: 3627 diff changeset	1728 len = ctx->status.end - ctx->status.start;
cf47471a9eda make code more obviuos Igor Sysoev <igor@sysoev.ru> parents: 3627 diff changeset	1729 u->headers_in.status_line.len = len;
cf47471a9eda make code more obviuos Igor Sysoev <igor@sysoev.ru> parents: 3627 diff changeset	1730
cf47471a9eda make code more obviuos Igor Sysoev <igor@sysoev.ru> parents: 3627 diff changeset	1731 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	1732 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	1733 return NGX_ERROR;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1734 }
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	1735
3628 cf47471a9eda make code more obviuos Igor Sysoev <igor@sysoev.ru> parents: 3627 diff changeset	1736 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	1737
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1738 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	1739 "http proxy status %ui \"%V\"",
936 2864303e0ce5 fix debug log Igor Sysoev <igor@sysoev.ru> parents: 906 diff changeset	1740 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	1741
4125 e5df04b05e75 Protocol version parsing in ngx_http_parse_status_line(). Maxim Dounin <mdounin@mdounin.ru> parents: 4009 diff changeset	1742 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	1743 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	1744 }
e5df04b05e75 Protocol version parsing in ngx_http_parse_status_line(). Maxim Dounin <mdounin@mdounin.ru> parents: 4009 diff changeset	1745
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1746 u->process_header = ngx_http_proxy_process_header;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1747
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1748 return ngx_http_proxy_process_header(r);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1749 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1750
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 static ngx_int_t
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1753 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	1754 {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1755 ngx_int_t rc;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1756 ngx_table_elt_t *h;
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1757 ngx_http_upstream_t *u;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1758 ngx_http_proxy_ctx_t *ctx;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1759 ngx_http_upstream_header_t *hh;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1760 ngx_http_upstream_main_conf_t *umcf;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1761
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1762 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	1763
2024 7018254cc006 style fix Igor Sysoev <igor@sysoev.ru> parents: 1925 diff changeset	1764 for ( ;; ) {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1765
2256 8c17cfe63d2c underscores_in_headers Igor Sysoev <igor@sysoev.ru> parents: 2233 diff changeset	1766 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	1767
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1768 if (rc == NGX_OK) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1769
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1770 /* a header line has been parsed successfully */
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1771
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1772 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	1773 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	1774 return NGX_ERROR;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1775 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1776
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1777 h->hash = r->header_hash;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1778
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1779 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	1780 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	1781
2049 2a92804f4109 ) back out r2040 Igor Sysoev <igor@sysoev.ru>* parents: 2030 diff changeset	1782 h->key.data = ngx_pnalloc(r->pool,
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1783 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	1784 if (h->key.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	1785 return NGX_ERROR;
509 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 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	1789 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	1790
4529 1ebec1d15a25 Fixed incorrect ngx_cpystrn() usage in ngx_http__process_header(). Maxim Dounin <mdounin@mdounin.ru>* parents: 4499 diff changeset	1791 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	1792 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	1793 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	1794 h->value.data[h->value.len] = '\0';
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1795
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1796 if (h->key.len == r->lowcase_index) {
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1797 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	1798
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1799 } else {
2135 8c6521eedf84 ngx_strlow() Igor Sysoev <igor@sysoev.ru> parents: 2067 diff changeset	1800 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	1801 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1802
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1803 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	1804 h->lowcase_key, h->key.len);
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1805
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1806 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	1807 return NGX_ERROR;
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1808 }
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1809
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1810 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	1811 "http proxy header: \"%V: %V\"",
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1812 &h->key, &h->value);
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 continue;
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
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1817 if (rc == NGX_HTTP_PARSE_HEADER_DONE) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1818
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1819 /* a whole header has been parsed successfully */
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1820
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1821 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	1822 "http proxy header done");
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1823
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1824 /*
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1825 * if no "Server" and "Date" in header line,
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1826 * then add the special empty headers
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1827 */
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1828
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1829 if (r->upstream->headers_in.server == NULL) {
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1830 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	1831 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	1832 return NGX_ERROR;
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1833 }
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1834
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1835 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	1836 ngx_hash('s', 'e'), 'r'), 'v'), 'e'), 'r');
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1837
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3477 diff changeset	1838 ngx_str_set(&h->key, "Server");
dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3477 diff changeset	1839 ngx_str_null(&h->value);
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1840 h->lowcase_key = (u_char *) "server";
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1841 }
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1842
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1843 if (r->upstream->headers_in.date == NULL) {
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1844 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	1845 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	1846 return NGX_ERROR;
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1847 }
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1848
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1849 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	1850
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3477 diff changeset	1851 ngx_str_set(&h->key, "Date");
dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3477 diff changeset	1852 ngx_str_null(&h->value);
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1853 h->lowcase_key = (u_char *) "date";
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1854 }
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1855
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1856 /* 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	1857
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1858 u = r->upstream;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1859
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1860 if (u->headers_in.chunked) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1861 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	1862 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1863
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1864 /*
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1865 * 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	1866 * 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	1867 */
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1868
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1869 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	1870
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1871 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	1872 \|\| 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	1873 \|\| ctx->head
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1874 \|\| (!u->headers_in.chunked
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1875 && 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	1876 {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1877 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	1878 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1879
5072 7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5012 diff changeset	1880 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	1881 u->keepalive = 0;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5012 diff changeset	1882
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5012 diff changeset	1883 if (r->headers_in.upgrade) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5012 diff changeset	1884 u->upgrade = 1;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5012 diff changeset	1885 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5012 diff changeset	1886 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5012 diff changeset	1887
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1888 return NGX_OK;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1889 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1890
521 6f00349b98e5 nginx-0.1.35-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 519 diff changeset	1891 if (rc == NGX_AGAIN) {
6f00349b98e5 nginx-0.1.35-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 519 diff changeset	1892 return NGX_AGAIN;
6f00349b98e5 nginx-0.1.35-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 519 diff changeset	1893 }
6f00349b98e5 nginx-0.1.35-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 519 diff changeset	1894
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1895 /* there was error while a header line parsing */
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1896
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1897 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	1898 "upstream sent invalid header");
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1899
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1900 return NGX_HTTP_UPSTREAM_INVALID_HEADER;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1901 }
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1902 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1903
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1904
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1905 static ngx_int_t
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1906 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	1907 {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1908 ngx_http_request_t *r = data;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1909 ngx_http_upstream_t *u;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1910 ngx_http_proxy_ctx_t *ctx;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1911
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1912 u = r->upstream;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1913 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	1914
4602 8036fc6af2df Proxy: added ctx checking to input filters. Maxim Dounin <mdounin@mdounin.ru> parents: 4593 diff changeset	1915 if (ctx == NULL) {
8036fc6af2df Proxy: added ctx checking to input filters. Maxim Dounin <mdounin@mdounin.ru> parents: 4593 diff changeset	1916 return NGX_ERROR;
8036fc6af2df Proxy: added ctx checking to input filters. Maxim Dounin <mdounin@mdounin.ru> parents: 4593 diff changeset	1917 }
8036fc6af2df Proxy: added ctx checking to input filters. Maxim Dounin <mdounin@mdounin.ru> parents: 4593 diff changeset	1918
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1919 ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
6480 f01ab2dbcfdc Fixed logging. Sergey Kandaurov <pluknet@nginx.com> parents: 6467 diff changeset	1920 "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	1921 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	1922 u->headers_in.content_length_n);
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1923
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1924 /* 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	1925
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1926 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	1927 \|\| 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	1928 \|\| ctx->head)
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1929 {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1930 /* 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	1931 /* 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	1932
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1933 u->pipe->length = 0;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1934 u->length = 0;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1935 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	1936
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1937 } else if (u->headers_in.chunked) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1938 /* chunked */
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1939
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1940 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	1941 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	1942
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1943 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	1944 u->length = 1;
4126 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 } 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	1947 /* 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	1948
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1949 u->pipe->length = 0;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1950 u->length = 0;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1951 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	1952
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1953 } else {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1954 /* content length or connection close */
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1955
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1956 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	1957 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	1958 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1959
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1960 return NGX_OK;
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
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 static ngx_int_t
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1965 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	1966 {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1967 ngx_buf_t *b;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1968 ngx_chain_t *cl;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1969 ngx_http_request_t *r;
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 if (buf->pos == buf->last) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1972 return NGX_OK;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1973 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1974
5466 e7b3b9855be8 Use ngx_chain_get_free_buf() in pipe input filters. Valentin Bartenev <vbart@nginx.com> parents: 5441 diff changeset	1975 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	1976 if (cl == NULL) {
e7b3b9855be8 Use ngx_chain_get_free_buf() in pipe input filters. Valentin Bartenev <vbart@nginx.com> parents: 5441 diff changeset	1977 return NGX_ERROR;
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1978 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1979
5466 e7b3b9855be8 Use ngx_chain_get_free_buf() in pipe input filters. Valentin Bartenev <vbart@nginx.com> parents: 5441 diff changeset	1980 b = cl->buf;
e7b3b9855be8 Use ngx_chain_get_free_buf() in pipe input filters. Valentin Bartenev <vbart@nginx.com> parents: 5441 diff changeset	1981
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1982 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	1983 b->shadow = buf;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1984 b->tag = p->tag;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1985 b->last_shadow = 1;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1986 b->recycled = 1;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1987 buf->shadow = b;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1988
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1989 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	1990
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1991 if (p->in) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1992 *p->last_in = cl;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1993 } else {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1994 p->in = cl;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1995 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1996 p->last_in = &cl->next;
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 if (p->length == -1) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1999 return NGX_OK;
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 p->length -= b->last - b->pos;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2003
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2004 if (p->length == 0) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2005 r = p->input_ctx;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2006 p->upstream_done = 1;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2007 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	2008
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2009 } else if (p->length < 0) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2010 r = p->input_ctx;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2011 p->upstream_done = 1;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2012
4145 f321e9750c8c Proxy: logging levels tuned, double logging fixed. Maxim Dounin <mdounin@mdounin.ru> parents: 4144 diff changeset	2013 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	2014 "upstream sent more data than specified in "
13a5202b6b4b Proxy: better error message about unexpected data. Maxim Dounin <mdounin@mdounin.ru> parents: 4947 diff changeset	2015 "\"Content-Length\" header");
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
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2018 return NGX_OK;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2019 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2020
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2021
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2022 static ngx_int_t
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2023 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	2024 {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2025 ngx_int_t rc;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2026 ngx_buf_t b, *prev;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2027 ngx_chain_t *cl;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2028 ngx_http_request_t *r;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2029 ngx_http_proxy_ctx_t *ctx;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2030
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2031 if (buf->pos == buf->last) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2032 return NGX_OK;
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
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2035 r = p->input_ctx;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2036 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	2037
4602 8036fc6af2df Proxy: added ctx checking to input filters. Maxim Dounin <mdounin@mdounin.ru> parents: 4593 diff changeset	2038 if (ctx == NULL) {
8036fc6af2df Proxy: added ctx checking to input filters. Maxim Dounin <mdounin@mdounin.ru> parents: 4593 diff changeset	2039 return NGX_ERROR;
8036fc6af2df Proxy: added ctx checking to input filters. Maxim Dounin <mdounin@mdounin.ru> parents: 4593 diff changeset	2040 }
8036fc6af2df Proxy: added ctx checking to input filters. Maxim Dounin <mdounin@mdounin.ru> parents: 4593 diff changeset	2041
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2042 b = NULL;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2043 prev = &buf->shadow;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2044
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2045 for ( ;; ) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2046
4925 32030fa8cb14 Request body: chunked parsing moved to ngx_http_parse.c from proxy. Maxim Dounin <mdounin@mdounin.ru> parents: 4602 diff changeset	2047 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	2048
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2049 if (rc == NGX_OK) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2050
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2051 /* a chunk has been parsed successfully */
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2052
5466 e7b3b9855be8 Use ngx_chain_get_free_buf() in pipe input filters. Valentin Bartenev <vbart@nginx.com> parents: 5441 diff changeset	2053 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	2054 if (cl == NULL) {
e7b3b9855be8 Use ngx_chain_get_free_buf() in pipe input filters. Valentin Bartenev <vbart@nginx.com> parents: 5441 diff changeset	2055 return NGX_ERROR;
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2056 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2057
5466 e7b3b9855be8 Use ngx_chain_get_free_buf() in pipe input filters. Valentin Bartenev <vbart@nginx.com> parents: 5441 diff changeset	2058 b = cl->buf;
e7b3b9855be8 Use ngx_chain_get_free_buf() in pipe input filters. Valentin Bartenev <vbart@nginx.com> parents: 5441 diff changeset	2059
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2060 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	2061
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2062 b->pos = buf->pos;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2063 b->start = buf->start;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2064 b->end = buf->end;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2065 b->tag = p->tag;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2066 b->temporary = 1;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2067 b->recycled = 1;
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 *prev = b;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2070 prev = &b->shadow;
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 if (p->in) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2073 *p->last_in = cl;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2074 } else {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2075 p->in = cl;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2076 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2077 p->last_in = &cl->next;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2078
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2079 /* STUB */ b->num = buf->num;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2080
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2081 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	2082 "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	2083
4925 32030fa8cb14 Request body: chunked parsing moved to ngx_http_parse.c from proxy. Maxim Dounin <mdounin@mdounin.ru> parents: 4602 diff changeset	2084 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	2085
5359 2fda9065d0f4 Win32: Borland C compatibility fixes. Maxim Dounin <mdounin@mdounin.ru> parents: 5301 diff changeset	2086 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	2087 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	2088 ctx->chunked.size = 0;
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2089
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2090 continue;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2091 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2092
4925 32030fa8cb14 Request body: chunked parsing moved to ngx_http_parse.c from proxy. Maxim Dounin <mdounin@mdounin.ru> parents: 4602 diff changeset	2093 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	2094 buf->pos = buf->last;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2095 b->last = buf->last;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2096
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2097 continue;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2098 }
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 if (rc == NGX_DONE) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2101
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2102 /* 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	2103
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2104 p->upstream_done = 1;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2105 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	2106
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2107 break;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2108 }
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 (rc == NGX_AGAIN) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2111
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2112 /* 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	2113
4925 32030fa8cb14 Request body: chunked parsing moved to ngx_http_parse.c from proxy. Maxim Dounin <mdounin@mdounin.ru> parents: 4602 diff changeset	2114 p->length = ctx->chunked.length;
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2115
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2116 break;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2117 }
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 /* invalid response */
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2120
4145 f321e9750c8c Proxy: logging levels tuned, double logging fixed. Maxim Dounin <mdounin@mdounin.ru> parents: 4144 diff changeset	2121 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	2122 "upstream sent invalid chunked response");
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2123
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2124 return NGX_ERROR;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2125 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2126
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2127 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
6480 f01ab2dbcfdc Fixed logging. Sergey Kandaurov <pluknet@nginx.com> parents: 6467 diff changeset	2128 "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	2129 ctx->chunked.state, p->length);
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2130
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2131 if (b) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2132 b->shadow = buf;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2133 b->last_shadow = 1;
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 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	2136 "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	2137
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2138 return NGX_OK;
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
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2141 /* 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	2142
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2143 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	2144 return NGX_ERROR;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2145 }
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 return NGX_OK;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2148 }
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
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2151 static ngx_int_t
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2152 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	2153 {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2154 ngx_http_request_t *r = data;
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 ngx_buf_t *b;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2157 ngx_chain_t cl, *ll;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2158 ngx_http_upstream_t *u;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2159
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2160 u = r->upstream;
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 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	2163 ll = &cl->next;
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
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2166 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	2167 if (cl == NULL) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2168 return NGX_ERROR;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2169 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2170
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2171 *ll = cl;
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 cl->buf->flush = 1;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2174 cl->buf->memory = 1;
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 b = &u->buffer;
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 cl->buf->pos = b->last;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2179 b->last += bytes;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2180 cl->buf->last = b->last;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2181 cl->buf->tag = u->output.tag;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2182
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2183 if (u->length == -1) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2184 return NGX_OK;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2185 }
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 u->length -= bytes;
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 if (u->length == 0) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2190 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	2191 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2192
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2193 return NGX_OK;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2194 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2195
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2196
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2197 static ngx_int_t
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2198 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	2199 {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2200 ngx_http_request_t *r = data;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2201
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2202 ngx_int_t rc;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2203 ngx_buf_t b, buf;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2204 ngx_chain_t cl, *ll;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2205 ngx_http_upstream_t *u;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2206 ngx_http_proxy_ctx_t *ctx;
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 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	2209
8036fc6af2df Proxy: added ctx checking to input filters. Maxim Dounin <mdounin@mdounin.ru> parents: 4593 diff changeset	2210 if (ctx == NULL) {
8036fc6af2df Proxy: added ctx checking to input filters. Maxim Dounin <mdounin@mdounin.ru> parents: 4593 diff changeset	2211 return NGX_ERROR;
8036fc6af2df Proxy: added ctx checking to input filters. Maxim Dounin <mdounin@mdounin.ru> parents: 4593 diff changeset	2212 }
8036fc6af2df Proxy: added ctx checking to input filters. Maxim Dounin <mdounin@mdounin.ru> parents: 4593 diff changeset	2213
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2214 u = r->upstream;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2215 buf = &u->buffer;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2216
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2217 buf->pos = buf->last;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2218 buf->last += bytes;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2219
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2220 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	2221 ll = &cl->next;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2222 }
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 for ( ;; ) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2225
4925 32030fa8cb14 Request body: chunked parsing moved to ngx_http_parse.c from proxy. Maxim Dounin <mdounin@mdounin.ru> parents: 4602 diff changeset	2226 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	2227
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2228 if (rc == NGX_OK) {
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 /* a chunk has been parsed successfully */
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2231
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2232 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	2233 if (cl == NULL) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2234 return NGX_ERROR;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2235 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2236
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2237 *ll = cl;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2238 ll = &cl->next;
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 b = cl->buf;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2241
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2242 b->flush = 1;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2243 b->memory = 1;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2244
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2245 b->pos = buf->pos;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2246 b->tag = u->output.tag;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2247
4925 32030fa8cb14 Request body: chunked parsing moved to ngx_http_parse.c from proxy. Maxim Dounin <mdounin@mdounin.ru> parents: 4602 diff changeset	2248 if (buf->last - buf->pos >= ctx->chunked.size) {
5359 2fda9065d0f4 Win32: Borland C compatibility fixes. Maxim Dounin <mdounin@mdounin.ru> parents: 5301 diff changeset	2249 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	2250 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	2251 ctx->chunked.size = 0;
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2252
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2253 } else {
4925 32030fa8cb14 Request body: chunked parsing moved to ngx_http_parse.c from proxy. Maxim Dounin <mdounin@mdounin.ru> parents: 4602 diff changeset	2254 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	2255 buf->pos = buf->last;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2256 b->last = buf->last;
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
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2259 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	2260 "http proxy out buf %p %z",
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2261 b->pos, b->last - b->pos);
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2262
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2263 continue;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2264 }
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_DONE) {
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 whole response 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 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	2271 u->length = 0;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2272
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2273 break;
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
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2276 if (rc == NGX_AGAIN) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2277 break;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2278 }
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 /* invalid response */
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2281
4145 f321e9750c8c Proxy: logging levels tuned, double logging fixed. Maxim Dounin <mdounin@mdounin.ru> parents: 4144 diff changeset	2282 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	2283 "upstream sent invalid chunked response");
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2284
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2285 return NGX_ERROR;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2286 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2287
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2288 /* 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	2289
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2290 if (r->subrequest_in_memory) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2291
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2292 cl = u->out_bufs;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2293
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2294 if (cl) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2295 buf->pos = cl->buf->pos;
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
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2298 buf->last = buf->pos;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2299
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2300 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	2301 ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
6480 f01ab2dbcfdc Fixed logging. Sergey Kandaurov <pluknet@nginx.com> parents: 6467 diff changeset	2302 "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	2303 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	2304
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2305 if (buf->last == cl->buf->pos) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2306 buf->last = cl->buf->last;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2307 continue;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2308 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2309
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2310 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	2311 cl->buf->last - cl->buf->pos);
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 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	2314 cl->buf->last = buf->last;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2315 }
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 return NGX_OK;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2319 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2320
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2321
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2322 static void
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2323 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	2324 {
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2325 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	2326 "abort http proxy request");
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2327
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2328 return;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2329 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2330
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2331
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2332 static void
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2333 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	2334 {
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2335 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	2336 "finalize http proxy request");
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2337
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2338 return;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2339 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2340
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2341
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	2342 static ngx_int_t
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	2343 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	2344 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	2345 {
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2346 ngx_http_proxy_ctx_t *ctx;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2347
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2348 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	2349
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2350 if (ctx == NULL) {
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2351 v->not_found = 1;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2352 return NGX_OK;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2353 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2354
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2355 v->len = ctx->vars.host_header.len;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2356 v->valid = 1;
1565 4c43e25d11ea fix English grammar Igor Sysoev <igor@sysoev.ru> parents: 1563 diff changeset	2357 v->no_cacheable = 0;
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	2358 v->not_found = 0;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2359 v->data = ctx->vars.host_header.data;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2360
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	2361 return NGX_OK;
507 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
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2364
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	2365 static ngx_int_t
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	2366 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	2367 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	2368 {
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2369 ngx_http_proxy_ctx_t *ctx;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2370
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2371 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	2372
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2373 if (ctx == NULL) {
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2374 v->not_found = 1;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2375 return NGX_OK;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2376 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2377
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2378 v->len = ctx->vars.port.len;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2379 v->valid = 1;
1565 4c43e25d11ea fix English grammar Igor Sysoev <igor@sysoev.ru> parents: 1563 diff changeset	2380 v->no_cacheable = 0;
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	2381 v->not_found = 0;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2382 v->data = ctx->vars.port.data;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2383
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	2384 return NGX_OK;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2385 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2386
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2387
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	2388 static ngx_int_t
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2389 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	2390 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	2391 {
5084 f7fe817c92a2 Correctly handle multiple X-Forwarded-For headers (ticket #106). Ruslan Ermilov <ru@nginx.com> parents: 5072 diff changeset	2392 size_t len;
f7fe817c92a2 Correctly handle multiple X-Forwarded-For headers (ticket #106). Ruslan Ermilov <ru@nginx.com> parents: 5072 diff changeset	2393 u_char *p;
f7fe817c92a2 Correctly handle multiple X-Forwarded-For headers (ticket #106). Ruslan Ermilov <ru@nginx.com> parents: 5072 diff changeset	2394 ngx_uint_t i, n;
f7fe817c92a2 Correctly handle multiple X-Forwarded-For headers (ticket #106). Ruslan Ermilov <ru@nginx.com> parents: 5072 diff changeset	2395 ngx_table_elt_t **h;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2396
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2397 v->valid = 1;
1565 4c43e25d11ea fix English grammar Igor Sysoev <igor@sysoev.ru> parents: 1563 diff changeset	2398 v->no_cacheable = 0;
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	2399 v->not_found = 0;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2400
5084 f7fe817c92a2 Correctly handle multiple X-Forwarded-For headers (ticket #106). Ruslan Ermilov <ru@nginx.com> parents: 5072 diff changeset	2401 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	2402 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	2403
f7fe817c92a2 Correctly handle multiple X-Forwarded-For headers (ticket #106). Ruslan Ermilov <ru@nginx.com> parents: 5072 diff changeset	2404 len = 0;
f7fe817c92a2 Correctly handle multiple X-Forwarded-For headers (ticket #106). Ruslan Ermilov <ru@nginx.com> parents: 5072 diff changeset	2405
f7fe817c92a2 Correctly handle multiple X-Forwarded-For headers (ticket #106). Ruslan Ermilov <ru@nginx.com> parents: 5072 diff changeset	2406 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	2407 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	2408 }
f7fe817c92a2 Correctly handle multiple X-Forwarded-For headers (ticket #106). Ruslan Ermilov <ru@nginx.com> parents: 5072 diff changeset	2409
f7fe817c92a2 Correctly handle multiple X-Forwarded-For headers (ticket #106). Ruslan Ermilov <ru@nginx.com> parents: 5072 diff changeset	2410 if (len == 0) {
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	2411 v->len = r->connection->addr_text.len;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	2412 v->data = r->connection->addr_text.data;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	2413 return NGX_OK;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2414 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2415
5084 f7fe817c92a2 Correctly handle multiple X-Forwarded-For headers (ticket #106). Ruslan Ermilov <ru@nginx.com> parents: 5072 diff changeset	2416 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	2417
f7fe817c92a2 Correctly handle multiple X-Forwarded-For headers (ticket #106). Ruslan Ermilov <ru@nginx.com> parents: 5072 diff changeset	2418 p = ngx_pnalloc(r->pool, len);
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2419 if (p == NULL) {
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	2420 return NGX_ERROR;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2421 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2422
5084 f7fe817c92a2 Correctly handle multiple X-Forwarded-For headers (ticket #106). Ruslan Ermilov <ru@nginx.com> parents: 5072 diff changeset	2423 v->len = len;
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	2424 v->data = p;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2425
5084 f7fe817c92a2 Correctly handle multiple X-Forwarded-For headers (ticket #106). Ruslan Ermilov <ru@nginx.com> parents: 5072 diff changeset	2426 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	2427 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	2428 p++ = ','; p++ = ' ';
f7fe817c92a2 Correctly handle multiple X-Forwarded-For headers (ticket #106). Ruslan Ermilov <ru@nginx.com> parents: 5072 diff changeset	2429 }
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2430
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2431 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	2432
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	2433 return NGX_OK;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2434 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2435
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2436
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2437 static ngx_int_t
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2438 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	2439 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	2440 {
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2441 ngx_http_proxy_ctx_t *ctx;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2442
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2443 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	2444
4927 93294110728f Request body: always use calculated size of a request body in proxy. Maxim Dounin <mdounin@mdounin.ru> parents: 4925 diff changeset	2445 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	2446 v->not_found = 1;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2447 return NGX_OK;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2448 }
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2449
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2450 v->valid = 1;
1565 4c43e25d11ea fix English grammar Igor Sysoev <igor@sysoev.ru> parents: 1563 diff changeset	2451 v->no_cacheable = 0;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2452 v->not_found = 0;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2453
5188 886800caf360 Proxy: allocate $proxy_internal_body_length from request pool. Ruslan Ermilov <ru@nginx.com> parents: 5084 diff changeset	2454 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	2455
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2456 if (v->data == NULL) {
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2457 return NGX_ERROR;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2458 }
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2459
4927 93294110728f Request body: always use calculated size of a request body in proxy. Maxim Dounin <mdounin@mdounin.ru> parents: 4925 diff changeset	2460 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	2461
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2462 return NGX_OK;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2463 }
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2464
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2465
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2466 static ngx_int_t
6051 d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2467 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	2468 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	2469 {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2470 ngx_http_proxy_ctx_t *ctx;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2471
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2472 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	2473
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2474 if (ctx == NULL \|\| !ctx->internal_chunked) {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2475 v->not_found = 1;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2476 return NGX_OK;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2477 }
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2478
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2479 v->valid = 1;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2480 v->no_cacheable = 0;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2481 v->not_found = 0;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2482
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2483 v->data = (u_char *) "chunked";
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2484 v->len = sizeof("chunked") - 1;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2485
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2486 return NGX_OK;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2487 }
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2488
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2489
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2490 static ngx_int_t
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2491 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	2492 size_t prefix)
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2493 {
4462 a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2494 size_t len;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2495 ngx_int_t rc;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2496 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	2497 ngx_http_proxy_rewrite_t *pr;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2498 ngx_http_proxy_loc_conf_t *plcf;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2499
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2500 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	2501
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2502 pr = plcf->redirects->elts;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2503
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2504 if (pr == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2505 return NGX_DECLINED;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2506 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2507
4462 a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2508 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	2509
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2510 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	2511 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	2512
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2513 if (rc != NGX_DECLINED) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2514 return rc;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2515 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2516 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2517
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2518 return NGX_DECLINED;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2519 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2520
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2521
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2522 static ngx_int_t
4465 8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2523 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	2524 {
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2525 size_t prefix;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2526 u_char *p;
4466 b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2527 ngx_int_t rc, rv;
4465 8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2528 ngx_http_proxy_loc_conf_t *plcf;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2529
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2530 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	2531 if (p == NULL) {
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2532 return NGX_DECLINED;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2533 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2534
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2535 prefix = p + 1 - h->value.data;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2536
4466 b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2537 rv = NGX_DECLINED;
4465 8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2538
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2539 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	2540
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2541 if (plcf->cookie_domains) {
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2542 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	2543
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2544 if (p) {
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2545 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	2546 plcf->cookie_domains);
4466 b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2547 if (rc == NGX_ERROR) {
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2548 return NGX_ERROR;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2549 }
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2550
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2551 if (rc != NGX_DECLINED) {
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2552 rv = rc;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2553 }
4465 8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2554 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2555 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2556
4466 b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2557 if (plcf->cookie_paths) {
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2558 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	2559
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2560 if (p) {
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2561 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	2562 plcf->cookie_paths);
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2563 if (rc == NGX_ERROR) {
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2564 return NGX_ERROR;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2565 }
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2566
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2567 if (rc != NGX_DECLINED) {
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2568 rv = rc;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2569 }
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2570 }
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2571 }
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2572
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2573 return rv;
4465 8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2574 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2575
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 static ngx_int_t
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2578 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	2579 u_char value, ngx_array_t rewrites)
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2580 {
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2581 size_t len, prefix;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2582 u_char *p;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2583 ngx_int_t rc;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2584 ngx_uint_t i;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2585 ngx_http_proxy_rewrite_t *pr;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2586
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2587 prefix = value - h->value.data;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2588
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2589 p = (u_char *) ngx_strchr(value, ';');
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2590
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2591 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	2592
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2593 pr = rewrites->elts;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2594
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2595 for (i = 0; i < rewrites->nelts; i++) {
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2596 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	2597
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2598 if (rc != NGX_DECLINED) {
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2599 return rc;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2600 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2601 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2602
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2603 return NGX_DECLINED;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2604 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2605
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2606
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2607 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	2608 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	2609 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	2610 {
4462 a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2611 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	2612
103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	2613 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	2614 return NGX_ERROR;
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	2615 }
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	2616
4462 a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2617 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	2618 \|\| 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	2619 pattern.len) != 0)
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2620 {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2621 return NGX_DECLINED;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2622 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2623
4336 99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	2624 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	2625 return NGX_ERROR;
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	2626 }
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	2627
4462 a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2628 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	2629 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2630
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2631
4336 99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	2632 #if (NGX_PCRE)
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	2633
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2634 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	2635 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	2636 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	2637 {
4462 a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2638 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	2639
a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2640 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	2641 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	2642
103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	2643 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	2644 return NGX_DECLINED;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2645 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2646
4336 99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	2647 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	2648 return NGX_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2649 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2650
4462 a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2651 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	2652 h->value = replacement;
3d51ba7f347b Fixed: proxy_redirect with regex might broke Refresh header. Valentin Bartenev <vbart@nginx.com> parents: 4385 diff changeset	2653 return NGX_OK;
3d51ba7f347b Fixed: proxy_redirect with regex might broke Refresh header. Valentin Bartenev <vbart@nginx.com> parents: 4385 diff changeset	2654 }
3d51ba7f347b Fixed: proxy_redirect with regex might broke Refresh header. Valentin Bartenev <vbart@nginx.com> parents: 4385 diff changeset	2655
4462 a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2656 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	2657 }
a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2658
a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2659 #endif
a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2660
a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2661
a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2662 static ngx_int_t
4465 8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2663 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	2664 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	2665 {
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2666 u_char *p;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2667 ngx_str_t pattern, replacement;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2668
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2669 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	2670 return NGX_ERROR;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2671 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2672
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2673 p = h->value.data + prefix;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2674
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2675 if (p[0] == '.') {
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2676 p++;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2677 prefix++;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2678 len--;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2679 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2680
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2681 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	2682 return NGX_DECLINED;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2683 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2684
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2685 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	2686 return NGX_ERROR;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2687 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2688
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2689 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	2690 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2691
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2692
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2693 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	2694 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	2695 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	2696 {
a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2697 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	2698 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	2699
a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2700 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	2701
a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2702 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	2703
5676 fbfdf8017748 Proxy: fixed possible uninitialized memory access. Valentin Bartenev <vbart@nginx.com> parents: 5661 diff changeset	2704 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	2705 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	2706 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	2707 }
a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2708
a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2709 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	2710 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	2711
a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2712 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	2713 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	2714
a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2715 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	2716
a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2717 } else {
a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2718 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	2719 replacement->len);
a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2720
a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2721 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	2722 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	2723 }
3d51ba7f347b Fixed: proxy_redirect with regex might broke Refresh header. Valentin Bartenev <vbart@nginx.com> parents: 4385 diff changeset	2724
4462 a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2725 h->value.len = new_len;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2726
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2727 return NGX_OK;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2728 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2729
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2730
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2731 static ngx_int_t
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2732 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	2733 {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2734 ngx_http_variable_t var, v;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2735
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2736 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	2737 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	2738 if (var == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2739 return NGX_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2740 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2741
637 e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 629 diff changeset	2742 var->get_handler = v->get_handler;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2743 var->data = v->data;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2744 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2745
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2746 return NGX_OK;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2747 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2748
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2749
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2750 static void *
5951 610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2751 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	2752 {
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2753 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	2754
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2755 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	2756 if (conf == NULL) {
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2757 return NULL;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2758 }
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2759
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2760 #if (NGX_HTTP_CACHE)
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2761 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	2762 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	2763 != NGX_OK)
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2764 {
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2765 return NULL;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2766 }
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2767 #endif
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2768
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2769 return conf;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2770 }
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2771
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2772
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2773 static void *
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2774 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	2775 {
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2776 ngx_http_proxy_loc_conf_t *conf;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2777
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2778 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	2779 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	2780 return NULL;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2781 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2782
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2783 /*
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2784 * set by ngx_pcalloc():
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 * conf->upstream.bufs.num = 0;
2786 4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2784 diff changeset	2787 * conf->upstream.ignore_headers = 0;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2788 * conf->upstream.next_upstream = 0;
5949 634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	2789 * conf->upstream.cache_zone = NULL;
2875 6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2786 diff changeset	2790 * conf->upstream.cache_use_stale = 0;
6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2786 diff changeset	2791 * conf->upstream.cache_methods = 0;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2792 * conf->upstream.temp_path = NULL;
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	2793 * conf->upstream.hide_headers_hash = { NULL, 0 };
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2794 * conf->upstream.uri = { 0, NULL };
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2795 * conf->upstream.location = NULL;
1295 5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	2796 * conf->upstream.store_lengths = NULL;
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	2797 * 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	2798 * conf->upstream.ssl_name = NULL;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2799 *
5012 bbdb172f0927 Proxy: fixed proxy_method to always add space. Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2800 * conf->method = { 0, NULL };
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2801 * conf->headers_source = NULL;
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	2802 * conf->headers.lengths = NULL;
f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	2803 * conf->headers.values = NULL;
f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	2804 * 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	2805 * conf->headers_cache.lengths = NULL;
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	2806 * conf->headers_cache.values = NULL;
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	2807 * 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	2808 * conf->body_lengths = NULL;
29fa5023bd6f Proxy: renamed and rearranged fields in proxy configuration. Roman Arutyunyan <arut@nginx.com> parents: 5909 diff changeset	2809 * conf->body_values = NULL;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2810 * conf->body_source = { 0, NULL };
3470 b982f2dee8cf fix proxy_redirect name in error message Igor Sysoev <igor@sysoev.ru> parents: 3399 diff changeset	2811 * conf->redirects = NULL;
5385 7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	2812 * conf->ssl = 0;
7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	2813 * conf->ssl_protocols = 0;
5390 919d230ecdbe Proxy: added the "proxy_ssl_ciphers" directive. Piotr Sikora <piotr@cloudflare.com> parents: 5385 diff changeset	2814 * conf->ssl_ciphers = { 0, NULL };
5661 060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	2815 * conf->ssl_trusted_certificate = { 0, NULL };
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	2816 * conf->ssl_crl = { 0, NULL };
5900 20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	2817 * conf->ssl_certificate = { 0, NULL };
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	2818 * conf->ssl_certificate_key = { 0, NULL };
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2819 */
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2820
1295 5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	2821 conf->upstream.store = NGX_CONF_UNSET;
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	2822 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	2823 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	2824 conf->upstream.buffering = NGX_CONF_UNSET;
6050 a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	2825 conf->upstream.request_buffering = NGX_CONF_UNSET;
629 65bf042c0b4f nginx-0.3.36-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 627 diff changeset	2826 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	2827 conf->upstream.force_ranges = NGX_CONF_UNSET;
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 579 diff changeset	2828
5008 fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 4962 diff changeset	2829 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	2830
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2831 conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2832 conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2833 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	2834 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	2835
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2836 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	2837 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	2838 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	2839
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	2840 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	2841 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	2842 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	2843
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2844 conf->upstream.pass_request_headers = NGX_CONF_UNSET;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2845 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	2846
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	2847 #if (NGX_HTTP_CACHE)
5949 634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	2848 conf->upstream.cache = NGX_CONF_UNSET;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	2849 conf->upstream.cache_min_uses = NGX_CONF_UNSET_UINT;
3699 b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3692 diff changeset	2850 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	2851 conf->upstream.no_cache = NGX_CONF_UNSET_PTR;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	2852 conf->upstream.cache_valid = NGX_CONF_UNSET_PTR;
4385 70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4377 diff changeset	2853 conf->upstream.cache_lock = NGX_CONF_UNSET;
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4377 diff changeset	2854 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	2855 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	2856 conf->upstream.cache_revalidate = NGX_CONF_UNSET;
6290 4d5ac1a31d44 Upstream: proxy_cache_convert_head directive. Roman Arutyunyan <arut@nginx.com> parents: 6157 diff changeset	2857 conf->upstream.cache_convert_head = NGX_CONF_UNSET;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	2858 #endif
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	2859
1701 40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	2860 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	2861 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	2862
657 400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	2863 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	2864
2184 274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2135 diff changeset	2865 #if (NGX_HTTP_SSL)
274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2135 diff changeset	2866 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	2867 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	2868 conf->upstream.ssl_verify = NGX_CONF_UNSET;
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	2869 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	2870 conf->ssl_passwords = NGX_CONF_UNSET_PTR;
2184 274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2135 diff changeset	2871 #endif
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2872
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2873 /* "proxy_cyclic_temp_file" is disabled */
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2874 conf->upstream.cyclic_temp_file = 0;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2875
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2876 conf->redirect = NGX_CONF_UNSET;
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	2877 conf->upstream.change_buffering = 1;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2878
4465 8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2879 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	2880 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	2881
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2882 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	2883
1180 1666b7b0bafc proxy_headers_hash_max_size and proxy_headers_hash_bucket_size Igor Sysoev <igor@sysoev.ru> parents: 1125 diff changeset	2884 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	2885 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	2886
3976 215fe9223419 update r3945 with more descriptive error message Igor Sysoev <igor@sysoev.ru> parents: 3862 diff changeset	2887 ngx_str_set(&conf->upstream.module, "proxy");
215fe9223419 update r3945 with more descriptive error message Igor Sysoev <igor@sysoev.ru> parents: 3862 diff changeset	2888
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2889 return conf;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2890 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2891
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2892
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2893 static char *
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2894 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	2895 {
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2896 ngx_http_proxy_loc_conf_t *prev = parent;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2897 ngx_http_proxy_loc_conf_t *conf = child;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2898
3862 f4c49c9e4bb5 always test proxy_redirect with slash, this fixes a case when nginx uses Igor Sysoev <igor@sysoev.ru> parents: 3734 diff changeset	2899 u_char *p;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	2900 size_t size;
5909 8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	2901 ngx_int_t rc;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	2902 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	2903 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	2904 ngx_http_proxy_rewrite_t *pr;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	2905 ngx_http_script_compile_t sc;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2906
5948 f2ff0aa89126 Upstream: mutually exclusive inheritance of "cache" and "store". Valentin Bartenev <vbart@nginx.com> parents: 5947 diff changeset	2907 #if (NGX_HTTP_CACHE)
f2ff0aa89126 Upstream: mutually exclusive inheritance of "cache" and "store". Valentin Bartenev <vbart@nginx.com> parents: 5947 diff changeset	2908
f2ff0aa89126 Upstream: mutually exclusive inheritance of "cache" and "store". Valentin Bartenev <vbart@nginx.com> parents: 5947 diff changeset	2909 if (conf->upstream.store > 0) {
5949 634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	2910 conf->upstream.cache = 0;
5948 f2ff0aa89126 Upstream: mutually exclusive inheritance of "cache" and "store". Valentin Bartenev <vbart@nginx.com> parents: 5947 diff changeset	2911 }
f2ff0aa89126 Upstream: mutually exclusive inheritance of "cache" and "store". Valentin Bartenev <vbart@nginx.com> parents: 5947 diff changeset	2912
5949 634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	2913 if (conf->upstream.cache > 0) {
5948 f2ff0aa89126 Upstream: mutually exclusive inheritance of "cache" and "store". Valentin Bartenev <vbart@nginx.com> parents: 5947 diff changeset	2914 conf->upstream.store = 0;
f2ff0aa89126 Upstream: mutually exclusive inheritance of "cache" and "store". Valentin Bartenev <vbart@nginx.com> parents: 5947 diff changeset	2915 }
f2ff0aa89126 Upstream: mutually exclusive inheritance of "cache" and "store". Valentin Bartenev <vbart@nginx.com> parents: 5947 diff changeset	2916
f2ff0aa89126 Upstream: mutually exclusive inheritance of "cache" and "store". Valentin Bartenev <vbart@nginx.com> parents: 5947 diff changeset	2917 #endif
f2ff0aa89126 Upstream: mutually exclusive inheritance of "cache" and "store". Valentin Bartenev <vbart@nginx.com> parents: 5947 diff changeset	2918
5940 e3b3b89d74e8 Upstream: fixed inheritance of proxy_store and friends. Valentin Bartenev <vbart@nginx.com> parents: 5939 diff changeset	2919 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	2920 ngx_conf_merge_value(conf->upstream.store,
2894 d26f4e80c71f style fix Igor Sysoev <igor@sysoev.ru> parents: 2875 diff changeset	2921 prev->upstream.store, 0);
1295 5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	2922
5947 d9025ea1f5a5 Upstream: simplified proxy_store and friends configuration code. Valentin Bartenev <vbart@nginx.com> parents: 5940 diff changeset	2923 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	2924 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	2925 }
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	2926
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	2927 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	2928 prev->upstream.store_access, 0600);
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1244 diff changeset	2929
5832 d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5738 diff changeset	2930 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	2931 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	2932
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 579 diff changeset	2933 ngx_conf_merge_value(conf->upstream.buffering,
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 579 diff changeset	2934 prev->upstream.buffering, 1);
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 579 diff changeset	2935
6050 a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	2936 ngx_conf_merge_value(conf->upstream.request_buffering,
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	2937 prev->upstream.request_buffering, 1);
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	2938
629 65bf042c0b4f nginx-0.3.36-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 627 diff changeset	2939 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	2940 prev->upstream.ignore_client_abort, 0);
65bf042c0b4f nginx-0.3.36-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 627 diff changeset	2941
5874 2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	2942 ngx_conf_merge_value(conf->upstream.force_ranges,
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	2943 prev->upstream.force_ranges, 0);
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	2944
5008 fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 4962 diff changeset	2945 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	2946 prev->upstream.local, NULL);
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 4962 diff changeset	2947
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2948 ngx_conf_merge_msec_value(conf->upstream.connect_timeout,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2949 prev->upstream.connect_timeout, 60000);
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2950
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2951 ngx_conf_merge_msec_value(conf->upstream.send_timeout,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2952 prev->upstream.send_timeout, 60000);
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2953
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2954 ngx_conf_merge_msec_value(conf->upstream.read_timeout,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2955 prev->upstream.read_timeout, 60000);
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2956
5832 d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5738 diff changeset	2957 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	2958 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	2959
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2960 ngx_conf_merge_size_value(conf->upstream.send_lowat,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2961 prev->upstream.send_lowat, 0);
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2962
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 579 diff changeset	2963 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	2964 prev->upstream.buffer_size,
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2965 (size_t) ngx_pagesize);
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2966
5883 973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5874 diff changeset	2967 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	2968 prev->upstream.limit_rate, 0);
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5874 diff changeset	2969
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2970 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	2971 8, ngx_pagesize);
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2972
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2973 if (conf->upstream.bufs.num < 2) {
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2974 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	2975 "there must be at least 2 \"proxy_buffers\"");
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2976 return NGX_CONF_ERROR;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2977 }
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2978
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2979
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 579 diff changeset	2980 size = conf->upstream.buffer_size;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2981 if (size < conf->upstream.bufs.size) {
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2982 size = conf->upstream.bufs.size;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2983 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2984
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2985
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	2986 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	2987 prev->upstream.busy_buffers_size_conf,
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2988 NGX_CONF_UNSET_SIZE);
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2989
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	2990 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	2991 conf->upstream.busy_buffers_size = 2 * size;
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	2992 } else {
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	2993 conf->upstream.busy_buffers_size =
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	2994 conf->upstream.busy_buffers_size_conf;
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	2995 }
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2996
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	2997 if (conf->upstream.busy_buffers_size < size) {
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2998 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	2999 "\"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	3000 "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	3001 "one of the \"proxy_buffers\"");
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3002
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3003 return NGX_CONF_ERROR;
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3004 }
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3005
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3006 if (conf->upstream.busy_buffers_size
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3007 > (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	3008 {
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3009 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3010 "\"proxy_busy_buffers_size\" must be less than "
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3011 "the size of all \"proxy_buffers\" minus one buffer");
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 return NGX_CONF_ERROR;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3014 }
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3015
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3016
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3017 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	3018 prev->upstream.temp_file_write_size_conf,
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3019 NGX_CONF_UNSET_SIZE);
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3020
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3021 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	3022 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	3023 } else {
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3024 conf->upstream.temp_file_write_size =
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3025 conf->upstream.temp_file_write_size_conf;
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3026 }
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3027
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3028 if (conf->upstream.temp_file_write_size < size) {
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3029 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	3030 "\"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	3031 "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	3032 "one of the \"proxy_buffers\"");
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3033
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3034 return NGX_CONF_ERROR;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3035 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3036
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3037 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	3038 prev->upstream.max_temp_file_size_conf,
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3039 NGX_CONF_UNSET_SIZE);
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3040
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3041 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	3042 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	3043 } else {
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3044 conf->upstream.max_temp_file_size =
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3045 conf->upstream.max_temp_file_size_conf;
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3046 }
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3047
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3048 if (conf->upstream.max_temp_file_size != 0
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3049 && conf->upstream.max_temp_file_size < size)
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3050 {
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3051 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	3052 "\"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	3053 "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	3054 "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	3055 "one of the \"proxy_buffers\"");
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3056
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3057 return NGX_CONF_ERROR;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3058 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3059
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3060
2786 4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2784 diff changeset	3061 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	3062 prev->upstream.ignore_headers,
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2784 diff changeset	3063 NGX_CONF_BITMASK_SET);
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2784 diff changeset	3064
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2784 diff changeset	3065
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3066 ngx_conf_merge_bitmask_value(conf->upstream.next_upstream,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3067 prev->upstream.next_upstream,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3068 (NGX_CONF_BITMASK_SET
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3069 \|NGX_HTTP_UPSTREAM_FT_ERROR
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3070 \|NGX_HTTP_UPSTREAM_FT_TIMEOUT));
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3071
665 5fd7a5e99047 nginx-0.3.54-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	3072 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	3073 conf->upstream.next_upstream = NGX_CONF_BITMASK_SET
5fd7a5e99047 nginx-0.3.54-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	3074 \|NGX_HTTP_UPSTREAM_FT_OFF;
5fd7a5e99047 nginx-0.3.54-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	3075 }
5fd7a5e99047 nginx-0.3.54-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	3076
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3077 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	3078 prev->upstream.temp_path,
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3079 &ngx_http_proxy_temp_path)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3080 != NGX_OK)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3081 {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3082 return NGX_CONF_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3083 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3084
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3085
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3086 #if (NGX_HTTP_CACHE)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3087
5949 634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	3088 if (conf->upstream.cache == NGX_CONF_UNSET) {
634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	3089 ngx_conf_merge_value(conf->upstream.cache,
634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	3090 prev->upstream.cache, 0);
634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	3091
634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	3092 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	3093 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	3094 }
634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	3095
634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	3096 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	3097 ngx_shm_zone_t *shm_zone;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3098
5949 634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	3099 shm_zone = conf->upstream.cache_zone;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3100
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3101 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3102 "\"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	3103 &shm_zone->shm.name);
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3104
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3105 return NGX_CONF_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3106 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3107
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3108 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	3109 prev->upstream.cache_min_uses, 1);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3110
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3111 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	3112 prev->upstream.cache_use_stale,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3113 (NGX_CONF_BITMASK_SET
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3114 \|NGX_HTTP_UPSTREAM_FT_OFF));
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3115
4401 d45742815c90 Fixed proxy_cache_use_stale in "no live upstreams" case. Maxim Dounin <mdounin@mdounin.ru> parents: 4400 diff changeset	3116 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	3117 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	3118 \|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	3119 }
d45742815c90 Fixed proxy_cache_use_stale in "no live upstreams" case. Maxim Dounin <mdounin@mdounin.ru> parents: 4400 diff changeset	3120
d45742815c90 Fixed proxy_cache_use_stale in "no live upstreams" case. Maxim Dounin <mdounin@mdounin.ru> parents: 4400 diff changeset	3121 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	3122 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	3123 }
d45742815c90 Fixed proxy_cache_use_stale in "no live upstreams" case. Maxim Dounin <mdounin@mdounin.ru> parents: 4400 diff changeset	3124
2875 6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2786 diff changeset	3125 if (conf->upstream.cache_methods == 0) {
6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2786 diff changeset	3126 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	3127 }
6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2786 diff changeset	3128
6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2786 diff changeset	3129 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	3130
3699 b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3692 diff changeset	3131 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	3132 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	3133
3526 62a4fd1e6e2c proxy_no_cache and fastcgi_no_cache Igor Sysoev <igor@sysoev.ru> parents: 3523 diff changeset	3134 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	3135 prev->upstream.no_cache, NULL);
62a4fd1e6e2c proxy_no_cache and fastcgi_no_cache Igor Sysoev <igor@sysoev.ru> parents: 3523 diff changeset	3136
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3137 ngx_conf_merge_ptr_value(conf->upstream.cache_valid,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3138 prev->upstream.cache_valid, NULL);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3139
2672 b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	3140 if (conf->cache_key.value.data == NULL) {
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	3141 conf->cache_key = prev->cache_key;
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	3142 }
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	3143
4385 70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4377 diff changeset	3144 ngx_conf_merge_value(conf->upstream.cache_lock,
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4377 diff changeset	3145 prev->upstream.cache_lock, 0);
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4377 diff changeset	3146
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4377 diff changeset	3147 ngx_conf_merge_msec_value(conf->upstream.cache_lock_timeout,
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4377 diff changeset	3148 prev->upstream.cache_lock_timeout, 5000);
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4377 diff changeset	3149
5905 2f7e557eab5b Cache: proxy_cache_lock_age and friends. Roman Arutyunyan <arut@nginx.com> parents: 5900 diff changeset	3150 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	3151 prev->upstream.cache_lock_age, 5000);
2f7e557eab5b Cache: proxy_cache_lock_age and friends. Roman Arutyunyan <arut@nginx.com> parents: 5900 diff changeset	3152
5441 43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5391 diff changeset	3153 ngx_conf_merge_value(conf->upstream.cache_revalidate,
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5391 diff changeset	3154 prev->upstream.cache_revalidate, 0);
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5391 diff changeset	3155
6290 4d5ac1a31d44 Upstream: proxy_cache_convert_head directive. Roman Arutyunyan <arut@nginx.com> parents: 6157 diff changeset	3156 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	3157 prev->upstream.cache_convert_head, 1);
4d5ac1a31d44 Upstream: proxy_cache_convert_head directive. Roman Arutyunyan <arut@nginx.com> parents: 6157 diff changeset	3158
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3159 #endif
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3160
5012 bbdb172f0927 Proxy: fixed proxy_method to always add space. Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3161 ngx_conf_merge_str_value(conf->method, prev->method, "");
bbdb172f0927 Proxy: fixed proxy_method to always add space. Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3162
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3163 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	3164 prev->upstream.pass_request_headers, 1);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3165 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	3166 prev->upstream.pass_request_body, 1);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3167
657 400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	3168 ngx_conf_merge_value(conf->upstream.intercept_errors,
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	3169 prev->upstream.intercept_errors, 0);
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3170
2184 274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2135 diff changeset	3171 #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	3172
2184 274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2135 diff changeset	3173 ngx_conf_merge_value(conf->upstream.ssl_session_reuse,
274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2135 diff changeset	3174 prev->upstream.ssl_session_reuse, 1);
5385 7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	3175
7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	3176 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	3177 (NGX_CONF_BITMASK_SET\|NGX_SSL_TLSv1
b2899e7d0ef8 Disabled SSLv3 by default (ticket #653). Maxim Dounin <mdounin@mdounin.ru> parents: 6056 diff changeset	3178 \|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	3179
5390 919d230ecdbe Proxy: added the "proxy_ssl_ciphers" directive. Piotr Sikora <piotr@cloudflare.com> parents: 5385 diff changeset	3180 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	3181 "DEFAULT");
919d230ecdbe Proxy: added the "proxy_ssl_ciphers" directive. Piotr Sikora <piotr@cloudflare.com> parents: 5385 diff changeset	3182
5660 7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	3183 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	3184 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	3185 }
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	3186
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	3187 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	3188 prev->upstream.ssl_server_name, 0);
5661 060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	3189 ngx_conf_merge_value(conf->upstream.ssl_verify,
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	3190 prev->upstream.ssl_verify, 0);
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	3191 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	3192 prev->ssl_verify_depth, 1);
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	3193 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	3194 prev->ssl_trusted_certificate, "");
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	3195 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	3196
5900 20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	3197 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	3198 prev->ssl_certificate, "");
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	3199 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	3200 prev->ssl_certificate_key, "");
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	3201 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	3202
5385 7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	3203 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	3204 return NGX_CONF_ERROR;
7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	3205 }
5660 7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	3206
2184 274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2135 diff changeset	3207 #endif
274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2135 diff changeset	3208
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3209 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	3210
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3211 if (conf->redirect) {
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3212
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3213 if (conf->redirects == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3214 conf->redirects = prev->redirects;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3215 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3216
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3217 if (conf->redirects == NULL && conf->url.data) {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3218
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3219 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	3220 sizeof(ngx_http_proxy_rewrite_t));
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3221 if (conf->redirects == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3222 return NGX_CONF_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3223 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3224
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3225 pr = ngx_array_push(conf->redirects);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3226 if (pr == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3227 return NGX_CONF_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3228 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3229
4461 103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	3230 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	3231 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	3232
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3233 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	3234
4461 103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	3235 pr->handler = ngx_http_proxy_rewrite_complex_handler;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3236
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3237 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	3238 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	3239 pr->replacement.value = conf->location;
653 7cbef16c71a1 nginx-0.3.48-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 651 diff changeset	3240
7cbef16c71a1 nginx-0.3.48-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 651 diff changeset	3241 } else {
4461 103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	3242 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	3243 + sizeof("/") - 1;
103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	3244
103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	3245 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	3246 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	3247 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	3248 }
f4c49c9e4bb5 always test proxy_redirect with slash, this fixes a case when nginx uses Igor Sysoev <igor@sysoev.ru> parents: 3734 diff changeset	3249
4461 103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	3250 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	3251
f4c49c9e4bb5 always test proxy_redirect with slash, this fixes a case when nginx uses Igor Sysoev <igor@sysoev.ru> parents: 3734 diff changeset	3252 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	3253 *p = '/';
f4c49c9e4bb5 always test proxy_redirect with slash, this fixes a case when nginx uses Igor Sysoev <igor@sysoev.ru> parents: 3734 diff changeset	3254
4336 99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3255 ngx_str_set(&pr->replacement.value, "/");
653 7cbef16c71a1 nginx-0.3.48-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 651 diff changeset	3256 }
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3257 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3258 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3259
4465 8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3260 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	3261
4466 b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3262 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	3263
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	3264 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	3265 NGX_HTTP_VERSION_10);
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	3266
1180 1666b7b0bafc proxy_headers_hash_max_size and proxy_headers_hash_bucket_size Igor Sysoev <igor@sysoev.ru> parents: 1125 diff changeset	3267 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	3268 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	3269
1666b7b0bafc proxy_headers_hash_max_size and proxy_headers_hash_bucket_size Igor Sysoev <igor@sysoev.ru> parents: 1125 diff changeset	3270 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	3271 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	3272
1666b7b0bafc proxy_headers_hash_max_size and proxy_headers_hash_bucket_size Igor Sysoev <igor@sysoev.ru> parents: 1125 diff changeset	3273 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	3274 ngx_cacheline_size);
1666b7b0bafc proxy_headers_hash_max_size and proxy_headers_hash_bucket_size Igor Sysoev <igor@sysoev.ru> parents: 1125 diff changeset	3275
1701 40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	3276 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	3277 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	3278 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	3279
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	3280 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	3281 &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	3282 != NGX_OK)
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	3283 {
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	3284 return NGX_CONF_ERROR;
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	3285 }
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	3286
5938 cd2abf7e7740 Upstream: fixed unexpected inheritance into limit_except blocks. Maxim Dounin <mdounin@mdounin.ru> parents: 5937 diff changeset	3287 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	3288
cd2abf7e7740 Upstream: fixed unexpected inheritance into limit_except blocks. Maxim Dounin <mdounin@mdounin.ru> parents: 5937 diff changeset	3289 if (clcf->noname
cd2abf7e7740 Upstream: fixed unexpected inheritance into limit_except blocks. Maxim Dounin <mdounin@mdounin.ru> parents: 5937 diff changeset	3290 && 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	3291 {
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 843 diff changeset	3292 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	3293 conf->location = prev->location;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3294 conf->vars = prev->vars;
5937 5b9f711dc819 Upstream: inheritance of proxy_pass and friends (ticket #645). Maxim Dounin <mdounin@mdounin.ru> parents: 5936 diff changeset	3295
3734 e3a6785b5be4 ) make code consistent to fastcgi, etc Igor Sysoev <igor@sysoev.ru>* parents: 3733 diff changeset	3296 conf->proxy_lengths = prev->proxy_lengths;
e3a6785b5be4 ) make code consistent to fastcgi, etc Igor Sysoev <igor@sysoev.ru>* parents: 3733 diff changeset	3297 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	3298
5b9f711dc819 Upstream: inheritance of proxy_pass and friends (ticket #645). Maxim Dounin <mdounin@mdounin.ru> parents: 5936 diff changeset	3299 #if (NGX_HTTP_SSL)
5b9f711dc819 Upstream: inheritance of proxy_pass and friends (ticket #645). Maxim Dounin <mdounin@mdounin.ru> parents: 5936 diff changeset	3300 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	3301 #endif
3734 e3a6785b5be4 ) make code consistent to fastcgi, etc Igor Sysoev <igor@sysoev.ru>* parents: 3733 diff changeset	3302 }
e3a6785b5be4 ) make code consistent to fastcgi, etc Igor Sysoev <igor@sysoev.ru>* parents: 3733 diff changeset	3303
5938 cd2abf7e7740 Upstream: fixed unexpected inheritance into limit_except blocks. Maxim Dounin <mdounin@mdounin.ru> parents: 5937 diff changeset	3304 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	3305 && (conf->upstream.upstream \|\| conf->proxy_lengths))
cd2abf7e7740 Upstream: fixed unexpected inheritance into limit_except blocks. Maxim Dounin <mdounin@mdounin.ru> parents: 5937 diff changeset	3306 {
cd2abf7e7740 Upstream: fixed unexpected inheritance into limit_except blocks. Maxim Dounin <mdounin@mdounin.ru> parents: 5937 diff changeset	3307 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	3308 }
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3309
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3310 if (conf->body_source.data == NULL) {
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	3311 conf->body_flushes = prev->body_flushes;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3312 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	3313 conf->body_lengths = prev->body_lengths;
29fa5023bd6f Proxy: renamed and rearranged fields in proxy configuration. Roman Arutyunyan <arut@nginx.com> parents: 5909 diff changeset	3314 conf->body_values = prev->body_values;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3315 }
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3316
5910 29fa5023bd6f Proxy: renamed and rearranged fields in proxy configuration. Roman Arutyunyan <arut@nginx.com> parents: 5909 diff changeset	3317 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	3318
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3319 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	3320
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3321 sc.cf = cf;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3322 sc.source = &conf->body_source;
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	3323 sc.flushes = &conf->body_flushes;
5910 29fa5023bd6f Proxy: renamed and rearranged fields in proxy configuration. Roman Arutyunyan <arut@nginx.com> parents: 5909 diff changeset	3324 sc.lengths = &conf->body_lengths;
29fa5023bd6f Proxy: renamed and rearranged fields in proxy configuration. Roman Arutyunyan <arut@nginx.com> parents: 5909 diff changeset	3325 sc.values = &conf->body_values;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3326 sc.complete_lengths = 1;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3327 sc.complete_values = 1;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3328
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3329 if (ngx_http_script_compile(&sc) != NGX_OK) {
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3330 return NGX_CONF_ERROR;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3331 }
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3332 }
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3333
5907 195561ef367f Upstream: moved header initializations to separate functions. Roman Arutyunyan <arut@nginx.com> parents: 5905 diff changeset	3334 if (conf->headers_source == NULL) {
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	3335 conf->headers = prev->headers;
5909 8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	3336 #if (NGX_HTTP_CACHE)
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	3337 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	3338 #endif
5907 195561ef367f Upstream: moved header initializations to separate functions. Roman Arutyunyan <arut@nginx.com> parents: 5905 diff changeset	3339 conf->headers_source = prev->headers_source;
195561ef367f Upstream: moved header initializations to separate functions. Roman Arutyunyan <arut@nginx.com> parents: 5905 diff changeset	3340 }
195561ef367f Upstream: moved header initializations to separate functions. Roman Arutyunyan <arut@nginx.com> parents: 5905 diff changeset	3341
5909 8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	3342 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	3343 ngx_http_proxy_headers);
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	3344 if (rc != NGX_OK) {
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	3345 return NGX_CONF_ERROR;
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	3346 }
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	3347
5907 195561ef367f Upstream: moved header initializations to separate functions. Roman Arutyunyan <arut@nginx.com> parents: 5905 diff changeset	3348 #if (NGX_HTTP_CACHE)
5909 8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	3349
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	3350 if (conf->upstream.cache) {
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	3351 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	3352 ngx_http_proxy_cache_headers);
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	3353 if (rc != NGX_OK) {
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	3354 return NGX_CONF_ERROR;
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	3355 }
5907 195561ef367f Upstream: moved header initializations to separate functions. Roman Arutyunyan <arut@nginx.com> parents: 5905 diff changeset	3356 }
5909 8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	3357
5907 195561ef367f Upstream: moved header initializations to separate functions. Roman Arutyunyan <arut@nginx.com> parents: 5905 diff changeset	3358 #endif
195561ef367f Upstream: moved header initializations to separate functions. Roman Arutyunyan <arut@nginx.com> parents: 5905 diff changeset	3359
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3360 return NGX_CONF_OK;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3361 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3362
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3363
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3364 static ngx_int_t
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	3365 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	3366 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	3367 {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3368 u_char *p;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3369 size_t size;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3370 uintptr_t *code;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3371 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	3372 ngx_array_t headers_names, headers_merged;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3373 ngx_keyval_t src, s, *h;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3374 ngx_hash_key_t *hk;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3375 ngx_hash_init_t hash;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3376 ngx_http_script_compile_t sc;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3377 ngx_http_script_copy_code_t *copy;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3378
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	3379 if (headers->hash.buckets) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3380 return NGX_OK;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3381 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3382
3561 20708cffd6dc use local headers_names array instead of stored in configuration Igor Sysoev <igor@sysoev.ru> parents: 3526 diff changeset	3383 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	3384 != NGX_OK)
20708cffd6dc use local headers_names array instead of stored in configuration Igor Sysoev <igor@sysoev.ru> parents: 3526 diff changeset	3385 {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3386 return NGX_ERROR;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3387 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3388
4274 595560d9dcbf Fixed proxy_set_header inheritance with proxy_cache (ticket #45). Maxim Dounin <mdounin@mdounin.ru> parents: 4205 diff changeset	3389 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	3390 != NGX_OK)
595560d9dcbf Fixed proxy_set_header inheritance with proxy_cache (ticket #45). Maxim Dounin <mdounin@mdounin.ru> parents: 4205 diff changeset	3391 {
595560d9dcbf Fixed proxy_set_header inheritance with proxy_cache (ticket #45). Maxim Dounin <mdounin@mdounin.ru> parents: 4205 diff changeset	3392 return NGX_ERROR;
595560d9dcbf Fixed proxy_set_header inheritance with proxy_cache (ticket #45). Maxim Dounin <mdounin@mdounin.ru> parents: 4205 diff changeset	3393 }
595560d9dcbf Fixed proxy_set_header inheritance with proxy_cache (ticket #45). Maxim Dounin <mdounin@mdounin.ru> parents: 4205 diff changeset	3394
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3395 if (conf->headers_source == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3396 conf->headers_source = ngx_array_create(cf->pool, 4,
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	3397 sizeof(ngx_keyval_t));
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3398 if (conf->headers_source == NULL) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3399 return NGX_ERROR;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3400 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3401 }
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3402
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	3403 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	3404 if (headers->lengths == NULL) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3405 return NGX_ERROR;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3406 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3407
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	3408 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	3409 if (headers->values == NULL) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3410 return NGX_ERROR;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3411 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3412
4274 595560d9dcbf Fixed proxy_set_header inheritance with proxy_cache (ticket #45). Maxim Dounin <mdounin@mdounin.ru> parents: 4205 diff changeset	3413 src = conf->headers_source->elts;
595560d9dcbf Fixed proxy_set_header inheritance with proxy_cache (ticket #45). Maxim Dounin <mdounin@mdounin.ru> parents: 4205 diff changeset	3414 for (i = 0; i < conf->headers_source->nelts; i++) {
595560d9dcbf Fixed proxy_set_header inheritance with proxy_cache (ticket #45). Maxim Dounin <mdounin@mdounin.ru> parents: 4205 diff changeset	3415
595560d9dcbf Fixed proxy_set_header inheritance with proxy_cache (ticket #45). Maxim Dounin <mdounin@mdounin.ru> parents: 4205 diff changeset	3416 s = ngx_array_push(&headers_merged);
595560d9dcbf Fixed proxy_set_header inheritance with proxy_cache (ticket #45). Maxim Dounin <mdounin@mdounin.ru> parents: 4205 diff changeset	3417 if (s == NULL) {
595560d9dcbf Fixed proxy_set_header inheritance with proxy_cache (ticket #45). Maxim Dounin <mdounin@mdounin.ru> parents: 4205 diff changeset	3418 return NGX_ERROR;
595560d9dcbf Fixed proxy_set_header inheritance with proxy_cache (ticket #45). Maxim Dounin <mdounin@mdounin.ru> parents: 4205 diff changeset	3419 }
595560d9dcbf Fixed proxy_set_header inheritance with proxy_cache (ticket #45). Maxim Dounin <mdounin@mdounin.ru> parents: 4205 diff changeset	3420
595560d9dcbf Fixed proxy_set_header inheritance with proxy_cache (ticket #45). Maxim Dounin <mdounin@mdounin.ru> parents: 4205 diff changeset	3421 *s = src[i];
595560d9dcbf Fixed proxy_set_header inheritance with proxy_cache (ticket #45). Maxim Dounin <mdounin@mdounin.ru> parents: 4205 diff changeset	3422 }
595560d9dcbf Fixed proxy_set_header inheritance with proxy_cache (ticket #45). Maxim Dounin <mdounin@mdounin.ru> parents: 4205 diff changeset	3423
5909 8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	3424 h = default_headers;
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	3425
2705 d040c3786239 do not pass if-... headers for cacheable responses Igor Sysoev <igor@sysoev.ru> parents: 2672 diff changeset	3426 while (h->key.len) {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3427
4274 595560d9dcbf Fixed proxy_set_header inheritance with proxy_cache (ticket #45). Maxim Dounin <mdounin@mdounin.ru> parents: 4205 diff changeset	3428 src = headers_merged.elts;
595560d9dcbf Fixed proxy_set_header inheritance with proxy_cache (ticket #45). Maxim Dounin <mdounin@mdounin.ru> parents: 4205 diff changeset	3429 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	3430 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	3431 goto next;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3432 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3433 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3434
4274 595560d9dcbf Fixed proxy_set_header inheritance with proxy_cache (ticket #45). Maxim Dounin <mdounin@mdounin.ru> parents: 4205 diff changeset	3435 s = ngx_array_push(&headers_merged);
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3436 if (s == NULL) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3437 return NGX_ERROR;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3438 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3439
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3440 s = h;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3441
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3442 next:
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3443
2705 d040c3786239 do not pass if-... headers for cacheable responses Igor Sysoev <igor@sysoev.ru> parents: 2672 diff changeset	3444 h++;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3445 }
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3446
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3447
4274 595560d9dcbf Fixed proxy_set_header inheritance with proxy_cache (ticket #45). Maxim Dounin <mdounin@mdounin.ru> parents: 4205 diff changeset	3448 src = headers_merged.elts;
595560d9dcbf Fixed proxy_set_header inheritance with proxy_cache (ticket #45). Maxim Dounin <mdounin@mdounin.ru> parents: 4205 diff changeset	3449 for (i = 0; i < headers_merged.nelts; i++) {
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3450
3561 20708cffd6dc use local headers_names array instead of stored in configuration Igor Sysoev <igor@sysoev.ru> parents: 3526 diff changeset	3451 hk = ngx_array_push(&headers_names);
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	3452 if (hk == NULL) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3453 return NGX_ERROR;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3454 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3455
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	3456 hk->key = src[i].key;
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	3457 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	3458 hk->value = (void *) 1;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3459
519 12234c998d83 nginx-0.1.34-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 517 diff changeset	3460 if (src[i].value.len == 0) {
12234c998d83 nginx-0.1.34-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 517 diff changeset	3461 continue;
12234c998d83 nginx-0.1.34-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 517 diff changeset	3462 }
12234c998d83 nginx-0.1.34-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 517 diff changeset	3463
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3464 if (ngx_http_script_variables_count(&src[i].value) == 0) {
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	3465 copy = ngx_array_push_n(headers->lengths,
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3466 sizeof(ngx_http_script_copy_code_t));
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3467 if (copy == NULL) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3468 return NGX_ERROR;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3469 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3470
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3471 copy->code = (ngx_http_script_code_pt)
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3472 ngx_http_script_copy_len_code;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3473 copy->len = src[i].key.len + sizeof(": ") - 1
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3474 + src[i].value.len + sizeof(CRLF) - 1;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3475
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3476
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3477 size = (sizeof(ngx_http_script_copy_code_t)
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3478 + src[i].key.len + sizeof(": ") - 1
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3479 + src[i].value.len + sizeof(CRLF) - 1
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3480 + sizeof(uintptr_t) - 1)
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3481 & ~(sizeof(uintptr_t) - 1);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3482
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	3483 copy = ngx_array_push_n(headers->values, size);
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3484 if (copy == NULL) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3485 return NGX_ERROR;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3486 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3487
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3488 copy->code = ngx_http_script_copy_code;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3489 copy->len = src[i].key.len + sizeof(": ") - 1
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3490 + src[i].value.len + sizeof(CRLF) - 1;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3491
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3492 p = (u_char *) copy + sizeof(ngx_http_script_copy_code_t);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3493
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3494 p = ngx_cpymem(p, src[i].key.data, src[i].key.len);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3495 p++ = ':'; p++ = ' ';
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3496 p = ngx_cpymem(p, src[i].value.data, src[i].value.len);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3497 p++ = CR; p = LF;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3498
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3499 } else {
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	3500 copy = ngx_array_push_n(headers->lengths,
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3501 sizeof(ngx_http_script_copy_code_t));
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3502 if (copy == NULL) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3503 return NGX_ERROR;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3504 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3505
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3506 copy->code = (ngx_http_script_code_pt)
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3507 ngx_http_script_copy_len_code;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3508 copy->len = src[i].key.len + sizeof(": ") - 1;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3509
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3510
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3511 size = (sizeof(ngx_http_script_copy_code_t)
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3512 + src[i].key.len + sizeof(": ") - 1 + sizeof(uintptr_t) - 1)
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3513 & ~(sizeof(uintptr_t) - 1);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3514
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	3515 copy = ngx_array_push_n(headers->values, size);
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3516 if (copy == NULL) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3517 return NGX_ERROR;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3518 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3519
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3520 copy->code = ngx_http_script_copy_code;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3521 copy->len = src[i].key.len + sizeof(": ") - 1;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3522
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3523 p = (u_char *) copy + sizeof(ngx_http_script_copy_code_t);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3524 p = ngx_cpymem(p, src[i].key.data, src[i].key.len);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3525 p++ = ':'; p = ' ';
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3526
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3527
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3528 ngx_memzero(&sc, sizeof(ngx_http_script_compile_t));
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3529
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3530 sc.cf = cf;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3531 sc.source = &src[i].value;
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	3532 sc.flushes = &headers->flushes;
f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	3533 sc.lengths = &headers->lengths;
f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	3534 sc.values = &headers->values;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3535
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3536 if (ngx_http_script_compile(&sc) != NGX_OK) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3537 return NGX_ERROR;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3538 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3539
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3540
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	3541 copy = ngx_array_push_n(headers->lengths,
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3542 sizeof(ngx_http_script_copy_code_t));
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3543 if (copy == NULL) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3544 return NGX_ERROR;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3545 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3546
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3547 copy->code = (ngx_http_script_code_pt)
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3548 ngx_http_script_copy_len_code;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3549 copy->len = sizeof(CRLF) - 1;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3550
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3551
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3552 size = (sizeof(ngx_http_script_copy_code_t)
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3553 + sizeof(CRLF) - 1 + sizeof(uintptr_t) - 1)
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3554 & ~(sizeof(uintptr_t) - 1);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3555
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	3556 copy = ngx_array_push_n(headers->values, size);
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3557 if (copy == NULL) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3558 return NGX_ERROR;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3559 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3560
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3561 copy->code = ngx_http_script_copy_code;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3562 copy->len = sizeof(CRLF) - 1;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3563
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3564 p = (u_char *) copy + sizeof(ngx_http_script_copy_code_t);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3565 p++ = CR; p = LF;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3566 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3567
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	3568 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	3569 if (code == NULL) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3570 return NGX_ERROR;
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
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3573 *code = (uintptr_t) NULL;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3574
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	3575 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	3576 if (code == NULL) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3577 return NGX_ERROR;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3578 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3579
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3580 *code = (uintptr_t) NULL;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3581 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3582
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	3583 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	3584 if (code == NULL) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3585 return NGX_ERROR;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3586 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3587
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3588 *code = (uintptr_t) NULL;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3589
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3590
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	3591 hash.hash = &headers->hash;
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	3592 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	3593 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	3594 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	3595 hash.name = "proxy_headers_hash";
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	3596 hash.pool = cf->pool;
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	3597 hash.temp_pool = NULL;
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	3598
3561 20708cffd6dc use local headers_names array instead of stored in configuration Igor Sysoev <igor@sysoev.ru> parents: 3526 diff changeset	3599 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	3600 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3601
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3602
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3603 static char *
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3604 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	3605 {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3606 ngx_http_proxy_loc_conf_t *plcf = conf;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3607
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3608 size_t add;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3609 u_short port;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3610 ngx_str_t value, url;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3611 ngx_url_t u;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3612 ngx_uint_t n;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3613 ngx_http_core_loc_conf_t *clcf;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3614 ngx_http_script_compile_t sc;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3615
2391 d88e757cc7d8 delete surplus upstream.schema field Igor Sysoev <igor@sysoev.ru> parents: 2285 diff changeset	3616 if (plcf->upstream.upstream \|\| plcf->proxy_lengths) {
555 7bd37aef1e7e nginx-0.2.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 551 diff changeset	3617 return "is duplicate";
7bd37aef1e7e nginx-0.2.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 551 diff changeset	3618 }
7bd37aef1e7e nginx-0.2.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 551 diff changeset	3619
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3620 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	3621
2989 dff9764eaca2 do auto redirect for proxy_pass/fastcgi_pass with variables Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	3622 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	3623
dff9764eaca2 do auto redirect for proxy_pass/fastcgi_pass with variables Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	3624 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	3625 clcf->auto_redirect = 1;
dff9764eaca2 do auto redirect for proxy_pass/fastcgi_pass with variables Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	3626 }
dff9764eaca2 do auto redirect for proxy_pass/fastcgi_pass with variables Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	3627
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3628 value = cf->args->elts;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3629
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3630 url = &value[1];
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3631
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3632 n = ngx_http_script_variables_count(url);
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3633
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3634 if (n) {
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3635
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3636 ngx_memzero(&sc, sizeof(ngx_http_script_compile_t));
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3637
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3638 sc.cf = cf;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3639 sc.source = url;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3640 sc.lengths = &plcf->proxy_lengths;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3641 sc.values = &plcf->proxy_values;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3642 sc.variables = n;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3643 sc.complete_lengths = 1;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3644 sc.complete_values = 1;
1679 ca317d9b5c09 style fix: remove trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 1671 diff changeset	3645
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3646 if (ngx_http_script_compile(&sc) != NGX_OK) {
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3647 return NGX_CONF_ERROR;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3648 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3649
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3650 #if (NGX_HTTP_SSL)
5385 7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	3651 plcf->ssl = 1;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3652 #endif
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3653
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3654 return NGX_CONF_OK;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3655 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3656
1107 db7c468c447d ngx_strcasecmp()/ngx_strncasecmp() Igor Sysoev <igor@sysoev.ru> parents: 969 diff changeset	3657 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	3658 add = 7;
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	3659 port = 80;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3660
1107 db7c468c447d ngx_strcasecmp()/ngx_strncasecmp() Igor Sysoev <igor@sysoev.ru> parents: 969 diff changeset	3661 } 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	3662
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3663 #if (NGX_HTTP_SSL)
5385 7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	3664 plcf->ssl = 1;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3665
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3666 add = 8;
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	3667 port = 443;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3668 #else
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3669 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	3670 "https protocol requires SSL support");
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3671 return NGX_CONF_ERROR;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3672 #endif
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3673
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3674 } else {
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3675 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	3676 return NGX_CONF_ERROR;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3677 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3678
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	3679 ngx_memzero(&u, sizeof(ngx_url_t));
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	3680
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	3681 u.url.len = url->len - add;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	3682 u.url.data = url->data + add;
906 a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 896 diff changeset	3683 u.default_port = port;
a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 896 diff changeset	3684 u.uri_part = 1;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 843 diff changeset	3685 u.no_resolve = 1;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 843 diff changeset	3686
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 843 diff changeset	3687 plcf->upstream.upstream = ngx_http_upstream_add(cf, &u, 0);
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 843 diff changeset	3688 if (plcf->upstream.upstream == NULL) {
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3689 return NGX_CONF_ERROR;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3690 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3691
2391 d88e757cc7d8 delete surplus upstream.schema field Igor Sysoev <igor@sysoev.ru> parents: 2285 diff changeset	3692 plcf->vars.schema.len = add;
d88e757cc7d8 delete surplus upstream.schema field Igor Sysoev <igor@sysoev.ru> parents: 2285 diff changeset	3693 plcf->vars.schema.data = url->data;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3694 plcf->vars.key_start = plcf->vars.schema;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3695
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3696 ngx_http_proxy_set_vars(&u, &plcf->vars);
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3697
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3698 plcf->location = clcf->name;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3699
1353 7443fbe0b013 named location Igor Sysoev <igor@sysoev.ru> parents: 1339 diff changeset	3700 if (clcf->named
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3701 #if (NGX_PCRE)
1353 7443fbe0b013 named location Igor Sysoev <igor@sysoev.ru> parents: 1339 diff changeset	3702 \|\| clcf->regex
7443fbe0b013 named location Igor Sysoev <igor@sysoev.ru> parents: 1339 diff changeset	3703 #endif
7443fbe0b013 named location Igor Sysoev <igor@sysoev.ru> parents: 1339 diff changeset	3704 \|\| clcf->noname)
7443fbe0b013 named location Igor Sysoev <igor@sysoev.ru> parents: 1339 diff changeset	3705 {
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3706 if (plcf->vars.uri.len) {
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	3707 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	3708 "\"proxy_pass\" cannot have URI part in "
843 ebab9490204c allow proxy_pass inside limit_except Igor Sysoev <igor@sysoev.ru> parents: 812 diff changeset	3709 "location given by regular expression, "
1353 7443fbe0b013 named location Igor Sysoev <igor@sysoev.ru> parents: 1339 diff changeset	3710 "or inside named location, "
4593 834049edae24 Fixed grammar in error messages. Ruslan Ermilov <ru@nginx.com> parents: 4529 diff changeset	3711 "or inside \"if\" statement, "
834049edae24 Fixed grammar in error messages. Ruslan Ermilov <ru@nginx.com> parents: 4529 diff changeset	3712 "or inside \"limit_except\" block");
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	3713 return NGX_CONF_ERROR;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	3714 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	3715
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3716 plcf->location.len = 0;
555 7bd37aef1e7e nginx-0.2.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 551 diff changeset	3717 }
7bd37aef1e7e nginx-0.2.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 551 diff changeset	3718
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3719 plcf->url = *url;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3720
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3721 return NGX_CONF_OK;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3722 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3723
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3724
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3725 static char *
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3726 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	3727 {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3728 ngx_http_proxy_loc_conf_t *plcf = conf;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3729
4336 99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3730 u_char *p;
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3731 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	3732 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	3733 ngx_http_compile_complex_value_t ccv;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3734
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3735 if (plcf->redirect == 0) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3736 return NGX_CONF_OK;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3737 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3738
4422 b1a9d725ab69 Fixed proxy_redirect off inheritance. Valentin Bartenev <vbart@nginx.com> parents: 4412 diff changeset	3739 plcf->redirect = 1;
b1a9d725ab69 Fixed proxy_redirect off inheritance. Valentin Bartenev <vbart@nginx.com> parents: 4412 diff changeset	3740
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3741 value = cf->args->elts;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3742
2784 c2230102df6f ) check a proxy_redirect single parameter Igor Sysoev <igor@sysoev.ru>* parents: 2753 diff changeset	3743 if (cf->args->nelts == 2) {
c2230102df6f ) check a proxy_redirect single parameter Igor Sysoev <igor@sysoev.ru>* parents: 2753 diff changeset	3744 if (ngx_strcmp(value[1].data, "off") == 0) {
c2230102df6f ) check a proxy_redirect single parameter Igor Sysoev <igor@sysoev.ru>* parents: 2753 diff changeset	3745 plcf->redirect = 0;
c2230102df6f ) check a proxy_redirect single parameter Igor Sysoev <igor@sysoev.ru>* parents: 2753 diff changeset	3746 plcf->redirects = NULL;
c2230102df6f ) check a proxy_redirect single parameter Igor Sysoev <igor@sysoev.ru>* parents: 2753 diff changeset	3747 return NGX_CONF_OK;
c2230102df6f ) check a proxy_redirect single parameter Igor Sysoev <igor@sysoev.ru>* parents: 2753 diff changeset	3748 }
c2230102df6f ) check a proxy_redirect single parameter Igor Sysoev <igor@sysoev.ru>* parents: 2753 diff changeset	3749
c2230102df6f ) check a proxy_redirect single parameter Igor Sysoev <igor@sysoev.ru>* parents: 2753 diff changeset	3750 if (ngx_strcmp(value[1].data, "false") == 0) {
c2230102df6f ) check a proxy_redirect single parameter Igor Sysoev <igor@sysoev.ru>* parents: 2753 diff changeset	3751 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	3752 "invalid parameter \"false\", use \"off\" instead");
c2230102df6f ) check a proxy_redirect single parameter Igor Sysoev <igor@sysoev.ru>* parents: 2753 diff changeset	3753 plcf->redirect = 0;
c2230102df6f ) check a proxy_redirect single parameter Igor Sysoev <igor@sysoev.ru>* parents: 2753 diff changeset	3754 plcf->redirects = NULL;
c2230102df6f ) check a proxy_redirect single parameter Igor Sysoev <igor@sysoev.ru>* parents: 2753 diff changeset	3755 return NGX_CONF_OK;
c2230102df6f ) check a proxy_redirect single parameter Igor Sysoev <igor@sysoev.ru>* parents: 2753 diff changeset	3756 }
c2230102df6f ) check a proxy_redirect single parameter Igor Sysoev <igor@sysoev.ru>* parents: 2753 diff changeset	3757
c2230102df6f ) check a proxy_redirect single parameter Igor Sysoev <igor@sysoev.ru>* parents: 2753 diff changeset	3758 if (ngx_strcmp(value[1].data, "default") != 0) {
c2230102df6f ) check a proxy_redirect single parameter Igor Sysoev <igor@sysoev.ru>* parents: 2753 diff changeset	3759 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	3760 "invalid parameter \"%V\"", &value[1]);
c2230102df6f ) check a proxy_redirect single parameter Igor Sysoev <igor@sysoev.ru>* parents: 2753 diff changeset	3761 return NGX_CONF_ERROR;
c2230102df6f ) check a proxy_redirect single parameter Igor Sysoev <igor@sysoev.ru>* parents: 2753 diff changeset	3762 }
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3763 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3764
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3765 if (plcf->redirects == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3766 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	3767 sizeof(ngx_http_proxy_rewrite_t));
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3768 if (plcf->redirects == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3769 return NGX_CONF_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3770 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3771 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3772
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3773 pr = ngx_array_push(plcf->redirects);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3774 if (pr == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3775 return NGX_CONF_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3776 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3777
2784 c2230102df6f ) check a proxy_redirect single parameter Igor Sysoev <igor@sysoev.ru>* parents: 2753 diff changeset	3778 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	3779 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	3780 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	3781 "\"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	3782 "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	3783 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	3784 }
d8c56e7851b8 "proxy_redirect default" may not be used if a proxy_pass uses variables Igor Sysoev <igor@sysoev.ru> parents: 3470 diff changeset	3785
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3786 if (plcf->url.data == NULL) {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3787 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	3788 "\"proxy_redirect default\" should be placed "
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3789 "after the \"proxy_pass\" directive");
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3790 return NGX_CONF_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3791 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3792
4461 103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	3793 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	3794
103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	3795 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	3796
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3797 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	3798
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3799 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	3800 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	3801 pr->replacement.value = plcf->location;
653 7cbef16c71a1 nginx-0.3.48-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 651 diff changeset	3802
7cbef16c71a1 nginx-0.3.48-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 651 diff changeset	3803 } else {
4461 103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	3804 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	3805
103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	3806 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	3807 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	3808 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	3809 }
f4c49c9e4bb5 always test proxy_redirect with slash, this fixes a case when nginx uses Igor Sysoev <igor@sysoev.ru> parents: 3734 diff changeset	3810
4461 103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	3811 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	3812
f4c49c9e4bb5 always test proxy_redirect with slash, this fixes a case when nginx uses Igor Sysoev <igor@sysoev.ru> parents: 3734 diff changeset	3813 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	3814 *p = '/';
f4c49c9e4bb5 always test proxy_redirect with slash, this fixes a case when nginx uses Igor Sysoev <igor@sysoev.ru> parents: 3734 diff changeset	3815
4336 99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3816 ngx_str_set(&pr->replacement.value, "/");
653 7cbef16c71a1 nginx-0.3.48-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 651 diff changeset	3817 }
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3818
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3819 return NGX_CONF_OK;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3820 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3821
4336 99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3822
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3823 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	3824 value[1].len--;
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3825 value[1].data++;
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3826
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3827 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	3828 value[1].len--;
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3829 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	3830
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	3831 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	3832 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	3833 }
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	3834
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	3835 } else {
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	3836 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	3837 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	3838 }
4336 99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3839 }
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3840
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3841 } else {
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3842
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3843 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	3844
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3845 ccv.cf = cf;
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3846 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	3847 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	3848
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3849 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	3850 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	3851 }
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3852
4461 103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	3853 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	3854 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3855
4336 99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3856
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3857 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	3858
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3859 ccv.cf = cf;
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3860 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	3861 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	3862
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3863 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	3864 return NGX_CONF_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3865 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3866
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3867 return NGX_CONF_OK;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3868 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3869
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3870
4465 8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3871 static char *
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3872 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	3873 {
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3874 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	3875
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3876 ngx_str_t *value;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3877 ngx_http_proxy_rewrite_t *pr;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3878 ngx_http_compile_complex_value_t ccv;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3879
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3880 if (plcf->cookie_domains == NULL) {
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3881 return NGX_CONF_OK;
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
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3884 value = cf->args->elts;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3885
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3886 if (cf->args->nelts == 2) {
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 (ngx_strcmp(value[1].data, "off") == 0) {
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3889 plcf->cookie_domains = NULL;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3890 return NGX_CONF_OK;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3891 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3892
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3893 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	3894 "invalid parameter \"%V\"", &value[1]);
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3895 return NGX_CONF_ERROR;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3896 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3897
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3898 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	3899 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	3900 sizeof(ngx_http_proxy_rewrite_t));
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3901 if (plcf->cookie_domains == NULL) {
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3902 return NGX_CONF_ERROR;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3903 }
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
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3906 pr = ngx_array_push(plcf->cookie_domains);
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3907 if (pr == NULL) {
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3908 return NGX_CONF_ERROR;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3909 }
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 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	3916 return NGX_CONF_ERROR;
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
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3919 } else {
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3920
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3921 if (value[1].data[0] == '.') {
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3922 value[1].len--;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3923 value[1].data++;
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 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	3927
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3928 ccv.cf = cf;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3929 ccv.value = &value[1];
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3930 ccv.complex_value = &pr->pattern.complex;
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 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	3933 return NGX_CONF_ERROR;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3934 }
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 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	3937
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3938 if (value[2].data[0] == '.') {
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3939 value[2].len--;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3940 value[2].data++;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3941 }
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 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	3945
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3946 ccv.cf = cf;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3947 ccv.value = &value[2];
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3948 ccv.complex_value = &pr->replacement;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3949
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3950 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	3951 return NGX_CONF_ERROR;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3952 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3953
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3954 return NGX_CONF_OK;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3955 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3956
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3957
4466 b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3958 static char *
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3959 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	3960 {
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3961 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	3962
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3963 ngx_str_t *value;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3964 ngx_http_proxy_rewrite_t *pr;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3965 ngx_http_compile_complex_value_t ccv;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3966
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3967 if (plcf->cookie_paths == NULL) {
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3968 return NGX_CONF_OK;
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
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3971 value = cf->args->elts;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3972
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3973 if (cf->args->nelts == 2) {
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 (ngx_strcmp(value[1].data, "off") == 0) {
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3976 plcf->cookie_paths = NULL;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3977 return NGX_CONF_OK;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3978 }
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3979
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3980 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	3981 "invalid parameter \"%V\"", &value[1]);
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3982 return NGX_CONF_ERROR;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3983 }
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3984
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3985 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	3986 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	3987 sizeof(ngx_http_proxy_rewrite_t));
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3988 if (plcf->cookie_paths == NULL) {
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3989 return NGX_CONF_ERROR;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3990 }
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
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3993 pr = ngx_array_push(plcf->cookie_paths);
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3994 if (pr == NULL) {
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3995 return NGX_CONF_ERROR;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3996 }
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3997
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3998 if (value[1].data[0] == '~') {
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3999 value[1].len--;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4000 value[1].data++;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4001
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4002 if (value[1].data[0] == '*') {
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4003 value[1].len--;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4004 value[1].data++;
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 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	4007 return NGX_CONF_ERROR;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4008 }
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 } else {
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4011 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	4012 return NGX_CONF_ERROR;
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 }
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4015
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4016 } else {
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 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	4019
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4020 ccv.cf = cf;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4021 ccv.value = &value[1];
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4022 ccv.complex_value = &pr->pattern.complex;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4023
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4024 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	4025 return NGX_CONF_ERROR;
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
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4028 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	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 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	4032
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4033 ccv.cf = cf;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4034 ccv.value = &value[2];
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4035 ccv.complex_value = &pr->replacement;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4036
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4037 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	4038 return NGX_CONF_ERROR;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4039 }
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4040
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4041 return NGX_CONF_OK;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4042 }
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4043
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4044
4463 a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4045 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	4046 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	4047 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	4048 {
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4049 #if (NGX_PCRE)
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4050 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	4051 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	4052
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4053 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	4054
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4055 rc.pattern = *regex;
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4056 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	4057 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	4058
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4059 if (caseless) {
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4060 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	4061 }
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4062
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4063 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	4064 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	4065 return NGX_ERROR;
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4066 }
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 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	4069
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4070 return NGX_OK;
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4071
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4072 #else
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4073
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4074 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	4075 "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	4076 return NGX_ERROR;
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4077
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4078 #endif
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4079 }
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4080
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4081
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4082 static char *
1295 5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4083 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	4084 {
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4085 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	4086
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4087 ngx_str_t *value;
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4088 ngx_http_script_compile_t sc;
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4089
5947 d9025ea1f5a5 Upstream: simplified proxy_store and friends configuration code. Valentin Bartenev <vbart@nginx.com> parents: 5940 diff changeset	4090 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	4091 return "is duplicate";
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4092 }
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4093
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4094 value = cf->args->elts;
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4095
2895 d65e58a8d3a4 report about proxy/fastcgi_store and proxy/fastcgi_cache incompatibility Igor Sysoev <igor@sysoev.ru> parents: 2894 diff changeset	4096 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	4097 plcf->upstream.store = 0;
1295 5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4098 return NGX_CONF_OK;
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4099 }
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4100
2895 d65e58a8d3a4 report about proxy/fastcgi_store and proxy/fastcgi_cache incompatibility Igor Sysoev <igor@sysoev.ru> parents: 2894 diff changeset	4101 #if (NGX_HTTP_CACHE)
5949 634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	4102 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	4103 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	4104 }
d65e58a8d3a4 report about proxy/fastcgi_store and proxy/fastcgi_cache incompatibility Igor Sysoev <igor@sysoev.ru> parents: 2894 diff changeset	4105 #endif
d65e58a8d3a4 report about proxy/fastcgi_store and proxy/fastcgi_cache incompatibility Igor Sysoev <igor@sysoev.ru> parents: 2894 diff changeset	4106
5947 d9025ea1f5a5 Upstream: simplified proxy_store and friends configuration code. Valentin Bartenev <vbart@nginx.com> parents: 5940 diff changeset	4107 plcf->upstream.store = 1;
d9025ea1f5a5 Upstream: simplified proxy_store and friends configuration code. Valentin Bartenev <vbart@nginx.com> parents: 5940 diff changeset	4108
2895 d65e58a8d3a4 report about proxy/fastcgi_store and proxy/fastcgi_cache incompatibility Igor Sysoev <igor@sysoev.ru> parents: 2894 diff changeset	4109 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	4110 return NGX_CONF_OK;
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4111 }
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4112
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4113 /* include the terminating '\0' into script */
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4114 value[1].len++;
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 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	4117
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4118 sc.cf = cf;
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4119 sc.source = &value[1];
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4120 sc.lengths = &plcf->upstream.store_lengths;
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4121 sc.values = &plcf->upstream.store_values;
1563 022ec9420f80 style fix: remove double semicolons Igor Sysoev <igor@sysoev.ru> parents: 1488 diff changeset	4122 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	4123 sc.complete_lengths = 1;
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4124 sc.complete_values = 1;
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4125
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4126 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	4127 return NGX_CONF_ERROR;
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4128 }
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4129
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4130 return NGX_CONF_OK;
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4131 }
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4132
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4133
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4134 #if (NGX_HTTP_CACHE)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4135
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4136 static char *
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4137 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	4138 {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4139 ngx_http_proxy_loc_conf_t *plcf = conf;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4140
5951 610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4141 ngx_str_t *value;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4142 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	4143 ngx_http_compile_complex_value_t ccv;
2592 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 value = cf->args->elts;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4146
5949 634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	4147 if (plcf->upstream.cache != NGX_CONF_UNSET) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4148 return "is duplicate";
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4149 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4150
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4151 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	4152 plcf->upstream.cache = 0;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4153 return NGX_CONF_OK;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4154 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4155
5947 d9025ea1f5a5 Upstream: simplified proxy_store and friends configuration code. Valentin Bartenev <vbart@nginx.com> parents: 5940 diff changeset	4156 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	4157 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	4158 }
d65e58a8d3a4 report about proxy/fastcgi_store and proxy/fastcgi_cache incompatibility Igor Sysoev <igor@sysoev.ru> parents: 2894 diff changeset	4159
5949 634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	4160 plcf->upstream.cache = 1;
634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	4161
5951 610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4162 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	4163
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4164 ccv.cf = cf;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4165 ccv.value = &value[1];
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4166 ccv.complex_value = &cv;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4167
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4168 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	4169 return NGX_CONF_ERROR;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4170 }
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 if (cv.lengths != NULL) {
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 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	4175 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	4176 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	4177 return NGX_CONF_ERROR;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4178 }
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4179
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4180 *plcf->upstream.cache_value = cv;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4181
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4182 return NGX_CONF_OK;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4183 }
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4184
5949 634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	4185 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	4186 &ngx_http_proxy_module);
634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	4187 if (plcf->upstream.cache_zone == NULL) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4188 return NGX_CONF_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4189 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4190
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4191 return NGX_CONF_OK;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4192 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4193
2672 b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4194
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4195 static char *
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4196 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	4197 {
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4198 ngx_http_proxy_loc_conf_t *plcf = conf;
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4199
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4200 ngx_str_t *value;
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4201 ngx_http_compile_complex_value_t ccv;
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4202
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4203 value = cf->args->elts;
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4204
4947 4251e72b8bb4 Allow the complex value to be defined as an empty string. Ruslan Ermilov <ru@nginx.com> parents: 4927 diff changeset	4205 if (plcf->cache_key.value.data) {
2672 b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4206 return "is duplicate";
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 ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
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 ccv.cf = cf;
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4212 ccv.value = &value[1];
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4213 ccv.complex_value = &plcf->cache_key;
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4214
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4215 if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4216 return NGX_CONF_ERROR;
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4217 }
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4218
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4219 return NGX_CONF_OK;
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4220 }
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4221
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4222 #endif
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4223
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4224
5900 20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4225 #if (NGX_HTTP_SSL)
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 static char *
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4228 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	4229 {
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4230 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	4231
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4232 ngx_str_t *value;
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4233
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4234 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	4235 return "is duplicate";
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4236 }
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 value = cf->args->elts;
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4239
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4240 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	4241
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4242 if (plcf->ssl_passwords == NULL) {
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4243 return NGX_CONF_ERROR;
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4244 }
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4245
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4246 return NGX_CONF_OK;
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4247 }
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4248
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4249 #endif
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4250
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4251
1295 5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4252 static char *
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4253 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	4254 {
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4255 #if (NGX_FREEBSD)
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4256 ssize_t *np = data;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4257
673 b80f94fa2197 nginx-0.3.58-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 667 diff changeset	4258 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	4259 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4260 "\"proxy_send_lowat\" must be less than %d "
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4261 "(sysctl net.inet.tcp.sendspace)",
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4262 ngx_freebsd_net_inet_tcp_sendspace);
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4263
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4264 return NGX_CONF_ERROR;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4265 }
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 #elif !(NGX_HAVE_SO_SNDLOWAT)
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4268 ssize_t *np = data;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4269
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4270 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4271 "\"proxy_send_lowat\" is not supported, ignored");
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4272
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4273 *np = 0;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4274
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4275 #endif
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4276
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4277 return NGX_CONF_OK;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4278 }
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 843 diff changeset	4279
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 843 diff changeset	4280
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4281 #if (NGX_HTTP_SSL)
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 static ngx_int_t
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4284 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	4285 {
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4286 ngx_pool_cleanup_t *cln;
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 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	4289 if (plcf->upstream.ssl == NULL) {
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4290 return NGX_ERROR;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4291 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4292
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4293 plcf->upstream.ssl->log = cf->log;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4294
5385 7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	4295 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	4296 != NGX_OK)
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4297 {
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4298 return NGX_ERROR;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4299 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4300
5659 3fb6615bb87f Upstream: plugged potential memory leak on reload. Maxim Dounin <mdounin@mdounin.ru> parents: 5575 diff changeset	4301 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	4302 if (cln == NULL) {
3fb6615bb87f Upstream: plugged potential memory leak on reload. Maxim Dounin <mdounin@mdounin.ru> parents: 5575 diff changeset	4303 return NGX_ERROR;
3fb6615bb87f Upstream: plugged potential memory leak on reload. Maxim Dounin <mdounin@mdounin.ru> parents: 5575 diff changeset	4304 }
3fb6615bb87f Upstream: plugged potential memory leak on reload. Maxim Dounin <mdounin@mdounin.ru> parents: 5575 diff changeset	4305
3fb6615bb87f Upstream: plugged potential memory leak on reload. Maxim Dounin <mdounin@mdounin.ru> parents: 5575 diff changeset	4306 cln->handler = ngx_ssl_cleanup_ctx;
3fb6615bb87f Upstream: plugged potential memory leak on reload. Maxim Dounin <mdounin@mdounin.ru> parents: 5575 diff changeset	4307 cln->data = plcf->upstream.ssl;
3fb6615bb87f Upstream: plugged potential memory leak on reload. Maxim Dounin <mdounin@mdounin.ru> parents: 5575 diff changeset	4308
5900 20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4309 if (plcf->ssl_certificate.len) {
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4310
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4311 if (plcf->ssl_certificate_key.len == 0) {
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4312 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	4313 "no \"proxy_ssl_certificate_key\" is defined "
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4314 "for certificate \"%V\"", &plcf->ssl_certificate);
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4315 return NGX_ERROR;
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4316 }
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4317
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4318 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	4319 &plcf->ssl_certificate_key, plcf->ssl_passwords)
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4320 != NGX_OK)
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4321 {
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4322 return NGX_ERROR;
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4323 }
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4324 }
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4325
6591 04d8d1f85649 SSL: ngx_ssl_ciphers() to set list of ciphers. Tim Taubert <tim@timtaubert.de> parents: 6530 diff changeset	4326 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	4327 != NGX_OK)
5390 919d230ecdbe Proxy: added the "proxy_ssl_ciphers" directive. Piotr Sikora <piotr@cloudflare.com> parents: 5385 diff changeset	4328 {
919d230ecdbe Proxy: added the "proxy_ssl_ciphers" directive. Piotr Sikora <piotr@cloudflare.com> parents: 5385 diff changeset	4329 return NGX_ERROR;
919d230ecdbe Proxy: added the "proxy_ssl_ciphers" directive. Piotr Sikora <piotr@cloudflare.com> parents: 5385 diff changeset	4330 }
919d230ecdbe Proxy: added the "proxy_ssl_ciphers" directive. Piotr Sikora <piotr@cloudflare.com> parents: 5385 diff changeset	4331
5661 060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	4332 if (plcf->upstream.ssl_verify) {
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	4333 if (plcf->ssl_trusted_certificate.len == 0) {
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	4334 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	4335 "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	4336 return NGX_ERROR;
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	4337 }
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	4338
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	4339 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	4340 &plcf->ssl_trusted_certificate,
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	4341 plcf->ssl_verify_depth)
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	4342 != NGX_OK)
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	4343 {
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	4344 return NGX_ERROR;
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	4345 }
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	4346
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	4347 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	4348 return NGX_ERROR;
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	4349 }
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	4350 }
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	4351
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4352 return NGX_OK;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4353 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4354
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4355 #endif
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
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4358 static void
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4359 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	4360 {
2203 8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2184 diff changeset	4361 if (u->family != AF_UNIX) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4362
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4363 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	4364
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4365 v->host_header = u->host;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4366
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4367 if (u->default_port == 80) {
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3477 diff changeset	4368 ngx_str_set(&v->port, "80");
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4369
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4370 } else {
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3477 diff changeset	4371 ngx_str_set(&v->port, "443");
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4372 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4373
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4374 } 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	4375 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	4376 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	4377 v->port = u->port_text;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4378 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4379
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4380 v->key_start.len += v->host_header.len;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4381
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4382 } else {
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3477 diff changeset	4383 ngx_str_set(&v->host_header, "localhost");
dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3477 diff changeset	4384 ngx_str_null(&v->port);
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4385 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	4386 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4387
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4388 v->uri = u->uri;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4389 }

Mercurial > hg > nginx

annotate src/http/modules/ngx_http_proxy_module.c @ 6640:e78eca6bfaf0