nginx: src/http/modules/ngx_http_proxy

annotate src/http/modules/ngx_http_proxy_module.c @ 7730:1a719ee45526

Upstream: proxy_ssl_conf_command and friends. Similarly to ssl_conf_command, proxy_ssl_conf_command (grpc_ssl_conf_command, uwsgi_ssl_conf_command) can be used to set arbitrary OpenSSL configuration parameters as long as nginx is compiled with OpenSSL 1.0.2 or later, when connecting to upstream servers with SSL. Full list of available configuration commands can be found in the SSL_CONF_cmd manual page (https://www.openssl.org/docs/man1.1.1/man3/SSL_CONF_cmd.html).

author	Maxim Dounin <mdounin@mdounin.ru>
date	Thu, 22 Oct 2020 18:00:23 +0300
parents	485dba3e2a01
children	83c4622053b0

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
7716 d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	13 #define NGX_HTTP_PROXY_COOKIE_SECURE 0x0001
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	14 #define NGX_HTTP_PROXY_COOKIE_SECURE_ON 0x0002
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	15 #define NGX_HTTP_PROXY_COOKIE_SECURE_OFF 0x0004
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	16 #define NGX_HTTP_PROXY_COOKIE_HTTPONLY 0x0008
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	17 #define NGX_HTTP_PROXY_COOKIE_HTTPONLY_ON 0x0010
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	18 #define NGX_HTTP_PROXY_COOKIE_HTTPONLY_OFF 0x0020
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	19 #define NGX_HTTP_PROXY_COOKIE_SAMESITE 0x0040
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	20 #define NGX_HTTP_PROXY_COOKIE_SAMESITE_STRICT 0x0080
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	21 #define NGX_HTTP_PROXY_COOKIE_SAMESITE_LAX 0x0100
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	22 #define NGX_HTTP_PROXY_COOKIE_SAMESITE_NONE 0x0200
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	23 #define NGX_HTTP_PROXY_COOKIE_SAMESITE_OFF 0x0400
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	24
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	25
5951 610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	26 typedef struct {
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	27 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	28 } 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	29
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	30
4461 103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	31 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	32
103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	33 typedef ngx_int_t (ngx_http_proxy_rewrite_pt)(ngx_http_request_t r,
7715 5c7917292b29 Proxy: changed interface of some internal functions. Ruslan Ermilov <ru@nginx.com> parents: 7714 diff changeset	34 ngx_str_t *value, size_t prefix, size_t len,
4462 a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	35 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	36
103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	37 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	38 ngx_http_proxy_rewrite_pt handler;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	39
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	40 union {
4336 99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	41 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	42 #if (NGX_PCRE)
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	43 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	44 #endif
4461 103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	45 } pattern;
4336 99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	46
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	47 ngx_http_complex_value_t replacement;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	48 };
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	49
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	50
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	51 typedef struct {
7716 d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	52 union {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	53 ngx_http_complex_value_t complex;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	54 #if (NGX_PCRE)
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	55 ngx_http_regex_t *regex;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	56 #endif
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	57 } cookie;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	58
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	59 ngx_uint_t flags;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	60 ngx_uint_t regex;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	61 } ngx_http_proxy_cookie_flags_t;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	62
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	63
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	64 typedef struct {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	65 ngx_str_t key_start;
2391 d88e757cc7d8 delete surplus upstream.schema field Igor Sysoev <igor@sysoev.ru> parents: 2285 diff changeset	66 ngx_str_t schema;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	67 ngx_str_t host_header;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	68 ngx_str_t port;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	69 ngx_str_t uri;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	70 } ngx_http_proxy_vars_t;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	71
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	72
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	73 typedef struct {
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	74 ngx_array_t *flushes;
f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	75 ngx_array_t *lengths;
f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	76 ngx_array_t *values;
f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	77 ngx_hash_t hash;
f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	78 } ngx_http_proxy_headers_t;
f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	79
f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	80
f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	81 typedef struct {
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	82 ngx_http_upstream_conf_t upstream;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	83
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	84 ngx_array_t *body_flushes;
5910 29fa5023bd6f Proxy: renamed and rearranged fields in proxy configuration. Roman Arutyunyan <arut@nginx.com> parents: 5909 diff changeset	85 ngx_array_t *body_lengths;
29fa5023bd6f Proxy: renamed and rearranged fields in proxy configuration. Roman Arutyunyan <arut@nginx.com> parents: 5909 diff changeset	86 ngx_array_t *body_values;
29fa5023bd6f Proxy: renamed and rearranged fields in proxy configuration. Roman Arutyunyan <arut@nginx.com> parents: 5909 diff changeset	87 ngx_str_t body_source;
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	88
f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	89 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	90 #if (NGX_HTTP_CACHE)
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	91 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	92 #endif
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	93 ngx_array_t *headers_source;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	94
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	95 ngx_array_t *proxy_lengths;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	96 ngx_array_t *proxy_values;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	97
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	98 ngx_array_t *redirects;
4465 8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	99 ngx_array_t *cookie_domains;
4466 b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	100 ngx_array_t *cookie_paths;
7716 d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	101 ngx_array_t *cookie_flags;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	102
6781 ca27074f8f0f Proxy: support variables for proxy_method directive. Dmitry Lazurkin <dilaz03@gmail.com> parents: 6747 diff changeset	103 ngx_http_complex_value_t *method;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	104 ngx_str_t location;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	105 ngx_str_t url;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	106
2672 b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	107 #if (NGX_HTTP_CACHE)
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	108 ngx_http_complex_value_t cache_key;
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	109 #endif
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	110
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	111 ngx_http_proxy_vars_t vars;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	112
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	113 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	114
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	115 ngx_uint_t http_version;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	116
1180 1666b7b0bafc proxy_headers_hash_max_size and proxy_headers_hash_bucket_size Igor Sysoev <igor@sysoev.ru> parents: 1125 diff changeset	117 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	118 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	119
7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	120 #if (NGX_HTTP_SSL)
7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	121 ngx_uint_t ssl;
7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	122 ngx_uint_t ssl_protocols;
5390 919d230ecdbe Proxy: added the "proxy_ssl_ciphers" directive. Piotr Sikora <piotr@cloudflare.com> parents: 5385 diff changeset	123 ngx_str_t ssl_ciphers;
5661 060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	124 ngx_uint_t ssl_verify_depth;
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	125 ngx_str_t ssl_trusted_certificate;
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	126 ngx_str_t ssl_crl;
5900 20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	127 ngx_str_t ssl_certificate;
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	128 ngx_str_t ssl_certificate_key;
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	129 ngx_array_t *ssl_passwords;
7730 1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7728 diff changeset	130 ngx_array_t *ssl_conf_commands;
5385 7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	131 #endif
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	132 } ngx_http_proxy_loc_conf_t;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	133
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	134
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	135 typedef struct {
3627 9061fdb2ed8c use ngx_http_parse_status_line() Igor Sysoev <igor@sysoev.ru> parents: 3615 diff changeset	136 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	137 ngx_http_chunked_t chunked;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	138 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	139 off_t internal_body_length;
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	140
6051 d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	141 ngx_chain_t *free;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	142 ngx_chain_t *busy;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	143
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	144 unsigned head:1;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	145 unsigned internal_chunked:1;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	146 unsigned header_sent:1;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	147 } ngx_http_proxy_ctx_t;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	148
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	149
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	150 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	151 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	152 #if (NGX_HTTP_CACHE)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	153 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	154 #endif
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	155 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	156 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	157 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	158 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	159 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	160 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	161 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	162 ngx_buf_t *buf);
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	163 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	164 ngx_buf_t *buf);
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	165 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	166 ssize_t bytes);
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	167 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	168 ssize_t bytes);
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	169 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	170 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	171 ngx_int_t rc);
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	172
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	173 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	174 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	175 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	176 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	177 static ngx_int_t
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	178 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	179 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	180 static ngx_int_t
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	181 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	182 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	183 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	184 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	185 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	186 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	187 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	188 ngx_table_elt_t *h);
7716 d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	189 static ngx_int_t ngx_http_proxy_parse_cookie(ngx_str_t *value,
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	190 ngx_array_t *attrs);
4465 8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	191 static ngx_int_t ngx_http_proxy_rewrite_cookie_value(ngx_http_request_t *r,
7716 d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	192 ngx_str_t value, ngx_array_t rewrites);
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	193 static ngx_int_t ngx_http_proxy_rewrite_cookie_flags(ngx_http_request_t *r,
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	194 ngx_array_t attrs, ngx_array_t flags);
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	195 static ngx_int_t ngx_http_proxy_edit_cookie_flags(ngx_http_request_t *r,
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	196 ngx_array_t *attrs, ngx_uint_t flags);
4462 a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	197 static ngx_int_t ngx_http_proxy_rewrite(ngx_http_request_t *r,
7715 5c7917292b29 Proxy: changed interface of some internal functions. Ruslan Ermilov <ru@nginx.com> parents: 7714 diff changeset	198 ngx_str_t value, 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	199
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	200 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	201 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	202 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	203 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	204 void parent, void child);
5907 195561ef367f Upstream: moved header initializations to separate functions. Roman Arutyunyan <arut@nginx.com> parents: 5905 diff changeset	205 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	206 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	207 ngx_keyval_t *default_headers);
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	208
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	209 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	210 void *conf);
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	211 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	212 void *conf);
4465 8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	213 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	214 void *conf);
4466 b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	215 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	216 void *conf);
7716 d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	217 static char ngx_http_proxy_cookie_flags(ngx_conf_t cf, ngx_command_t *cmd,
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	218 void *conf);
1295 5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	219 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	220 void *conf);
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	221 #if (NGX_HTTP_CACHE)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	222 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	223 void *conf);
2672 b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	224 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	225 void *conf);
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	226 #endif
5900 20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	227 #if (NGX_HTTP_SSL)
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	228 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	229 ngx_command_t cmd, void conf);
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	230 #endif
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	231
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	232 static char ngx_http_proxy_lowat_check(ngx_conf_t cf, void post, void data);
7730 1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7728 diff changeset	233 #if (NGX_HTTP_SSL)
1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7728 diff changeset	234 static char ngx_http_proxy_ssl_conf_command_check(ngx_conf_t cf, void *post,
1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7728 diff changeset	235 void *data);
1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7728 diff changeset	236 #endif
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	237
4463 a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	238 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	239 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	240
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	241 #if (NGX_HTTP_SSL)
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	242 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	243 ngx_http_proxy_loc_conf_t *plcf);
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	244 #endif
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	245 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	246
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	247
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	248 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	249 { ngx_http_proxy_lowat_check };
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	250
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	251
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	252 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	253 { ngx_string("error"), NGX_HTTP_UPSTREAM_FT_ERROR },
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	254 { ngx_string("timeout"), NGX_HTTP_UPSTREAM_FT_TIMEOUT },
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	255 { 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	256 { 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	257 { 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	258 { 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	259 { 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	260 { 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	261 { 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	262 { ngx_string("http_404"), NGX_HTTP_UPSTREAM_FT_HTTP_404 },
6966 fa56ab75cffc Upstream: allow recovery from "429 Too Many Requests" response. Piotr Sikora <piotrsikora@google.com> parents: 6906 diff changeset	263 { ngx_string("http_429"), NGX_HTTP_UPSTREAM_FT_HTTP_429 },
2927 55ceaef03d34 proxy_cache_use_stale/fastcgi_cache_use_stale updating Igor Sysoev <igor@sysoev.ru> parents: 2912 diff changeset	264 { 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	265 { ngx_string("off"), NGX_HTTP_UPSTREAM_FT_OFF },
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	266 { ngx_null_string, 0 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	267 };
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	268
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	269
5385 7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	270 #if (NGX_HTTP_SSL)
7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	271
7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	272 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	273 { ngx_string("SSLv2"), NGX_SSL_SSLv2 },
7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	274 { ngx_string("SSLv3"), NGX_SSL_SSLv3 },
7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	275 { ngx_string("TLSv1"), NGX_SSL_TLSv1 },
7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	276 { 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	277 { ngx_string("TLSv1.2"), NGX_SSL_TLSv1_2 },
6981 08dc60979133 SSL: added support for TLSv1.3 in ssl_protocols directive. Sergey Kandaurov <pluknet@nginx.com> parents: 6966 diff changeset	278 { ngx_string("TLSv1.3"), NGX_SSL_TLSv1_3 },
5385 7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	279 { ngx_null_string, 0 }
7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	280 };
7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	281
7730 1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7728 diff changeset	282 static ngx_conf_post_t ngx_http_proxy_ssl_conf_command_post =
1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7728 diff changeset	283 { ngx_http_proxy_ssl_conf_command_check };
1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7728 diff changeset	284
5385 7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	285 #endif
7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	286
7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	287
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	288 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	289 { 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	290 { 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	291 { ngx_null_string, 0 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	292 };
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	293
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	294
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	295 ngx_module_t ngx_http_proxy_module;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	296
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	297
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	298 static ngx_command_t ngx_http_proxy_commands[] = {
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	299
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	300 { ngx_string("proxy_pass"),
843 ebab9490204c allow proxy_pass inside limit_except Igor Sysoev <igor@sysoev.ru> parents: 812 diff changeset	301 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	302 ngx_http_proxy_pass,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	303 NGX_HTTP_LOC_CONF_OFFSET,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	304 0,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	305 NULL },
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	306
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	307 { ngx_string("proxy_redirect"),
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	308 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	309 ngx_http_proxy_redirect,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	310 NGX_HTTP_LOC_CONF_OFFSET,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	311 0,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	312 NULL },
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	313
4465 8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	314 { ngx_string("proxy_cookie_domain"),
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	315 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	316 ngx_http_proxy_cookie_domain,
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	317 NGX_HTTP_LOC_CONF_OFFSET,
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	318 0,
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	319 NULL },
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	320
4466 b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	321 { ngx_string("proxy_cookie_path"),
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	322 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	323 ngx_http_proxy_cookie_path,
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	324 NGX_HTTP_LOC_CONF_OFFSET,
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	325 0,
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	326 NULL },
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	327
7716 d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	328 { ngx_string("proxy_cookie_flags"),
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	329 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1234,
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	330 ngx_http_proxy_cookie_flags,
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	331 NGX_HTTP_LOC_CONF_OFFSET,
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	332 0,
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	333 NULL },
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	334
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1244 diff changeset	335 { ngx_string("proxy_store"),
1295 5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	336 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	337 ngx_http_proxy_store,
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	338 NGX_HTTP_LOC_CONF_OFFSET,
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	339 0,
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	340 NULL },
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	341
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	342 { ngx_string("proxy_store_access"),
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1244 diff changeset	343 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	344 ngx_conf_set_access_slot,
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1244 diff changeset	345 NGX_HTTP_LOC_CONF_OFFSET,
1295 5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	346 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	347 NULL },
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1244 diff changeset	348
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 579 diff changeset	349 { ngx_string("proxy_buffering"),
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 579 diff changeset	350 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	351 ngx_conf_set_flag_slot,
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 579 diff changeset	352 NGX_HTTP_LOC_CONF_OFFSET,
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 579 diff changeset	353 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	354 NULL },
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 579 diff changeset	355
6050 a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	356 { ngx_string("proxy_request_buffering"),
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	357 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	358 ngx_conf_set_flag_slot,
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	359 NGX_HTTP_LOC_CONF_OFFSET,
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	360 offsetof(ngx_http_proxy_loc_conf_t, upstream.request_buffering),
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	361 NULL },
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	362
629 65bf042c0b4f nginx-0.3.36-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 627 diff changeset	363 { ngx_string("proxy_ignore_client_abort"),
65bf042c0b4f nginx-0.3.36-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 627 diff changeset	364 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	365 ngx_conf_set_flag_slot,
65bf042c0b4f nginx-0.3.36-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 627 diff changeset	366 NGX_HTTP_LOC_CONF_OFFSET,
65bf042c0b4f nginx-0.3.36-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 627 diff changeset	367 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	368 NULL },
65bf042c0b4f nginx-0.3.36-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 627 diff changeset	369
3271 fcd98af88df3 proxy_bind, fastcgi_bind, and memcached_bind Igor Sysoev <igor@sysoev.ru> parents: 3006 diff changeset	370 { ngx_string("proxy_bind"),
6530 1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6480 diff changeset	371 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	372 ngx_http_upstream_bind_set_slot,
3271 fcd98af88df3 proxy_bind, fastcgi_bind, and memcached_bind Igor Sysoev <igor@sysoev.ru> parents: 3006 diff changeset	373 NGX_HTTP_LOC_CONF_OFFSET,
fcd98af88df3 proxy_bind, fastcgi_bind, and memcached_bind Igor Sysoev <igor@sysoev.ru> parents: 3006 diff changeset	374 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	375 NULL },
fcd98af88df3 proxy_bind, fastcgi_bind, and memcached_bind Igor Sysoev <igor@sysoev.ru> parents: 3006 diff changeset	376
7371 8b68d50090e4 Upstream: proxy_socket_keepalive and friends. Vladimir Homutov <vl@nginx.com> parents: 7321 diff changeset	377 { ngx_string("proxy_socket_keepalive"),
8b68d50090e4 Upstream: proxy_socket_keepalive and friends. Vladimir Homutov <vl@nginx.com> parents: 7321 diff changeset	378 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_FLAG,
8b68d50090e4 Upstream: proxy_socket_keepalive and friends. Vladimir Homutov <vl@nginx.com> parents: 7321 diff changeset	379 ngx_conf_set_flag_slot,
8b68d50090e4 Upstream: proxy_socket_keepalive and friends. Vladimir Homutov <vl@nginx.com> parents: 7321 diff changeset	380 NGX_HTTP_LOC_CONF_OFFSET,
8b68d50090e4 Upstream: proxy_socket_keepalive and friends. Vladimir Homutov <vl@nginx.com> parents: 7321 diff changeset	381 offsetof(ngx_http_proxy_loc_conf_t, upstream.socket_keepalive),
8b68d50090e4 Upstream: proxy_socket_keepalive and friends. Vladimir Homutov <vl@nginx.com> parents: 7321 diff changeset	382 NULL },
8b68d50090e4 Upstream: proxy_socket_keepalive and friends. Vladimir Homutov <vl@nginx.com> parents: 7321 diff changeset	383
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	384 { ngx_string("proxy_connect_timeout"),
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	385 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	386 ngx_conf_set_msec_slot,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	387 NGX_HTTP_LOC_CONF_OFFSET,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	388 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	389 NULL },
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	390
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	391 { ngx_string("proxy_send_timeout"),
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	392 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	393 ngx_conf_set_msec_slot,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	394 NGX_HTTP_LOC_CONF_OFFSET,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	395 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	396 NULL },
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	397
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	398 { ngx_string("proxy_send_lowat"),
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	399 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	400 ngx_conf_set_size_slot,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	401 NGX_HTTP_LOC_CONF_OFFSET,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	402 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	403 &ngx_http_proxy_lowat_post },
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	404
657 400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	405 { ngx_string("proxy_intercept_errors"),
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	406 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	407 ngx_conf_set_flag_slot,
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	408 NGX_HTTP_LOC_CONF_OFFSET,
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	409 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	410 NULL },
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	411
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	412 { ngx_string("proxy_set_header"),
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	413 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	414 ngx_conf_set_keyval_slot,
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	415 NGX_HTTP_LOC_CONF_OFFSET,
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	416 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	417 NULL },
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	418
1180 1666b7b0bafc proxy_headers_hash_max_size and proxy_headers_hash_bucket_size Igor Sysoev <igor@sysoev.ru> parents: 1125 diff changeset	419 { 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	420 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	421 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	422 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	423 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	424 NULL },
1666b7b0bafc proxy_headers_hash_max_size and proxy_headers_hash_bucket_size Igor Sysoev <igor@sysoev.ru> parents: 1125 diff changeset	425
1666b7b0bafc proxy_headers_hash_max_size and proxy_headers_hash_bucket_size Igor Sysoev <igor@sysoev.ru> parents: 1125 diff changeset	426 { 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	427 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	428 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	429 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	430 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	431 NULL },
1666b7b0bafc proxy_headers_hash_max_size and proxy_headers_hash_bucket_size Igor Sysoev <igor@sysoev.ru> parents: 1125 diff changeset	432
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	433 { ngx_string("proxy_set_body"),
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	434 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	435 ngx_conf_set_str_slot,
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	436 NGX_HTTP_LOC_CONF_OFFSET,
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	437 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	438 NULL },
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	439
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	440 { ngx_string("proxy_method"),
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	441 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
6781 ca27074f8f0f Proxy: support variables for proxy_method directive. Dmitry Lazurkin <dilaz03@gmail.com> parents: 6747 diff changeset	442 ngx_http_set_complex_value_slot,
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	443 NGX_HTTP_LOC_CONF_OFFSET,
561 e48ebafc6939 nginx-0.3.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 555 diff changeset	444 offsetof(ngx_http_proxy_loc_conf_t, method),
e48ebafc6939 nginx-0.3.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 555 diff changeset	445 NULL },
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	446
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	447 { ngx_string("proxy_pass_request_headers"),
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	448 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	449 ngx_conf_set_flag_slot,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	450 NGX_HTTP_LOC_CONF_OFFSET,
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	451 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	452 NULL },
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	453
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	454 { ngx_string("proxy_pass_request_body"),
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	455 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	456 ngx_conf_set_flag_slot,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	457 NGX_HTTP_LOC_CONF_OFFSET,
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	458 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	459 NULL },
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	460
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 579 diff changeset	461 { ngx_string("proxy_buffer_size"),
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 579 diff changeset	462 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	463 ngx_conf_set_size_slot,
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 579 diff changeset	464 NGX_HTTP_LOC_CONF_OFFSET,
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 579 diff changeset	465 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	466 NULL },
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 579 diff changeset	467
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	468 { ngx_string("proxy_read_timeout"),
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	469 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	470 ngx_conf_set_msec_slot,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	471 NGX_HTTP_LOC_CONF_OFFSET,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	472 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	473 NULL },
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	474
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	475 { ngx_string("proxy_buffers"),
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	476 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	477 ngx_conf_set_bufs_slot,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	478 NGX_HTTP_LOC_CONF_OFFSET,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	479 offsetof(ngx_http_proxy_loc_conf_t, upstream.bufs),
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	480 NULL },
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	481
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	482 { ngx_string("proxy_busy_buffers_size"),
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	483 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	484 ngx_conf_set_size_slot,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	485 NGX_HTTP_LOC_CONF_OFFSET,
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	486 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	487 NULL },
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	488
5874 2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	489 { ngx_string("proxy_force_ranges"),
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	490 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	491 ngx_conf_set_flag_slot,
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	492 NGX_HTTP_LOC_CONF_OFFSET,
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	493 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	494 NULL },
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	495
5883 973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5874 diff changeset	496 { ngx_string("proxy_limit_rate"),
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5874 diff changeset	497 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	498 ngx_conf_set_size_slot,
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5874 diff changeset	499 NGX_HTTP_LOC_CONF_OFFSET,
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5874 diff changeset	500 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	501 NULL },
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5874 diff changeset	502
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	503 #if (NGX_HTTP_CACHE)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	504
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	505 { ngx_string("proxy_cache"),
3729 4b773fc06336 fix directive type Igor Sysoev <igor@sysoev.ru> parents: 3700 diff changeset	506 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	507 ngx_http_proxy_cache,
2597 86967878cd76 fix the previous commit Igor Sysoev <igor@sysoev.ru> parents: 2596 diff changeset	508 NGX_HTTP_LOC_CONF_OFFSET,
2596 9a265cd00ba5 axe old definition fields Igor Sysoev <igor@sysoev.ru> parents: 2592 diff changeset	509 0,
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	510 NULL },
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	511
2672 b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	512 { ngx_string("proxy_cache_key"),
3729 4b773fc06336 fix directive type Igor Sysoev <igor@sysoev.ru> parents: 3700 diff changeset	513 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	514 ngx_http_proxy_cache_key,
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	515 NGX_HTTP_LOC_CONF_OFFSET,
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	516 0,
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	517 NULL },
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	518
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	519 { ngx_string("proxy_cache_path"),
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	520 NGX_HTTP_MAIN_CONF\|NGX_CONF_2MORE,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	521 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	522 NGX_HTTP_MAIN_CONF_OFFSET,
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	523 offsetof(ngx_http_proxy_main_conf_t, caches),
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	524 &ngx_http_proxy_module },
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	525
3699 b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3692 diff changeset	526 { 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	527 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	528 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	529 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	530 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	531 NULL },
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3692 diff changeset	532
3526 62a4fd1e6e2c proxy_no_cache and fastcgi_no_cache Igor Sysoev <igor@sysoev.ru> parents: 3523 diff changeset	533 { ngx_string("proxy_no_cache"),
62a4fd1e6e2c proxy_no_cache and fastcgi_no_cache Igor Sysoev <igor@sysoev.ru> parents: 3523 diff changeset	534 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	535 ngx_http_set_predicate_slot,
3526 62a4fd1e6e2c proxy_no_cache and fastcgi_no_cache Igor Sysoev <igor@sysoev.ru> parents: 3523 diff changeset	536 NGX_HTTP_LOC_CONF_OFFSET,
62a4fd1e6e2c proxy_no_cache and fastcgi_no_cache Igor Sysoev <igor@sysoev.ru> parents: 3523 diff changeset	537 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	538 NULL },
62a4fd1e6e2c proxy_no_cache and fastcgi_no_cache Igor Sysoev <igor@sysoev.ru> parents: 3523 diff changeset	539
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	540 { ngx_string("proxy_cache_valid"),
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	541 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	542 ngx_http_file_cache_valid_set_slot,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	543 NGX_HTTP_LOC_CONF_OFFSET,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	544 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	545 NULL },
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	546
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	547 { ngx_string("proxy_cache_min_uses"),
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	548 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	549 ngx_conf_set_num_slot,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	550 NGX_HTTP_LOC_CONF_OFFSET,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	551 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	552 NULL },
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	553
6793 0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6785 diff changeset	554 { ngx_string("proxy_cache_max_range_offset"),
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6785 diff changeset	555 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6785 diff changeset	556 ngx_conf_set_off_slot,
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6785 diff changeset	557 NGX_HTTP_LOC_CONF_OFFSET,
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6785 diff changeset	558 offsetof(ngx_http_proxy_loc_conf_t, upstream.cache_max_range_offset),
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6785 diff changeset	559 NULL },
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6785 diff changeset	560
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	561 { ngx_string("proxy_cache_use_stale"),
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	562 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	563 ngx_conf_set_bitmask_slot,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	564 NGX_HTTP_LOC_CONF_OFFSET,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	565 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	566 &ngx_http_proxy_next_upstream_masks },
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	567
2875 6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2786 diff changeset	568 { ngx_string("proxy_cache_methods"),
6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2786 diff changeset	569 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	570 ngx_conf_set_bitmask_slot,
6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2786 diff changeset	571 NGX_HTTP_LOC_CONF_OFFSET,
6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2786 diff changeset	572 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	573 &ngx_http_upstream_cache_method_mask },
6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2786 diff changeset	574
4385 70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4377 diff changeset	575 { ngx_string("proxy_cache_lock"),
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4377 diff changeset	576 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	577 ngx_conf_set_flag_slot,
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4377 diff changeset	578 NGX_HTTP_LOC_CONF_OFFSET,
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4377 diff changeset	579 offsetof(ngx_http_proxy_loc_conf_t, upstream.cache_lock),
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4377 diff changeset	580 NULL },
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4377 diff changeset	581
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4377 diff changeset	582 { ngx_string("proxy_cache_lock_timeout"),
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4377 diff changeset	583 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	584 ngx_conf_set_msec_slot,
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4377 diff changeset	585 NGX_HTTP_LOC_CONF_OFFSET,
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4377 diff changeset	586 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	587 NULL },
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4377 diff changeset	588
5905 2f7e557eab5b Cache: proxy_cache_lock_age and friends. Roman Arutyunyan <arut@nginx.com> parents: 5900 diff changeset	589 { ngx_string("proxy_cache_lock_age"),
2f7e557eab5b Cache: proxy_cache_lock_age and friends. Roman Arutyunyan <arut@nginx.com> parents: 5900 diff changeset	590 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	591 ngx_conf_set_msec_slot,
2f7e557eab5b Cache: proxy_cache_lock_age and friends. Roman Arutyunyan <arut@nginx.com> parents: 5900 diff changeset	592 NGX_HTTP_LOC_CONF_OFFSET,
2f7e557eab5b Cache: proxy_cache_lock_age and friends. Roman Arutyunyan <arut@nginx.com> parents: 5900 diff changeset	593 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	594 NULL },
2f7e557eab5b Cache: proxy_cache_lock_age and friends. Roman Arutyunyan <arut@nginx.com> parents: 5900 diff changeset	595
5441 43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5391 diff changeset	596 { ngx_string("proxy_cache_revalidate"),
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5391 diff changeset	597 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	598 ngx_conf_set_flag_slot,
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5391 diff changeset	599 NGX_HTTP_LOC_CONF_OFFSET,
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5391 diff changeset	600 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	601 NULL },
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5391 diff changeset	602
6290 4d5ac1a31d44 Upstream: proxy_cache_convert_head directive. Roman Arutyunyan <arut@nginx.com> parents: 6157 diff changeset	603 { ngx_string("proxy_cache_convert_head"),
4d5ac1a31d44 Upstream: proxy_cache_convert_head directive. Roman Arutyunyan <arut@nginx.com> parents: 6157 diff changeset	604 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	605 ngx_conf_set_flag_slot,
4d5ac1a31d44 Upstream: proxy_cache_convert_head directive. Roman Arutyunyan <arut@nginx.com> parents: 6157 diff changeset	606 NGX_HTTP_LOC_CONF_OFFSET,
4d5ac1a31d44 Upstream: proxy_cache_convert_head directive. Roman Arutyunyan <arut@nginx.com> parents: 6157 diff changeset	607 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	608 NULL },
4d5ac1a31d44 Upstream: proxy_cache_convert_head directive. Roman Arutyunyan <arut@nginx.com> parents: 6157 diff changeset	609
6906 1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6793 diff changeset	610 { ngx_string("proxy_cache_background_update"),
1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6793 diff changeset	611 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_FLAG,
1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6793 diff changeset	612 ngx_conf_set_flag_slot,
1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6793 diff changeset	613 NGX_HTTP_LOC_CONF_OFFSET,
1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6793 diff changeset	614 offsetof(ngx_http_proxy_loc_conf_t, upstream.cache_background_update),
1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6793 diff changeset	615 NULL },
1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6793 diff changeset	616
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	617 #endif
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	618
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	619 { ngx_string("proxy_temp_path"),
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	620 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	621 ngx_conf_set_path_slot,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	622 NGX_HTTP_LOC_CONF_OFFSET,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	623 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	624 NULL },
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	625
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	626 { ngx_string("proxy_max_temp_file_size"),
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	627 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	628 ngx_conf_set_size_slot,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	629 NGX_HTTP_LOC_CONF_OFFSET,
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	630 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	631 NULL },
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	632
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	633 { ngx_string("proxy_temp_file_write_size"),
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	634 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	635 ngx_conf_set_size_slot,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	636 NGX_HTTP_LOC_CONF_OFFSET,
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	637 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	638 NULL },
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	639
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	640 { ngx_string("proxy_next_upstream"),
547 818fbd4750b9 nginx-0.2.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 543 diff changeset	641 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	642 ngx_conf_set_bitmask_slot,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	643 NGX_HTTP_LOC_CONF_OFFSET,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	644 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	645 &ngx_http_proxy_next_upstream_masks },
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	646
5832 d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5738 diff changeset	647 { 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	648 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	649 ngx_conf_set_num_slot,
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5738 diff changeset	650 NGX_HTTP_LOC_CONF_OFFSET,
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5738 diff changeset	651 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	652 NULL },
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5738 diff changeset	653
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5738 diff changeset	654 { 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	655 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	656 ngx_conf_set_msec_slot,
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5738 diff changeset	657 NGX_HTTP_LOC_CONF_OFFSET,
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5738 diff changeset	658 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	659 NULL },
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5738 diff changeset	660
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	661 { ngx_string("proxy_pass_header"),
3729 4b773fc06336 fix directive type Igor Sysoev <igor@sysoev.ru> parents: 3700 diff changeset	662 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	663 ngx_conf_set_str_array_slot,
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	664 NGX_HTTP_LOC_CONF_OFFSET,
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	665 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	666 NULL },
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	667
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	668 { ngx_string("proxy_hide_header"),
3729 4b773fc06336 fix directive type Igor Sysoev <igor@sysoev.ru> parents: 3700 diff changeset	669 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	670 ngx_conf_set_str_array_slot,
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	671 NGX_HTTP_LOC_CONF_OFFSET,
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	672 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	673 NULL },
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	674
2786 4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2784 diff changeset	675 { ngx_string("proxy_ignore_headers"),
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2784 diff changeset	676 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	677 ngx_conf_set_bitmask_slot,
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2784 diff changeset	678 NGX_HTTP_LOC_CONF_OFFSET,
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2784 diff changeset	679 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	680 &ngx_http_upstream_ignore_headers_masks },
2786 4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2784 diff changeset	681
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	682 { ngx_string("proxy_http_version"),
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	683 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	684 ngx_conf_set_enum_slot,
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	685 NGX_HTTP_LOC_CONF_OFFSET,
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	686 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	687 &ngx_http_proxy_http_version },
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	688
2184 274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2135 diff changeset	689 #if (NGX_HTTP_SSL)
274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2135 diff changeset	690
274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2135 diff changeset	691 { ngx_string("proxy_ssl_session_reuse"),
274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2135 diff changeset	692 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	693 ngx_conf_set_flag_slot,
274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2135 diff changeset	694 NGX_HTTP_LOC_CONF_OFFSET,
274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2135 diff changeset	695 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	696 NULL },
274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2135 diff changeset	697
5385 7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	698 { ngx_string("proxy_ssl_protocols"),
7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	699 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	700 ngx_conf_set_bitmask_slot,
7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	701 NGX_HTTP_LOC_CONF_OFFSET,
7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	702 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	703 &ngx_http_proxy_ssl_protocols },
7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	704
5390 919d230ecdbe Proxy: added the "proxy_ssl_ciphers" directive. Piotr Sikora <piotr@cloudflare.com> parents: 5385 diff changeset	705 { ngx_string("proxy_ssl_ciphers"),
919d230ecdbe Proxy: added the "proxy_ssl_ciphers" directive. Piotr Sikora <piotr@cloudflare.com> parents: 5385 diff changeset	706 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	707 ngx_conf_set_str_slot,
919d230ecdbe Proxy: added the "proxy_ssl_ciphers" directive. Piotr Sikora <piotr@cloudflare.com> parents: 5385 diff changeset	708 NGX_HTTP_LOC_CONF_OFFSET,
919d230ecdbe Proxy: added the "proxy_ssl_ciphers" directive. Piotr Sikora <piotr@cloudflare.com> parents: 5385 diff changeset	709 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	710 NULL },
919d230ecdbe Proxy: added the "proxy_ssl_ciphers" directive. Piotr Sikora <piotr@cloudflare.com> parents: 5385 diff changeset	711
5660 7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	712 { 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	713 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	714 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	715 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	716 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	717 NULL },
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	718
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	719 { 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	720 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	721 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	722 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	723 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	724 NULL },
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	725
5661 060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	726 { ngx_string("proxy_ssl_verify"),
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	727 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	728 ngx_conf_set_flag_slot,
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	729 NGX_HTTP_LOC_CONF_OFFSET,
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	730 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	731 NULL },
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	732
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	733 { ngx_string("proxy_ssl_verify_depth"),
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	734 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	735 ngx_conf_set_num_slot,
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	736 NGX_HTTP_LOC_CONF_OFFSET,
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	737 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	738 NULL },
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	739
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	740 { ngx_string("proxy_ssl_trusted_certificate"),
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	741 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	742 ngx_conf_set_str_slot,
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	743 NGX_HTTP_LOC_CONF_OFFSET,
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	744 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	745 NULL },
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	746
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	747 { ngx_string("proxy_ssl_crl"),
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	748 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	749 ngx_conf_set_str_slot,
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	750 NGX_HTTP_LOC_CONF_OFFSET,
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	751 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	752 NULL },
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	753
5900 20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	754 { ngx_string("proxy_ssl_certificate"),
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	755 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	756 ngx_conf_set_str_slot,
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	757 NGX_HTTP_LOC_CONF_OFFSET,
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	758 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	759 NULL },
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	760
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	761 { ngx_string("proxy_ssl_certificate_key"),
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	762 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	763 ngx_conf_set_str_slot,
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	764 NGX_HTTP_LOC_CONF_OFFSET,
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	765 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	766 NULL },
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	767
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	768 { ngx_string("proxy_ssl_password_file"),
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	769 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	770 ngx_http_proxy_ssl_password_file,
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	771 NGX_HTTP_LOC_CONF_OFFSET,
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	772 0,
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	773 NULL },
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	774
7730 1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7728 diff changeset	775 { ngx_string("proxy_ssl_conf_command"),
1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7728 diff changeset	776 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE2,
1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7728 diff changeset	777 ngx_conf_set_keyval_slot,
1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7728 diff changeset	778 NGX_HTTP_LOC_CONF_OFFSET,
1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7728 diff changeset	779 offsetof(ngx_http_proxy_loc_conf_t, ssl_conf_commands),
1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7728 diff changeset	780 &ngx_http_proxy_ssl_conf_command_post },
1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7728 diff changeset	781
2184 274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2135 diff changeset	782 #endif
274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2135 diff changeset	783
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	784 ngx_null_command
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	785 };
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	786
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	787
667 63a820b0bc6c nginx-0.3.55-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 665 diff changeset	788 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	789 ngx_http_proxy_add_variables, /* preconfiguration */
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	790 NULL, /* postconfiguration */
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	791
5951 610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	792 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	793 NULL, /* init main configuration */
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	794
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	795 NULL, /* create server configuration */
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	796 NULL, /* merge server configuration */
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	797
4499 778ef9c3fd2d Fixed spelling in single-line comments. Ruslan Ermilov <ru@nginx.com> parents: 4466 diff changeset	798 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	799 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	800 };
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	801
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	802
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	803 ngx_module_t ngx_http_proxy_module = {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	804 NGX_MODULE_V1,
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	805 &ngx_http_proxy_module_ctx, /* module context */
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	806 ngx_http_proxy_commands, /* module directives */
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	807 NGX_HTTP_MODULE, /* module type */
541 b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 539 diff changeset	808 NULL, /* init master */
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	809 NULL, /* init module */
541 b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 539 diff changeset	810 NULL, /* init process */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 539 diff changeset	811 NULL, /* init thread */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 539 diff changeset	812 NULL, /* exit thread */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 539 diff changeset	813 NULL, /* exit process */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 539 diff changeset	814 NULL, /* exit master */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 539 diff changeset	815 NGX_MODULE_V1_PADDING
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	816 };
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	817
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 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	820 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	821
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	822
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	823 static ngx_keyval_t ngx_http_proxy_headers[] = {
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	824 { ngx_string("Host"), ngx_string("$proxy_host") },
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	825 { 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	826 { 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	827 { 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	828 { ngx_string("TE"), ngx_string("") },
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	829 { ngx_string("Keep-Alive"), ngx_string("") },
2067 5657037448d1 the "Expect" header support Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	830 { ngx_string("Expect"), ngx_string("") },
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	831 { ngx_string("Upgrade"), ngx_string("") },
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	832 { ngx_null_string, ngx_null_string }
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	833 };
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	834
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	835
2706 f905a6ab0ca8 hide cacheable Set-Cookie and P3P response headers Igor Sysoev <igor@sysoev.ru> parents: 2705 diff changeset	836 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	837 ngx_string("Date"),
f905a6ab0ca8 hide cacheable Set-Cookie and P3P response headers Igor Sysoev <igor@sysoev.ru> parents: 2705 diff changeset	838 ngx_string("Server"),
f905a6ab0ca8 hide cacheable Set-Cookie and P3P response headers Igor Sysoev <igor@sysoev.ru> parents: 2705 diff changeset	839 ngx_string("X-Pad"),
f905a6ab0ca8 hide cacheable Set-Cookie and P3P response headers Igor Sysoev <igor@sysoev.ru> parents: 2705 diff changeset	840 ngx_string("X-Accel-Expires"),
f905a6ab0ca8 hide cacheable Set-Cookie and P3P response headers Igor Sysoev <igor@sysoev.ru> parents: 2705 diff changeset	841 ngx_string("X-Accel-Redirect"),
f905a6ab0ca8 hide cacheable Set-Cookie and P3P response headers Igor Sysoev <igor@sysoev.ru> parents: 2705 diff changeset	842 ngx_string("X-Accel-Limit-Rate"),
f905a6ab0ca8 hide cacheable Set-Cookie and P3P response headers Igor Sysoev <igor@sysoev.ru> parents: 2705 diff changeset	843 ngx_string("X-Accel-Buffering"),
f905a6ab0ca8 hide cacheable Set-Cookie and P3P response headers Igor Sysoev <igor@sysoev.ru> parents: 2705 diff changeset	844 ngx_string("X-Accel-Charset"),
f905a6ab0ca8 hide cacheable Set-Cookie and P3P response headers Igor Sysoev <igor@sysoev.ru> parents: 2705 diff changeset	845 ngx_null_string
f905a6ab0ca8 hide cacheable Set-Cookie and P3P response headers Igor Sysoev <igor@sysoev.ru> parents: 2705 diff changeset	846 };
f905a6ab0ca8 hide cacheable Set-Cookie and P3P response headers Igor Sysoev <igor@sysoev.ru> parents: 2705 diff changeset	847
f905a6ab0ca8 hide cacheable Set-Cookie and P3P response headers Igor Sysoev <igor@sysoev.ru> parents: 2705 diff changeset	848
2705 d040c3786239 do not pass if-... headers for cacheable responses Igor Sysoev <igor@sysoev.ru> parents: 2672 diff changeset	849 #if (NGX_HTTP_CACHE)
d040c3786239 do not pass if-... headers for cacheable responses Igor Sysoev <igor@sysoev.ru> parents: 2672 diff changeset	850
d040c3786239 do not pass if-... headers for cacheable responses Igor Sysoev <igor@sysoev.ru> parents: 2672 diff changeset	851 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	852 { 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	853 { 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	854 { 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	855 { 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	856 { ngx_string("TE"), ngx_string("") },
2705 d040c3786239 do not pass if-... headers for cacheable responses Igor Sysoev <igor@sysoev.ru> parents: 2672 diff changeset	857 { ngx_string("Keep-Alive"), ngx_string("") },
d040c3786239 do not pass if-... headers for cacheable responses Igor Sysoev <igor@sysoev.ru> parents: 2672 diff changeset	858 { ngx_string("Expect"), ngx_string("") },
4276 a0f18c78db3b Fixed Upgrade header clearing with proxy_cache. Maxim Dounin <mdounin@mdounin.ru> parents: 4275 diff changeset	859 { ngx_string("Upgrade"), ngx_string("") },
5441 43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5391 diff changeset	860 { ngx_string("If-Modified-Since"),
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5391 diff changeset	861 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	862 { 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	863 { 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	864 { ngx_string("If-Match"), ngx_string("") },
d040c3786239 do not pass if-... headers for cacheable responses Igor Sysoev <igor@sysoev.ru> parents: 2672 diff changeset	865 { ngx_string("Range"), ngx_string("") },
d040c3786239 do not pass if-... headers for cacheable responses Igor Sysoev <igor@sysoev.ru> parents: 2672 diff changeset	866 { ngx_string("If-Range"), ngx_string("") },
d040c3786239 do not pass if-... headers for cacheable responses Igor Sysoev <igor@sysoev.ru> parents: 2672 diff changeset	867 { ngx_null_string, ngx_null_string }
d040c3786239 do not pass if-... headers for cacheable responses Igor Sysoev <igor@sysoev.ru> parents: 2672 diff changeset	868 };
d040c3786239 do not pass if-... headers for cacheable responses Igor Sysoev <igor@sysoev.ru> parents: 2672 diff changeset	869
2706 f905a6ab0ca8 hide cacheable Set-Cookie and P3P response headers Igor Sysoev <igor@sysoev.ru> parents: 2705 diff changeset	870 #endif
f905a6ab0ca8 hide cacheable Set-Cookie and P3P response headers Igor Sysoev <igor@sysoev.ru> parents: 2705 diff changeset	871
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	872
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	873 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	874
637 e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 629 diff changeset	875 { 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	876 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	877
637 e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 629 diff changeset	878 { 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	879 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	880
637 e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 629 diff changeset	881 { 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	882 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	883
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	884 #if 0
637 e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 629 diff changeset	885 { 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	886 #endif
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	887
637 e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 629 diff changeset	888 { ngx_string("proxy_internal_body_length"), NULL,
5203 bfb99b75833b Proxy: $proxy_internal_body_length fixed. Maxim Dounin <mdounin@mdounin.ru> parents: 5188 diff changeset	889 ngx_http_proxy_internal_body_length_variable, 0,
bfb99b75833b Proxy: $proxy_internal_body_length fixed. Maxim Dounin <mdounin@mdounin.ru> parents: 5188 diff changeset	890 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	891
6051 d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	892 { ngx_string("proxy_internal_chunked"), NULL,
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	893 ngx_http_proxy_internal_chunked_variable, 0,
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	894 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	895
7077 2a288909abc6 Variables: macros for null variables. Ruslan Ermilov <ru@nginx.com> parents: 7047 diff changeset	896 ngx_http_null_variable
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	897 };
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	898
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	899
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	900 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	901 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	902 };
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	903
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	904
7716 d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	905 static ngx_conf_bitmask_t ngx_http_proxy_cookie_flags_masks[] = {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	906
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	907 { ngx_string("secure"),
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	908 NGX_HTTP_PROXY_COOKIE_SECURE\|NGX_HTTP_PROXY_COOKIE_SECURE_ON },
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	909
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	910 { ngx_string("nosecure"),
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	911 NGX_HTTP_PROXY_COOKIE_SECURE\|NGX_HTTP_PROXY_COOKIE_SECURE_OFF },
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	912
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	913 { ngx_string("httponly"),
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	914 NGX_HTTP_PROXY_COOKIE_HTTPONLY\|NGX_HTTP_PROXY_COOKIE_HTTPONLY_ON },
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	915
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	916 { ngx_string("nohttponly"),
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	917 NGX_HTTP_PROXY_COOKIE_HTTPONLY\|NGX_HTTP_PROXY_COOKIE_HTTPONLY_OFF },
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	918
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	919 { ngx_string("samesite=strict"),
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	920 NGX_HTTP_PROXY_COOKIE_SAMESITE\|NGX_HTTP_PROXY_COOKIE_SAMESITE_STRICT },
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	921
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	922 { ngx_string("samesite=lax"),
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	923 NGX_HTTP_PROXY_COOKIE_SAMESITE\|NGX_HTTP_PROXY_COOKIE_SAMESITE_LAX },
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	924
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	925 { ngx_string("samesite=none"),
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	926 NGX_HTTP_PROXY_COOKIE_SAMESITE\|NGX_HTTP_PROXY_COOKIE_SAMESITE_NONE },
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	927
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	928 { ngx_string("nosamesite"),
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	929 NGX_HTTP_PROXY_COOKIE_SAMESITE\|NGX_HTTP_PROXY_COOKIE_SAMESITE_OFF },
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	930
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	931 { ngx_null_string, 0 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	932 };
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	933
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	934
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	935 static ngx_int_t
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	936 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	937 {
5951 610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	938 ngx_int_t rc;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	939 ngx_http_upstream_t *u;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	940 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	941 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	942 #if (NGX_HTTP_CACHE)
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	943 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	944 #endif
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	945
3006 95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 2989 diff changeset	946 if (ngx_http_upstream_create(r) != NGX_OK) {
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	947 return NGX_HTTP_INTERNAL_SERVER_ERROR;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	948 }
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	949
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	950 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	951 if (ctx == NULL) {
6003 cf2f8d91cf09 Proxy: use an appropriate error on memory allocation failure. Ruslan Ermilov <ru@nginx.com> parents: 5951 diff changeset	952 return NGX_HTTP_INTERNAL_SERVER_ERROR;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	953 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	954
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	955 ngx_http_set_ctx(r, ctx, ngx_http_proxy_module);
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 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	958
3006 95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 2989 diff changeset	959 u = r->upstream;
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 2989 diff changeset	960
3733 527a0f8cae2a use NULL instead of 0 Igor Sysoev <igor@sysoev.ru> parents: 3731 diff changeset	961 if (plcf->proxy_lengths == NULL) {
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	962 ctx->vars = plcf->vars;
2391 d88e757cc7d8 delete surplus upstream.schema field Igor Sysoev <igor@sysoev.ru> parents: 2285 diff changeset	963 u->schema = plcf->vars.schema;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	964 #if (NGX_HTTP_SSL)
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	965 u->ssl = (plcf->upstream.ssl != NULL);
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	966 #endif
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	967
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	968 } else {
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	969 if (ngx_http_proxy_eval(r, ctx, plcf) != NGX_OK) {
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	970 return NGX_HTTP_INTERNAL_SERVER_ERROR;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	971 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	972 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	973
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	974 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	975
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	976 u->conf = &plcf->upstream;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	977
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	978 #if (NGX_HTTP_CACHE)
5951 610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	979 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	980
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	981 u->caches = &pmcf->caches;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	982 u->create_key = ngx_http_proxy_create_key;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	983 #endif
5951 610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	984
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	985 u->create_request = ngx_http_proxy_create_request;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	986 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	987 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	988 u->abort_request = ngx_http_proxy_abort_request;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	989 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	990 r->state = 0;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	991
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	992 if (plcf->redirects) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	993 u->rewrite_redirect = ngx_http_proxy_rewrite_redirect;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	994 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	995
7716 d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	996 if (plcf->cookie_domains \|\| plcf->cookie_paths \|\| plcf->cookie_flags) {
4465 8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	997 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	998 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	999
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1000 u->buffering = plcf->upstream.buffering;
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1001
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1002 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	1003 if (u->pipe == NULL) {
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1004 return NGX_HTTP_INTERNAL_SERVER_ERROR;
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 579 diff changeset	1005 }
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1006
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1007 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	1008 u->pipe->input_ctx = r;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1009
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1010 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	1011 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	1012 u->input_filter_ctx = r;
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1013
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1014 u->accel = 1;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1015
6050 a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	1016 if (!plcf->upstream.request_buffering
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	1017 && 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	1018 && (!r->headers_in.chunked
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1019 \|\| plcf->http_version == NGX_HTTP_VERSION_11))
6050 a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	1020 {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	1021 r->request_body_no_buffering = 1;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	1022 }
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	1023
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1024 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	1025
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1026 if (rc >= NGX_HTTP_SPECIAL_RESPONSE) {
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1027 return rc;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1028 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1029
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1030 return NGX_DONE;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1031 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1032
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1033
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1034 static ngx_int_t
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1035 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	1036 ngx_http_proxy_loc_conf_t *plcf)
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1037 {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1038 u_char *p;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1039 size_t add;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1040 u_short port;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1041 ngx_str_t proxy;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1042 ngx_url_t url;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1043 ngx_http_upstream_t *u;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1044
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1045 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	1046 plcf->proxy_values->elts)
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1047 == NULL)
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1048 {
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1049 return NGX_ERROR;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1050 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1051
3977 2527cdb8d31f test length of proxy_pass with variables Igor Sysoev <igor@sysoev.ru> parents: 3976 diff changeset	1052 if (proxy.len > 7
2527cdb8d31f test length of proxy_pass with variables Igor Sysoev <igor@sysoev.ru> parents: 3976 diff changeset	1053 && 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	1054 {
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1055 add = 7;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1056 port = 80;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1057
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1058 #if (NGX_HTTP_SSL)
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1059
3977 2527cdb8d31f test length of proxy_pass with variables Igor Sysoev <igor@sysoev.ru> parents: 3976 diff changeset	1060 } else if (proxy.len > 8
2527cdb8d31f test length of proxy_pass with variables Igor Sysoev <igor@sysoev.ru> parents: 3976 diff changeset	1061 && 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	1062 {
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1063 add = 8;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1064 port = 443;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1065 r->upstream->ssl = 1;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1066
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1067 #endif
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1068
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1069 } else {
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1070 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1071 "invalid URL prefix in \"%V\"", &proxy);
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1072 return NGX_ERROR;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1073 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1074
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1075 u = r->upstream;
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 u->schema.len = add;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1078 u->schema.data = proxy.data;
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 ngx_memzero(&url, sizeof(ngx_url_t));
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 url.url.len = proxy.len - add;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1083 url.url.data = proxy.data + add;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1084 url.default_port = port;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1085 url.uri_part = 1;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1086 url.no_resolve = 1;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1087
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1088 if (ngx_parse_url(r->pool, &url) != NGX_OK) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1089 if (url.err) {
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1090 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	1091 "%s in upstream \"%V\"", url.err, &url.url);
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1092 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1093
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1094 return NGX_ERROR;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1095 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1096
3323 9421e997c2c4 allow "proxy_pass http://$backend" without URI part Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	1097 if (url.uri.len) {
9421e997c2c4 allow "proxy_pass http://$backend" without URI part Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	1098 if (url.uri.data[0] == '?') {
9421e997c2c4 allow "proxy_pass http://$backend" without URI part Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	1099 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	1100 if (p == NULL) {
9421e997c2c4 allow "proxy_pass http://$backend" without URI part Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	1101 return NGX_ERROR;
9421e997c2c4 allow "proxy_pass http://$backend" without URI part Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	1102 }
9421e997c2c4 allow "proxy_pass http://$backend" without URI part Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	1103
9421e997c2c4 allow "proxy_pass http://$backend" without URI part Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	1104 *p++ = '/';
9421e997c2c4 allow "proxy_pass http://$backend" without URI part Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	1105 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	1106
9421e997c2c4 allow "proxy_pass http://$backend" without URI part Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	1107 url.uri.len++;
9421e997c2c4 allow "proxy_pass http://$backend" without URI part Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	1108 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	1109 }
c3035feb6638 fix case proxy_pass URL is evaluted to http://host?args Igor Sysoev <igor@sysoev.ru> parents: 2268 diff changeset	1110 }
c3035feb6638 fix case proxy_pass URL is evaluted to http://host?args Igor Sysoev <igor@sysoev.ru> parents: 2268 diff changeset	1111
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1112 ctx->vars.key_start = u->schema;
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 ngx_http_proxy_set_vars(&url, &ctx->vars);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1115
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1116 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	1117 if (u->resolved == NULL) {
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1118 return NGX_ERROR;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1119 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1120
6784 1af120241cde Upstream: removed unnecessary condition in proxy_eval() and friends. Ruslan Ermilov <ru@nginx.com> parents: 6781 diff changeset	1121 if (url.addrs) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1122 u->resolved->sockaddr = url.addrs[0].sockaddr;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1123 u->resolved->socklen = url.addrs[0].socklen;
6785 d1d0dd69a419 Upstream: added the ngx_http_upstream_resolved_t.name field. Ruslan Ermilov <ru@nginx.com> parents: 6784 diff changeset	1124 u->resolved->name = url.addrs[0].name;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1125 u->resolved->naddrs = 1;
2422 7af1e5fe102c variable support for unix sockets in fastcgi_pass and proxy_pass Igor Sysoev <igor@sysoev.ru> parents: 2391 diff changeset	1126 }
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1127
6785 d1d0dd69a419 Upstream: added the ngx_http_upstream_resolved_t.name field. Ruslan Ermilov <ru@nginx.com> parents: 6784 diff changeset	1128 u->resolved->host = url.host;
6303 a93345ee8f52 Upstream: fixed "no port" detection in evaluated upstreams. Ruslan Ermilov <ru@nginx.com> parents: 6290 diff changeset	1129 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	1130 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	1131
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1132 return NGX_OK;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1133 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1134
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1135
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1136 #if (NGX_HTTP_CACHE)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1137
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1138 static ngx_int_t
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1139 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	1140 {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1141 size_t len, loc_len;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1142 u_char *p;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1143 uintptr_t escape;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1144 ngx_str_t *key;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1145 ngx_http_upstream_t *u;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1146 ngx_http_proxy_ctx_t *ctx;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1147 ngx_http_proxy_loc_conf_t *plcf;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1148
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1149 u = r->upstream;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1150
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1151 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	1152
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1153 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	1154
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1155 key = ngx_array_push(&r->cache->keys);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1156 if (key == NULL) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1157 return NGX_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1158 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1159
4947 4251e72b8bb4 Allow the complex value to be defined as an empty string. Ruslan Ermilov <ru@nginx.com> parents: 4927 diff changeset	1160 if (plcf->cache_key.value.data) {
2672 b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	1161
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	1162 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	1163 return NGX_ERROR;
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	1164 }
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	1165
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	1166 return NGX_OK;
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	1167 }
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	1168
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1169 *key = ctx->vars.key_start;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1170
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1171 key = ngx_array_push(&r->cache->keys);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1172 if (key == NULL) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1173 return NGX_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1174 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1175
4377 726a1ca9b52b Proxy: made proxy_pass with variables more consistent. Maxim Dounin <mdounin@mdounin.ru> parents: 4336 diff changeset	1176 if (plcf->proxy_lengths && ctx->vars.uri.len) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1177
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1178 *key = ctx->vars.uri;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1179 u->uri = ctx->vars.uri;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1180
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1181 return NGX_OK;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1182
7167 8530aea9aa50 Proxy: simplified conditions of using unparsed uri. Roman Arutyunyan <arut@nginx.com> parents: 7077 diff changeset	1183 } else if (ctx->vars.uri.len == 0 && r->valid_unparsed_uri) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1184 *key = r->unparsed_uri;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1185 u->uri = r->unparsed_uri;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1186
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1187 return NGX_OK;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1188 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1189
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1190 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	1191
7169 e8e19f5e0b8b Proxy: escape explicit space in URI in default cache key. Roman Arutyunyan <arut@nginx.com> parents: 7167 diff changeset	1192 if (r->quoted_uri \|\| r->space_in_uri \|\| r->internal) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1193 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	1194 r->uri.len - loc_len, NGX_ESCAPE_URI);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1195 } else {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1196 escape = 0;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1197 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1198
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1199 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	1200 + sizeof("?") - 1 + r->args.len;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1201
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1202 p = ngx_pnalloc(r->pool, len);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1203 if (p == NULL) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1204 return NGX_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1205 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1206
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1207 key->data = p;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1208
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1209 if (r->valid_location) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1210 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	1211 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1212
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1213 if (escape) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1214 ngx_escape_uri(p, r->uri.data + loc_len,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1215 r->uri.len - loc_len, NGX_ESCAPE_URI);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1216 p += r->uri.len - loc_len + escape;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1217
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1218 } else {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1219 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	1220 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1221
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1222 if (r->args.len > 0) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1223 *p++ = '?';
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1224 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	1225 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1226
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1227 key->len = p - key->data;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1228 u->uri = *key;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1229
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1230 return NGX_OK;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1231 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1232
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1233 #endif
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1234
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1235
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1236 static ngx_int_t
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1237 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	1238 {
7047 3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1239 size_t len, uri_len, loc_len, body_len,
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1240 key_len, val_len;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1241 uintptr_t escape;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1242 ngx_buf_t *b;
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1243 ngx_str_t method;
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1244 ngx_uint_t i, unparsed_uri;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1245 ngx_chain_t cl, body;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1246 ngx_list_part_t *part;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1247 ngx_table_elt_t *header;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1248 ngx_http_upstream_t *u;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1249 ngx_http_proxy_ctx_t *ctx;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1250 ngx_http_script_code_pt code;
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	1251 ngx_http_proxy_headers_t *headers;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1252 ngx_http_script_engine_t e, le;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1253 ngx_http_proxy_loc_conf_t *plcf;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1254 ngx_http_script_len_code_pt lcode;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1255
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1256 u = r->upstream;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1257
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1258 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	1259
5909 8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	1260 #if (NGX_HTTP_CACHE)
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	1261 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	1262 #else
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	1263 headers = &plcf->headers;
5909 8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	1264 #endif
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	1265
561 e48ebafc6939 nginx-0.3.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 555 diff changeset	1266 if (u->method.len) {
e48ebafc6939 nginx-0.3.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 555 diff changeset	1267 /* HEAD was changed to GET to cache response */
e48ebafc6939 nginx-0.3.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 555 diff changeset	1268 method = u->method;
e48ebafc6939 nginx-0.3.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 555 diff changeset	1269
6781 ca27074f8f0f Proxy: support variables for proxy_method directive. Dmitry Lazurkin <dilaz03@gmail.com> parents: 6747 diff changeset	1270 } else if (plcf->method) {
ca27074f8f0f Proxy: support variables for proxy_method directive. Dmitry Lazurkin <dilaz03@gmail.com> parents: 6747 diff changeset	1271 if (ngx_http_complex_value(r, plcf->method, &method) != NGX_OK) {
ca27074f8f0f Proxy: support variables for proxy_method directive. Dmitry Lazurkin <dilaz03@gmail.com> parents: 6747 diff changeset	1272 return NGX_ERROR;
ca27074f8f0f Proxy: support variables for proxy_method directive. Dmitry Lazurkin <dilaz03@gmail.com> parents: 6747 diff changeset	1273 }
561 e48ebafc6939 nginx-0.3.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 555 diff changeset	1274
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1275 } else {
561 e48ebafc6939 nginx-0.3.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 555 diff changeset	1276 method = r->method_name;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1277 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1278
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1279 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	1280
6311 44122bddd9a1 Proxy: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 6303 diff changeset	1281 if (method.len == 4
44122bddd9a1 Proxy: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 6303 diff changeset	1282 && 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	1283 {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1284 ctx->head = 1;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1285 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1286
6311 44122bddd9a1 Proxy: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 6303 diff changeset	1287 len = method.len + 1 + sizeof(ngx_http_proxy_version) - 1
44122bddd9a1 Proxy: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 6303 diff changeset	1288 + sizeof(CRLF) - 1;
1667 e9bd042134cb fix segfault Igor Sysoev <igor@sysoev.ru> parents: 1658 diff changeset	1289
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1290 escape = 0;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1291 loc_len = 0;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1292 unparsed_uri = 0;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1293
4377 726a1ca9b52b Proxy: made proxy_pass with variables more consistent. Maxim Dounin <mdounin@mdounin.ru> parents: 4336 diff changeset	1294 if (plcf->proxy_lengths && ctx->vars.uri.len) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1295 uri_len = ctx->vars.uri.len;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1296
7167 8530aea9aa50 Proxy: simplified conditions of using unparsed uri. Roman Arutyunyan <arut@nginx.com> parents: 7077 diff changeset	1297 } else if (ctx->vars.uri.len == 0 && r->valid_unparsed_uri) {
609 608cf78b24ef nginx-0.3.26-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 605 diff changeset	1298 unparsed_uri = 1;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1299 uri_len = r->unparsed_uri.len;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1300
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1301 } else {
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1302 loc_len = (r->valid_location && ctx->vars.uri.len) ?
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1303 plcf->location.len : 0;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1304
3615 31e9677b15a1 allow spaces in URI Igor Sysoev <igor@sysoev.ru> parents: 3606 diff changeset	1305 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	1306 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	1307 r->uri.len - loc_len, NGX_ESCAPE_URI);
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1308 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1309
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1310 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	1311 + sizeof("?") - 1 + r->args.len;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1312 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1313
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1314 if (uri_len == 0) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1315 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	1316 "zero length URI to proxy");
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1317 return NGX_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1318 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1319
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1320 len += uri_len;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1321
5211 ecd762770729 Proxy: clear script engine used to calculate lengths. Maxim Dounin <mdounin@mdounin.ru> parents: 5203 diff changeset	1322 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	1323
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	1324 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	1325 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	1326
5910 29fa5023bd6f Proxy: renamed and rearranged fields in proxy configuration. Roman Arutyunyan <arut@nginx.com> parents: 5909 diff changeset	1327 if (plcf->body_lengths) {
29fa5023bd6f Proxy: renamed and rearranged fields in proxy configuration. Roman Arutyunyan <arut@nginx.com> parents: 5909 diff changeset	1328 le.ip = plcf->body_lengths->elts;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1329 le.request = r;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1330 le.flushed = 1;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1331 body_len = 0;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1332
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1333 while ((uintptr_t ) le.ip) {
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1334 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	1335 body_len += lcode(&le);
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1336 }
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1337
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1338 ctx->internal_body_length = body_len;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1339 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	1340
6051 d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1341 } 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	1342 ctx->internal_body_length = -1;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1343 ctx->internal_chunked = 1;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1344
4927 93294110728f Request body: always use calculated size of a request body in proxy. Maxim Dounin <mdounin@mdounin.ru> parents: 4925 diff changeset	1345 } else {
93294110728f Request body: always use calculated size of a request body in proxy. Maxim Dounin <mdounin@mdounin.ru> parents: 4925 diff changeset	1346 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	1347 }
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1348
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	1349 le.ip = headers->lengths->elts;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1350 le.request = r;
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	1351 le.flushed = 1;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1352
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1353 while ((uintptr_t ) le.ip) {
7047 3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1354
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1355 lcode = (ngx_http_script_len_code_pt ) le.ip;
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1356 key_len = lcode(&le);
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1357
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1358 for (val_len = 0; (uintptr_t ) le.ip; val_len += lcode(&le)) {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1359 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	1360 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1361 le.ip += sizeof(uintptr_t);
7047 3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1362
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1363 if (val_len == 0) {
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1364 continue;
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1365 }
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1366
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1367 len += key_len + sizeof(": ") - 1 + val_len + sizeof(CRLF) - 1;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1368 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1369
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1370
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1371 if (plcf->upstream.pass_request_headers) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1372 part = &r->headers_in.headers.part;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1373 header = part->elts;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1374
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1375 for (i = 0; /* void */; i++) {
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1376
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1377 if (i >= part->nelts) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1378 if (part->next == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1379 break;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1380 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1381
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1382 part = part->next;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1383 header = part->elts;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1384 i = 0;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1385 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1386
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	1387 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	1388 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	1389 {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1390 continue;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1391 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1392
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1393 len += header[i].key.len + sizeof(": ") - 1
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1394 + header[i].value.len + sizeof(CRLF) - 1;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1395 }
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1396 }
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1397
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1398
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1399 b = ngx_create_temp_buf(r->pool, len);
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1400 if (b == NULL) {
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1401 return NGX_ERROR;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1402 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1403
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1404 cl = ngx_alloc_chain_link(r->pool);
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1405 if (cl == NULL) {
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1406 return NGX_ERROR;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1407 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1408
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1409 cl->buf = b;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1410
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1411
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1412 /* the request line */
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1413
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	1414 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	1415 *b->last++ = ' ';
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1416
555 7bd37aef1e7e nginx-0.2.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 551 diff changeset	1417 u->uri.data = b->last;
7bd37aef1e7e nginx-0.2.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 551 diff changeset	1418
4377 726a1ca9b52b Proxy: made proxy_pass with variables more consistent. Maxim Dounin <mdounin@mdounin.ru> parents: 4336 diff changeset	1419 if (plcf->proxy_lengths && ctx->vars.uri.len) {
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1420 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	1421
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1422 } else if (unparsed_uri) {
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	1423 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	1424
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1425 } else {
555 7bd37aef1e7e nginx-0.2.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 551 diff changeset	1426 if (r->valid_location) {
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1427 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	1428 }
551 483cca230603 nginx-0.2.4-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 547 diff changeset	1429
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1430 if (escape) {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1431 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	1432 r->uri.len - loc_len, NGX_ESCAPE_URI);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1433 b->last += r->uri.len - loc_len + escape;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1434
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1435 } else {
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	1436 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	1437 r->uri.len - loc_len);
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1438 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1439
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1440 if (r->args.len > 0) {
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1441 *b->last++ = '?';
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	1442 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	1443 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1444 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1445
555 7bd37aef1e7e nginx-0.2.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 551 diff changeset	1446 u->uri.len = b->last - u->uri.data;
7bd37aef1e7e nginx-0.2.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 551 diff changeset	1447
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1448 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	1449 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	1450 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	1451
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1452 } else {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1453 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	1454 sizeof(ngx_http_proxy_version) - 1);
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1455 }
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1456
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1457 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	1458
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	1459 e.ip = headers->values->elts;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1460 e.pos = b->last;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1461 e.request = r;
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	1462 e.flushed = 1;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1463
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	1464 le.ip = headers->lengths->elts;
509 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 while ((uintptr_t ) le.ip) {
7047 3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1467
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1468 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	1469 (void) lcode(&le);
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1470
7047 3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1471 for (val_len = 0; (uintptr_t ) le.ip; val_len += lcode(&le)) {
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1472 lcode = (ngx_http_script_len_code_pt ) le.ip;
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1473 }
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1474 le.ip += sizeof(uintptr_t);
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1475
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1476 if (val_len == 0) {
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1477 e.skip = 1;
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1478
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1479 while ((uintptr_t ) e.ip) {
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1480 code = (ngx_http_script_code_pt ) e.ip;
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1481 code((ngx_http_script_engine_t *) &e);
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1482 }
7047 3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1483 e.ip += sizeof(uintptr_t);
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1484
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1485 e.skip = 0;
7047 3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1486
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1487 continue;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1488 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1489
7047 3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1490 code = (ngx_http_script_code_pt ) e.ip;
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1491 code((ngx_http_script_engine_t *) &e);
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1492
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1493 e.pos++ = ':'; e.pos++ = ' ';
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1494
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1495 while ((uintptr_t ) e.ip) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1496 code = (ngx_http_script_code_pt ) e.ip;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1497 code((ngx_http_script_engine_t *) &e);
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1498 }
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1499 e.ip += sizeof(uintptr_t);
7047 3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1500
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	1501 e.pos++ = CR; e.pos++ = LF;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1502 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1503
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1504 b->last = e.pos;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1505
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1506
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1507 if (plcf->upstream.pass_request_headers) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1508 part = &r->headers_in.headers.part;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1509 header = part->elts;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1510
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1511 for (i = 0; /* void */; i++) {
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1512
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1513 if (i >= part->nelts) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1514 if (part->next == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1515 break;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1516 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1517
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1518 part = part->next;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1519 header = part->elts;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1520 i = 0;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1521 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1522
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	1523 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	1524 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	1525 {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1526 continue;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1527 }
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1528
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	1529 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	1530
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1531 b->last++ = ':'; b->last++ = ' ';
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1532
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	1533 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	1534 header[i].value.len);
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1535
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1536 b->last++ = CR; b->last++ = LF;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1537
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1538 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	1539 "http proxy header: \"%V: %V\"",
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1540 &header[i].key, &header[i].value);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1541 }
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1542 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1543
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1544
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1545 /* add "\r\n" at the header end */
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1546 b->last++ = CR; b->last++ = LF;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1547
5910 29fa5023bd6f Proxy: renamed and rearranged fields in proxy configuration. Roman Arutyunyan <arut@nginx.com> parents: 5909 diff changeset	1548 if (plcf->body_values) {
29fa5023bd6f Proxy: renamed and rearranged fields in proxy configuration. Roman Arutyunyan <arut@nginx.com> parents: 5909 diff changeset	1549 e.ip = plcf->body_values->elts;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1550 e.pos = b->last;
6043 613b14b305c7 Proxy: fixed proxy_set_body with proxy_cache. Maxim Dounin <mdounin@mdounin.ru> parents: 6003 diff changeset	1551 e.skip = 0;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1552
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1553 while ((uintptr_t ) e.ip) {
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1554 code = (ngx_http_script_code_pt ) e.ip;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1555 code((ngx_http_script_engine_t *) &e);
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1556 }
579 4c5c2c55975c nginx-0.3.11-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	1557
4c5c2c55975c nginx-0.3.11-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	1558 b->last = e.pos;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1559 }
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1560
1774 68d21fd1dc64 use %s format Igor Sysoev <igor@sysoev.ru>* parents: 1701 diff changeset	1561 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	1562 "http proxy header:%N\"%*s\"",
1774 68d21fd1dc64 use %s format Igor Sysoev <igor@sysoev.ru>* parents: 1701 diff changeset	1563 (size_t) (b->last - b->pos), b->pos);
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1564
6050 a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	1565 if (r->request_body_no_buffering) {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	1566
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	1567 u->request_bufs = cl;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	1568
6051 d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1569 if (ctx->internal_chunked) {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1570 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	1571 u->output.filter_ctx = r;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1572 }
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1573
6050 a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	1574 } 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	1575
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1576 body = u->request_bufs;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1577 u->request_bufs = cl;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1578
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1579 while (body) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1580 b = ngx_alloc_buf(r->pool);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1581 if (b == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1582 return NGX_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1583 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1584
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1585 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	1586
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1587 cl->next = ngx_alloc_chain_link(r->pool);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1588 if (cl->next == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1589 return NGX_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1590 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1591
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1592 cl = cl->next;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1593 cl->buf = b;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1594
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1595 body = body->next;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1596 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1597
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1598 } else {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1599 u->request_bufs = cl;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1600 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1601
4009 3183165283cc Fixing proxy_set_body and proxy_pass_request_body with SSL. Maxim Dounin <mdounin@mdounin.ru> parents: 3977 diff changeset	1602 b->flush = 1;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1603 cl->next = NULL;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1604
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1605 return NGX_OK;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1606 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1607
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1608
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1609 static ngx_int_t
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1610 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	1611 {
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1612 ngx_http_proxy_ctx_t *ctx;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1613
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1614 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	1615
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1616 if (ctx == NULL) {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1617 return NGX_OK;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1618 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1619
3627 9061fdb2ed8c use ngx_http_parse_status_line() Igor Sysoev <igor@sysoev.ru> parents: 3615 diff changeset	1620 ctx->status.code = 0;
9061fdb2ed8c use ngx_http_parse_status_line() Igor Sysoev <igor@sysoev.ru> parents: 3615 diff changeset	1621 ctx->status.count = 0;
9061fdb2ed8c use ngx_http_parse_status_line() Igor Sysoev <igor@sysoev.ru> parents: 3615 diff changeset	1622 ctx->status.start = NULL;
9061fdb2ed8c use ngx_http_parse_status_line() Igor Sysoev <igor@sysoev.ru> parents: 3615 diff changeset	1623 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	1624 ctx->chunked.state = 0;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1625
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1626 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	1627 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	1628 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	1629 r->state = 0;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1630
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1631 return NGX_OK;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1632 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1633
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1634
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1635 static ngx_int_t
6051 d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1636 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	1637 {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1638 ngx_http_request_t *r = data;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1639
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1640 off_t size;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1641 u_char *chunk;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1642 ngx_int_t rc;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1643 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	1644 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	1645 ngx_http_proxy_ctx_t *ctx;
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 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	1648 "proxy output filter");
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 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	1651
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1652 if (in == NULL) {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1653 out = in;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1654 goto out;
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
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1657 out = NULL;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1658 ll = &out;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1659
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1660 if (!ctx->header_sent) {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1661 /* first buffer contains headers, pass it unmodified */
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1662
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1663 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	1664 "proxy output header");
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 ctx->header_sent = 1;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1667
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1668 tl = ngx_alloc_chain_link(r->pool);
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1669 if (tl == NULL) {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1670 return NGX_ERROR;
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 tl->buf = in->buf;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1674 *ll = tl;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1675 ll = &tl->next;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1676
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1677 in = in->next;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1678
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1679 if (in == NULL) {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1680 tl->next = NULL;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1681 goto out;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1682 }
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1683 }
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1684
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1685 size = 0;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1686 cl = in;
6056 24ccec3c4a87 Proxy: fixed proxy_request_buffering and chunked with preread body. Maxim Dounin <mdounin@mdounin.ru> parents: 6051 diff changeset	1687 fl = ll;
6051 d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1688
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1689 for ( ;; ) {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1690 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
6480 f01ab2dbcfdc Fixed logging. Sergey Kandaurov <pluknet@nginx.com> parents: 6467 diff changeset	1691 "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	1692
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1693 size += ngx_buf_size(cl->buf);
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1694
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1695 if (cl->buf->flush
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1696 \|\| cl->buf->sync
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1697 \|\| ngx_buf_in_memory(cl->buf)
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1698 \|\| cl->buf->in_file)
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1699 {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1700 tl = ngx_alloc_chain_link(r->pool);
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1701 if (tl == NULL) {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1702 return NGX_ERROR;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1703 }
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1704
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1705 tl->buf = cl->buf;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1706 *ll = tl;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1707 ll = &tl->next;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1708 }
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1709
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1710 if (cl->next == NULL) {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1711 break;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1712 }
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1713
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1714 cl = cl->next;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1715 }
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1716
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1717 if (size) {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1718 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	1719 if (tl == NULL) {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1720 return NGX_ERROR;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1721 }
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1722
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1723 b = tl->buf;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1724 chunk = b->start;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1725
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1726 if (chunk == NULL) {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1727 /* the "0000000000000000" is 64-bit hexadecimal string */
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1728
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1729 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	1730 if (chunk == NULL) {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1731 return NGX_ERROR;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1732 }
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1733
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1734 b->start = chunk;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1735 b->end = chunk + sizeof("0000000000000000" CRLF) - 1;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1736 }
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1737
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1738 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	1739 b->memory = 0;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1740 b->temporary = 1;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1741 b->pos = chunk;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1742 b->last = ngx_sprintf(chunk, "%xO" CRLF, size);
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1743
6056 24ccec3c4a87 Proxy: fixed proxy_request_buffering and chunked with preread body. Maxim Dounin <mdounin@mdounin.ru> parents: 6051 diff changeset	1744 tl->next = *fl;
24ccec3c4a87 Proxy: fixed proxy_request_buffering and chunked with preread body. Maxim Dounin <mdounin@mdounin.ru> parents: 6051 diff changeset	1745 *fl = tl;
6051 d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1746 }
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1747
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1748 if (cl->buf->last_buf) {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1749 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	1750 if (tl == NULL) {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1751 return NGX_ERROR;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1752 }
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1753
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1754 b = tl->buf;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1755
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1756 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	1757 b->temporary = 0;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1758 b->memory = 1;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1759 b->last_buf = 1;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1760 b->pos = (u_char *) CRLF "0" CRLF CRLF;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1761 b->last = b->pos + 7;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1762
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1763 cl->buf->last_buf = 0;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1764
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1765 *ll = tl;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1766
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1767 if (size == 0) {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1768 b->pos += 2;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1769 }
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1770
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1771 } else if (size > 0) {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1772 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	1773 if (tl == NULL) {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1774 return NGX_ERROR;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1775 }
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1776
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1777 b = tl->buf;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1778
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1779 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	1780 b->temporary = 0;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1781 b->memory = 1;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1782 b->pos = (u_char *) CRLF;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1783 b->last = b->pos + 2;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1784
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1785 *ll = tl;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1786
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1787 } else {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1788 *ll = NULL;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1789 }
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1790
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1791 out:
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1792
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1793 rc = ngx_chain_writer(&r->upstream->writer, out);
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1794
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1795 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	1796 (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	1797
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1798 return rc;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1799 }
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1800
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1801
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	1802 static ngx_int_t
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1803 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	1804 {
3628 cf47471a9eda make code more obviuos Igor Sysoev <igor@sysoev.ru> parents: 3627 diff changeset	1805 size_t len;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1806 ngx_int_t rc;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1807 ngx_http_upstream_t *u;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1808 ngx_http_proxy_ctx_t *ctx;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1809
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1810 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	1811
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	1812 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	1813 return NGX_ERROR;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1814 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1815
3627 9061fdb2ed8c use ngx_http_parse_status_line() Igor Sysoev <igor@sysoev.ru> parents: 3615 diff changeset	1816 u = r->upstream;
9061fdb2ed8c use ngx_http_parse_status_line() Igor Sysoev <igor@sysoev.ru> parents: 3615 diff changeset	1817
9061fdb2ed8c use ngx_http_parse_status_line() Igor Sysoev <igor@sysoev.ru> parents: 3615 diff changeset	1818 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	1819
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1820 if (rc == NGX_AGAIN) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1821 return rc;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1822 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1823
3627 9061fdb2ed8c use ngx_http_parse_status_line() Igor Sysoev <igor@sysoev.ru> parents: 3615 diff changeset	1824 if (rc == NGX_ERROR) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1825
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1826 #if (NGX_HTTP_CACHE)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1827
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1828 if (r->cache) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1829 r->http_version = NGX_HTTP_VERSION_9;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1830 return NGX_OK;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1831 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1832
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1833 #endif
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1834
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1835 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	1836 "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	1837
619 7a16e281c01f nginx-0.3.31-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 611 diff changeset	1838 #if 0
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1839 if (u->accel) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1840 return NGX_HTTP_UPSTREAM_INVALID_HEADER;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1841 }
619 7a16e281c01f nginx-0.3.31-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 611 diff changeset	1842 #endif
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1843
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1844 r->http_version = NGX_HTTP_VERSION_9;
1616 0a293900d21b set status in correct place Igor Sysoev <igor@sysoev.ru> parents: 1565 diff changeset	1845 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	1846 u->headers_in.connection_close = 1;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1847
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1848 return NGX_OK;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1849 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1850
5575 d15822784cf9 Upstream: fix $upstream_status variable. Piotr Sikora <piotr@cloudflare.com> parents: 5466 diff changeset	1851 if (u->state && u->state->status == 0) {
3627 9061fdb2ed8c use ngx_http_parse_status_line() Igor Sysoev <igor@sysoev.ru> parents: 3615 diff changeset	1852 u->state->status = ctx->status.code;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1853 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	1854
3627 9061fdb2ed8c use ngx_http_parse_status_line() Igor Sysoev <igor@sysoev.ru> parents: 3615 diff changeset	1855 u->headers_in.status_n = ctx->status.code;
9061fdb2ed8c use ngx_http_parse_status_line() Igor Sysoev <igor@sysoev.ru> parents: 3615 diff changeset	1856
3628 cf47471a9eda make code more obviuos Igor Sysoev <igor@sysoev.ru> parents: 3627 diff changeset	1857 len = ctx->status.end - ctx->status.start;
cf47471a9eda make code more obviuos Igor Sysoev <igor@sysoev.ru> parents: 3627 diff changeset	1858 u->headers_in.status_line.len = len;
cf47471a9eda make code more obviuos Igor Sysoev <igor@sysoev.ru> parents: 3627 diff changeset	1859
cf47471a9eda make code more obviuos Igor Sysoev <igor@sysoev.ru> parents: 3627 diff changeset	1860 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	1861 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	1862 return NGX_ERROR;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1863 }
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	1864
3628 cf47471a9eda make code more obviuos Igor Sysoev <igor@sysoev.ru> parents: 3627 diff changeset	1865 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	1866
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1867 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	1868 "http proxy status %ui \"%V\"",
936 2864303e0ce5 fix debug log Igor Sysoev <igor@sysoev.ru> parents: 906 diff changeset	1869 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	1870
4125 e5df04b05e75 Protocol version parsing in ngx_http_parse_status_line(). Maxim Dounin <mdounin@mdounin.ru> parents: 4009 diff changeset	1871 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	1872 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	1873 }
e5df04b05e75 Protocol version parsing in ngx_http_parse_status_line(). Maxim Dounin <mdounin@mdounin.ru> parents: 4009 diff changeset	1874
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1875 u->process_header = ngx_http_proxy_process_header;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1876
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1877 return ngx_http_proxy_process_header(r);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1878 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1879
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1880
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1881 static ngx_int_t
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1882 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	1883 {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1884 ngx_int_t rc;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1885 ngx_table_elt_t *h;
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1886 ngx_http_upstream_t *u;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1887 ngx_http_proxy_ctx_t *ctx;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1888 ngx_http_upstream_header_t *hh;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1889 ngx_http_upstream_main_conf_t *umcf;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1890
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1891 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	1892
2024 7018254cc006 style fix Igor Sysoev <igor@sysoev.ru> parents: 1925 diff changeset	1893 for ( ;; ) {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1894
2256 8c17cfe63d2c underscores_in_headers Igor Sysoev <igor@sysoev.ru> parents: 2233 diff changeset	1895 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	1896
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1897 if (rc == NGX_OK) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1898
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1899 /* a header line has been parsed successfully */
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1900
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1901 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	1902 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	1903 return NGX_ERROR;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1904 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1905
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1906 h->hash = r->header_hash;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1907
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1908 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	1909 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	1910
2049 2a92804f4109 ) back out r2040 Igor Sysoev <igor@sysoev.ru>* parents: 2030 diff changeset	1911 h->key.data = ngx_pnalloc(r->pool,
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1912 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	1913 if (h->key.data == NULL) {
7001 08537eab4f23 Upstream: fixed u->headers_in.headers allocation error handling. Sergey Kandaurov <pluknet@nginx.com> parents: 6981 diff changeset	1914 h->hash = 0;
1699 976db8c6fb64 return NGX_ERROR instead of NGX_HTTP_INTERNAL_SERVER_ERROR in u->parse_header() Igor Sysoev <igor@sysoev.ru> parents: 1688 diff changeset	1915 return NGX_ERROR;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1916 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1917
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1918 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	1919 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	1920
4529 1ebec1d15a25 Fixed incorrect ngx_cpystrn() usage in ngx_http__process_header(). Maxim Dounin <mdounin@mdounin.ru>* parents: 4499 diff changeset	1921 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	1922 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	1923 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	1924 h->value.data[h->value.len] = '\0';
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1925
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1926 if (h->key.len == r->lowcase_index) {
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1927 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	1928
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1929 } else {
2135 8c6521eedf84 ngx_strlow() Igor Sysoev <igor@sysoev.ru> parents: 2067 diff changeset	1930 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	1931 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1932
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1933 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	1934 h->lowcase_key, h->key.len);
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1935
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1936 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	1937 return NGX_ERROR;
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1938 }
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1939
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1940 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	1941 "http proxy header: \"%V: %V\"",
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1942 &h->key, &h->value);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1943
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1944 continue;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1945 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1946
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1947 if (rc == NGX_HTTP_PARSE_HEADER_DONE) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1948
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1949 /* a whole header has been parsed successfully */
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1950
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1951 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	1952 "http proxy header done");
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1953
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1954 /*
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1955 * if no "Server" and "Date" in header line,
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1956 * then add the special empty headers
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1957 */
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1958
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1959 if (r->upstream->headers_in.server == NULL) {
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1960 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	1961 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	1962 return NGX_ERROR;
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1963 }
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1964
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1965 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	1966 ngx_hash('s', 'e'), 'r'), 'v'), 'e'), 'r');
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1967
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3477 diff changeset	1968 ngx_str_set(&h->key, "Server");
dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3477 diff changeset	1969 ngx_str_null(&h->value);
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1970 h->lowcase_key = (u_char *) "server";
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1971 }
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1972
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1973 if (r->upstream->headers_in.date == NULL) {
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1974 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	1975 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	1976 return NGX_ERROR;
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1977 }
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1978
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1979 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	1980
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3477 diff changeset	1981 ngx_str_set(&h->key, "Date");
dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3477 diff changeset	1982 ngx_str_null(&h->value);
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1983 h->lowcase_key = (u_char *) "date";
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1984 }
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1985
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1986 /* 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	1987
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1988 u = r->upstream;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1989
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1990 if (u->headers_in.chunked) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1991 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	1992 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1993
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1994 /*
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1995 * 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	1996 * 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	1997 */
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1998
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	1999 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	2000
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2001 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	2002 \|\| 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	2003 \|\| ctx->head
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2004 \|\| (!u->headers_in.chunked
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2005 && 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	2006 {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2007 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	2008 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2009
5072 7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5012 diff changeset	2010 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	2011 u->keepalive = 0;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5012 diff changeset	2012
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5012 diff changeset	2013 if (r->headers_in.upgrade) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5012 diff changeset	2014 u->upgrade = 1;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5012 diff changeset	2015 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5012 diff changeset	2016 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5012 diff changeset	2017
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2018 return NGX_OK;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2019 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2020
521 6f00349b98e5 nginx-0.1.35-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 519 diff changeset	2021 if (rc == NGX_AGAIN) {
6f00349b98e5 nginx-0.1.35-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 519 diff changeset	2022 return NGX_AGAIN;
6f00349b98e5 nginx-0.1.35-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 519 diff changeset	2023 }
6f00349b98e5 nginx-0.1.35-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 519 diff changeset	2024
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2025 /* there was error while a header line parsing */
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2026
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2027 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	2028 "upstream sent invalid header");
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2029
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2030 return NGX_HTTP_UPSTREAM_INVALID_HEADER;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2031 }
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2032 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2033
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2034
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2035 static ngx_int_t
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2036 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	2037 {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2038 ngx_http_request_t *r = data;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2039 ngx_http_upstream_t *u;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2040 ngx_http_proxy_ctx_t *ctx;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2041
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2042 u = r->upstream;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2043 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	2044
4602 8036fc6af2df Proxy: added ctx checking to input filters. Maxim Dounin <mdounin@mdounin.ru> parents: 4593 diff changeset	2045 if (ctx == NULL) {
8036fc6af2df Proxy: added ctx checking to input filters. Maxim Dounin <mdounin@mdounin.ru> parents: 4593 diff changeset	2046 return NGX_ERROR;
8036fc6af2df Proxy: added ctx checking to input filters. Maxim Dounin <mdounin@mdounin.ru> parents: 4593 diff changeset	2047 }
8036fc6af2df Proxy: added ctx checking to input filters. Maxim Dounin <mdounin@mdounin.ru> parents: 4593 diff changeset	2048
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2049 ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
6480 f01ab2dbcfdc Fixed logging. Sergey Kandaurov <pluknet@nginx.com> parents: 6467 diff changeset	2050 "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	2051 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	2052 u->headers_in.content_length_n);
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2053
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2054 /* 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	2055
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2056 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	2057 \|\| 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	2058 \|\| ctx->head)
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2059 {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2060 /* 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	2061 /* 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	2062
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2063 u->pipe->length = 0;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2064 u->length = 0;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2065 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	2066
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2067 } else if (u->headers_in.chunked) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2068 /* chunked */
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2069
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2070 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	2071 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	2072
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2073 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	2074 u->length = 1;
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2075
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2076 } 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	2077 /* 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	2078
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2079 u->pipe->length = 0;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2080 u->length = 0;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2081 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	2082
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2083 } else {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2084 /* content length or connection close */
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2085
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2086 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	2087 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	2088 }
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 return NGX_OK;
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
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2093
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2094 static ngx_int_t
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2095 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	2096 {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2097 ngx_buf_t *b;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2098 ngx_chain_t *cl;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2099 ngx_http_request_t *r;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2100
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2101 if (buf->pos == buf->last) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2102 return NGX_OK;
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
7675 9afa45068b8f Proxy: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7473 diff changeset	2105 if (p->upstream_done) {
9afa45068b8f Proxy: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7473 diff changeset	2106 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, p->log, 0,
9afa45068b8f Proxy: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7473 diff changeset	2107 "http proxy data after close");
9afa45068b8f Proxy: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7473 diff changeset	2108 return NGX_OK;
9afa45068b8f Proxy: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7473 diff changeset	2109 }
9afa45068b8f Proxy: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7473 diff changeset	2110
9afa45068b8f Proxy: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7473 diff changeset	2111 if (p->length == 0) {
9afa45068b8f Proxy: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7473 diff changeset	2112
9afa45068b8f Proxy: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7473 diff changeset	2113 ngx_log_error(NGX_LOG_WARN, p->log, 0,
9afa45068b8f Proxy: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7473 diff changeset	2114 "upstream sent more data than specified in "
9afa45068b8f Proxy: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7473 diff changeset	2115 "\"Content-Length\" header");
9afa45068b8f Proxy: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7473 diff changeset	2116
9afa45068b8f Proxy: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7473 diff changeset	2117 r = p->input_ctx;
9afa45068b8f Proxy: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7473 diff changeset	2118 r->upstream->keepalive = 0;
9afa45068b8f Proxy: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7473 diff changeset	2119 p->upstream_done = 1;
9afa45068b8f Proxy: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7473 diff changeset	2120
9afa45068b8f Proxy: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7473 diff changeset	2121 return NGX_OK;
9afa45068b8f Proxy: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7473 diff changeset	2122 }
9afa45068b8f Proxy: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7473 diff changeset	2123
5466 e7b3b9855be8 Use ngx_chain_get_free_buf() in pipe input filters. Valentin Bartenev <vbart@nginx.com> parents: 5441 diff changeset	2124 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	2125 if (cl == NULL) {
e7b3b9855be8 Use ngx_chain_get_free_buf() in pipe input filters. Valentin Bartenev <vbart@nginx.com> parents: 5441 diff changeset	2126 return NGX_ERROR;
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2127 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2128
5466 e7b3b9855be8 Use ngx_chain_get_free_buf() in pipe input filters. Valentin Bartenev <vbart@nginx.com> parents: 5441 diff changeset	2129 b = cl->buf;
e7b3b9855be8 Use ngx_chain_get_free_buf() in pipe input filters. Valentin Bartenev <vbart@nginx.com> parents: 5441 diff changeset	2130
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2131 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	2132 b->shadow = buf;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2133 b->tag = p->tag;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2134 b->last_shadow = 1;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2135 b->recycled = 1;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2136 buf->shadow = b;
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 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	2139
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2140 if (p->in) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2141 *p->last_in = cl;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2142 } else {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2143 p->in = cl;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2144 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2145 p->last_in = &cl->next;
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 if (p->length == -1) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2148 return NGX_OK;
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
7675 9afa45068b8f Proxy: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7473 diff changeset	2151 if (b->last - b->pos > p->length) {
9afa45068b8f Proxy: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7473 diff changeset	2152
9afa45068b8f Proxy: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7473 diff changeset	2153 ngx_log_error(NGX_LOG_WARN, p->log, 0,
9afa45068b8f Proxy: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7473 diff changeset	2154 "upstream sent more data than specified in "
9afa45068b8f Proxy: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7473 diff changeset	2155 "\"Content-Length\" header");
9afa45068b8f Proxy: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7473 diff changeset	2156
9afa45068b8f Proxy: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7473 diff changeset	2157 b->last = b->pos + p->length;
9afa45068b8f Proxy: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7473 diff changeset	2158 p->upstream_done = 1;
9afa45068b8f Proxy: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7473 diff changeset	2159
9afa45068b8f Proxy: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7473 diff changeset	2160 return NGX_OK;
9afa45068b8f Proxy: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7473 diff changeset	2161 }
9afa45068b8f Proxy: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7473 diff changeset	2162
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2163 p->length -= b->last - b->pos;
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 if (p->length == 0) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2166 r = p->input_ctx;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2167 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	2168 }
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 return NGX_OK;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2171 }
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
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2174 static ngx_int_t
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2175 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	2176 {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2177 ngx_int_t rc;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2178 ngx_buf_t b, *prev;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2179 ngx_chain_t *cl;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2180 ngx_http_request_t *r;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2181 ngx_http_proxy_ctx_t *ctx;
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 (buf->pos == buf->last) {
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 r = p->input_ctx;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2188 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	2189
4602 8036fc6af2df Proxy: added ctx checking to input filters. Maxim Dounin <mdounin@mdounin.ru> parents: 4593 diff changeset	2190 if (ctx == NULL) {
8036fc6af2df Proxy: added ctx checking to input filters. Maxim Dounin <mdounin@mdounin.ru> parents: 4593 diff changeset	2191 return NGX_ERROR;
8036fc6af2df Proxy: added ctx checking to input filters. Maxim Dounin <mdounin@mdounin.ru> parents: 4593 diff changeset	2192 }
8036fc6af2df Proxy: added ctx checking to input filters. Maxim Dounin <mdounin@mdounin.ru> parents: 4593 diff changeset	2193
7676 d225b70d38b6 Proxy: detection of data after final chunk. Maxim Dounin <mdounin@mdounin.ru> parents: 7675 diff changeset	2194 if (p->upstream_done) {
d225b70d38b6 Proxy: detection of data after final chunk. Maxim Dounin <mdounin@mdounin.ru> parents: 7675 diff changeset	2195 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, p->log, 0,
d225b70d38b6 Proxy: detection of data after final chunk. Maxim Dounin <mdounin@mdounin.ru> parents: 7675 diff changeset	2196 "http proxy data after close");
d225b70d38b6 Proxy: detection of data after final chunk. Maxim Dounin <mdounin@mdounin.ru> parents: 7675 diff changeset	2197 return NGX_OK;
d225b70d38b6 Proxy: detection of data after final chunk. Maxim Dounin <mdounin@mdounin.ru> parents: 7675 diff changeset	2198 }
d225b70d38b6 Proxy: detection of data after final chunk. Maxim Dounin <mdounin@mdounin.ru> parents: 7675 diff changeset	2199
d225b70d38b6 Proxy: detection of data after final chunk. Maxim Dounin <mdounin@mdounin.ru> parents: 7675 diff changeset	2200 if (p->length == 0) {
d225b70d38b6 Proxy: detection of data after final chunk. Maxim Dounin <mdounin@mdounin.ru> parents: 7675 diff changeset	2201
d225b70d38b6 Proxy: detection of data after final chunk. Maxim Dounin <mdounin@mdounin.ru> parents: 7675 diff changeset	2202 ngx_log_error(NGX_LOG_WARN, p->log, 0,
d225b70d38b6 Proxy: detection of data after final chunk. Maxim Dounin <mdounin@mdounin.ru> parents: 7675 diff changeset	2203 "upstream sent data after final chunk");
d225b70d38b6 Proxy: detection of data after final chunk. Maxim Dounin <mdounin@mdounin.ru> parents: 7675 diff changeset	2204
d225b70d38b6 Proxy: detection of data after final chunk. Maxim Dounin <mdounin@mdounin.ru> parents: 7675 diff changeset	2205 r->upstream->keepalive = 0;
d225b70d38b6 Proxy: detection of data after final chunk. Maxim Dounin <mdounin@mdounin.ru> parents: 7675 diff changeset	2206 p->upstream_done = 1;
d225b70d38b6 Proxy: detection of data after final chunk. Maxim Dounin <mdounin@mdounin.ru> parents: 7675 diff changeset	2207
d225b70d38b6 Proxy: detection of data after final chunk. Maxim Dounin <mdounin@mdounin.ru> parents: 7675 diff changeset	2208 return NGX_OK;
d225b70d38b6 Proxy: detection of data after final chunk. Maxim Dounin <mdounin@mdounin.ru> parents: 7675 diff changeset	2209 }
d225b70d38b6 Proxy: detection of data after final chunk. Maxim Dounin <mdounin@mdounin.ru> parents: 7675 diff changeset	2210
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2211 b = NULL;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2212 prev = &buf->shadow;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2213
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2214 for ( ;; ) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2215
4925 32030fa8cb14 Request body: chunked parsing moved to ngx_http_parse.c from proxy. Maxim Dounin <mdounin@mdounin.ru> parents: 4602 diff changeset	2216 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	2217
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2218 if (rc == NGX_OK) {
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 /* a chunk has been parsed successfully */
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2221
5466 e7b3b9855be8 Use ngx_chain_get_free_buf() in pipe input filters. Valentin Bartenev <vbart@nginx.com> parents: 5441 diff changeset	2222 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	2223 if (cl == NULL) {
e7b3b9855be8 Use ngx_chain_get_free_buf() in pipe input filters. Valentin Bartenev <vbart@nginx.com> parents: 5441 diff changeset	2224 return NGX_ERROR;
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2225 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2226
5466 e7b3b9855be8 Use ngx_chain_get_free_buf() in pipe input filters. Valentin Bartenev <vbart@nginx.com> parents: 5441 diff changeset	2227 b = cl->buf;
e7b3b9855be8 Use ngx_chain_get_free_buf() in pipe input filters. Valentin Bartenev <vbart@nginx.com> parents: 5441 diff changeset	2228
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2229 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	2230
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2231 b->pos = buf->pos;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2232 b->start = buf->start;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2233 b->end = buf->end;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2234 b->tag = p->tag;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2235 b->temporary = 1;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2236 b->recycled = 1;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2237
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2238 *prev = b;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2239 prev = &b->shadow;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2240
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2241 if (p->in) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2242 *p->last_in = cl;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2243 } else {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2244 p->in = cl;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2245 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2246 p->last_in = &cl->next;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2247
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2248 /* STUB */ b->num = buf->num;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2249
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2250 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	2251 "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	2252
4925 32030fa8cb14 Request body: chunked parsing moved to ngx_http_parse.c from proxy. Maxim Dounin <mdounin@mdounin.ru> parents: 4602 diff changeset	2253 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	2254
5359 2fda9065d0f4 Win32: Borland C compatibility fixes. Maxim Dounin <mdounin@mdounin.ru> parents: 5301 diff changeset	2255 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	2256 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	2257 ctx->chunked.size = 0;
4126 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 continue;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2260 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2261
4925 32030fa8cb14 Request body: chunked parsing moved to ngx_http_parse.c from proxy. Maxim Dounin <mdounin@mdounin.ru> parents: 4602 diff changeset	2262 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	2263 buf->pos = buf->last;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2264 b->last = buf->last;
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 continue;
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
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2269 if (rc == NGX_DONE) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2270
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2271 /* 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	2272
7676 d225b70d38b6 Proxy: detection of data after final chunk. Maxim Dounin <mdounin@mdounin.ru> parents: 7675 diff changeset	2273 p->length = 0;
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2274 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	2275
7676 d225b70d38b6 Proxy: detection of data after final chunk. Maxim Dounin <mdounin@mdounin.ru> parents: 7675 diff changeset	2276 if (buf->pos != buf->last) {
d225b70d38b6 Proxy: detection of data after final chunk. Maxim Dounin <mdounin@mdounin.ru> parents: 7675 diff changeset	2277 ngx_log_error(NGX_LOG_WARN, p->log, 0,
d225b70d38b6 Proxy: detection of data after final chunk. Maxim Dounin <mdounin@mdounin.ru> parents: 7675 diff changeset	2278 "upstream sent data after final chunk");
d225b70d38b6 Proxy: detection of data after final chunk. Maxim Dounin <mdounin@mdounin.ru> parents: 7675 diff changeset	2279 r->upstream->keepalive = 0;
d225b70d38b6 Proxy: detection of data after final chunk. Maxim Dounin <mdounin@mdounin.ru> parents: 7675 diff changeset	2280 }
d225b70d38b6 Proxy: detection of data after final chunk. Maxim Dounin <mdounin@mdounin.ru> parents: 7675 diff changeset	2281
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2282 break;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2283 }
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 if (rc == NGX_AGAIN) {
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 /* 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	2288
4925 32030fa8cb14 Request body: chunked parsing moved to ngx_http_parse.c from proxy. Maxim Dounin <mdounin@mdounin.ru> parents: 4602 diff changeset	2289 p->length = ctx->chunked.length;
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2290
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2291 break;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2292 }
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 /* invalid response */
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2295
7677 a786e491d08d Proxy: style. Maxim Dounin <mdounin@mdounin.ru> parents: 7676 diff changeset	2296 ngx_log_error(NGX_LOG_ERR, p->log, 0,
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2297 "upstream sent invalid chunked response");
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2298
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2299 return NGX_ERROR;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2300 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2301
7677 a786e491d08d Proxy: style. Maxim Dounin <mdounin@mdounin.ru> parents: 7676 diff changeset	2302 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, p->log, 0,
6480 f01ab2dbcfdc Fixed logging. Sergey Kandaurov <pluknet@nginx.com> parents: 6467 diff changeset	2303 "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	2304 ctx->chunked.state, p->length);
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2305
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2306 if (b) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2307 b->shadow = buf;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2308 b->last_shadow = 1;
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 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	2311 "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	2312
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2313 return NGX_OK;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2314 }
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 /* 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	2317
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2318 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	2319 return NGX_ERROR;
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
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2322 return NGX_OK;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2323 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2324
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2325
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2326 static ngx_int_t
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2327 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	2328 {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2329 ngx_http_request_t *r = data;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2330
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2331 ngx_buf_t *b;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2332 ngx_chain_t cl, *ll;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2333 ngx_http_upstream_t *u;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2334
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2335 u = r->upstream;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2336
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2337 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	2338 ll = &cl->next;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2339 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2340
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2341 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	2342 if (cl == NULL) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2343 return NGX_ERROR;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2344 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2345
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2346 *ll = cl;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2347
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2348 cl->buf->flush = 1;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2349 cl->buf->memory = 1;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2350
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2351 b = &u->buffer;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2352
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2353 cl->buf->pos = b->last;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2354 b->last += bytes;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2355 cl->buf->last = b->last;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2356 cl->buf->tag = u->output.tag;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2357
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2358 if (u->length == -1) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2359 return NGX_OK;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2360 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2361
7675 9afa45068b8f Proxy: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7473 diff changeset	2362 if (bytes > u->length) {
9afa45068b8f Proxy: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7473 diff changeset	2363
9afa45068b8f Proxy: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7473 diff changeset	2364 ngx_log_error(NGX_LOG_WARN, r->connection->log, 0,
9afa45068b8f Proxy: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7473 diff changeset	2365 "upstream sent more data than specified in "
9afa45068b8f Proxy: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7473 diff changeset	2366 "\"Content-Length\" header");
9afa45068b8f Proxy: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7473 diff changeset	2367
9afa45068b8f Proxy: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7473 diff changeset	2368 cl->buf->last = cl->buf->pos + u->length;
9afa45068b8f Proxy: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7473 diff changeset	2369 u->length = 0;
9afa45068b8f Proxy: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7473 diff changeset	2370
9afa45068b8f Proxy: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7473 diff changeset	2371 return NGX_OK;
9afa45068b8f Proxy: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7473 diff changeset	2372 }
9afa45068b8f Proxy: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7473 diff changeset	2373
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2374 u->length -= bytes;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2375
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2376 if (u->length == 0) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2377 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	2378 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2379
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2380 return NGX_OK;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2381 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2382
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2383
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2384 static ngx_int_t
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2385 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	2386 {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2387 ngx_http_request_t *r = data;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2388
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2389 ngx_int_t rc;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2390 ngx_buf_t b, buf;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2391 ngx_chain_t cl, *ll;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2392 ngx_http_upstream_t *u;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2393 ngx_http_proxy_ctx_t *ctx;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2394
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2395 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	2396
8036fc6af2df Proxy: added ctx checking to input filters. Maxim Dounin <mdounin@mdounin.ru> parents: 4593 diff changeset	2397 if (ctx == NULL) {
8036fc6af2df Proxy: added ctx checking to input filters. Maxim Dounin <mdounin@mdounin.ru> parents: 4593 diff changeset	2398 return NGX_ERROR;
8036fc6af2df Proxy: added ctx checking to input filters. Maxim Dounin <mdounin@mdounin.ru> parents: 4593 diff changeset	2399 }
8036fc6af2df Proxy: added ctx checking to input filters. Maxim Dounin <mdounin@mdounin.ru> parents: 4593 diff changeset	2400
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2401 u = r->upstream;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2402 buf = &u->buffer;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2403
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2404 buf->pos = buf->last;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2405 buf->last += bytes;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2406
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2407 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	2408 ll = &cl->next;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2409 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2410
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2411 for ( ;; ) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2412
4925 32030fa8cb14 Request body: chunked parsing moved to ngx_http_parse.c from proxy. Maxim Dounin <mdounin@mdounin.ru> parents: 4602 diff changeset	2413 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	2414
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2415 if (rc == NGX_OK) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2416
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2417 /* a chunk has been parsed successfully */
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2418
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2419 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	2420 if (cl == NULL) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2421 return NGX_ERROR;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2422 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2423
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2424 *ll = cl;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2425 ll = &cl->next;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2426
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2427 b = cl->buf;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2428
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2429 b->flush = 1;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2430 b->memory = 1;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2431
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2432 b->pos = buf->pos;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2433 b->tag = u->output.tag;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2434
4925 32030fa8cb14 Request body: chunked parsing moved to ngx_http_parse.c from proxy. Maxim Dounin <mdounin@mdounin.ru> parents: 4602 diff changeset	2435 if (buf->last - buf->pos >= ctx->chunked.size) {
5359 2fda9065d0f4 Win32: Borland C compatibility fixes. Maxim Dounin <mdounin@mdounin.ru> parents: 5301 diff changeset	2436 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	2437 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	2438 ctx->chunked.size = 0;
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2439
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2440 } else {
4925 32030fa8cb14 Request body: chunked parsing moved to ngx_http_parse.c from proxy. Maxim Dounin <mdounin@mdounin.ru> parents: 4602 diff changeset	2441 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	2442 buf->pos = buf->last;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2443 b->last = buf->last;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2444 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2445
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2446 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	2447 "http proxy out buf %p %z",
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2448 b->pos, b->last - b->pos);
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2449
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2450 continue;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2451 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2452
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2453 if (rc == NGX_DONE) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2454
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2455 /* 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	2456
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2457 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	2458 u->length = 0;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2459
7676 d225b70d38b6 Proxy: detection of data after final chunk. Maxim Dounin <mdounin@mdounin.ru> parents: 7675 diff changeset	2460 if (buf->pos != buf->last) {
d225b70d38b6 Proxy: detection of data after final chunk. Maxim Dounin <mdounin@mdounin.ru> parents: 7675 diff changeset	2461 ngx_log_error(NGX_LOG_WARN, r->connection->log, 0,
d225b70d38b6 Proxy: detection of data after final chunk. Maxim Dounin <mdounin@mdounin.ru> parents: 7675 diff changeset	2462 "upstream sent data after final chunk");
d225b70d38b6 Proxy: detection of data after final chunk. Maxim Dounin <mdounin@mdounin.ru> parents: 7675 diff changeset	2463 u->keepalive = 0;
d225b70d38b6 Proxy: detection of data after final chunk. Maxim Dounin <mdounin@mdounin.ru> parents: 7675 diff changeset	2464 }
d225b70d38b6 Proxy: detection of data after final chunk. Maxim Dounin <mdounin@mdounin.ru> parents: 7675 diff changeset	2465
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2466 break;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2467 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2468
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2469 if (rc == NGX_AGAIN) {
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2470 break;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2471 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2472
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2473 /* invalid response */
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2474
4145 f321e9750c8c Proxy: logging levels tuned, double logging fixed. Maxim Dounin <mdounin@mdounin.ru> parents: 4144 diff changeset	2475 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	2476 "upstream sent invalid chunked response");
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2477
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2478 return NGX_ERROR;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2479 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2480
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2481 return NGX_OK;
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2482 }
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2483
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	2484
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2485 static void
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2486 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	2487 {
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2488 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	2489 "abort http proxy request");
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2490
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2491 return;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2492 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2493
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2494
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2495 static void
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2496 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	2497 {
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2498 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	2499 "finalize http proxy request");
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2500
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2501 return;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2502 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2503
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2504
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	2505 static ngx_int_t
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	2506 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	2507 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	2508 {
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2509 ngx_http_proxy_ctx_t *ctx;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2510
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2511 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	2512
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2513 if (ctx == NULL) {
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2514 v->not_found = 1;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2515 return NGX_OK;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2516 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2517
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2518 v->len = ctx->vars.host_header.len;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2519 v->valid = 1;
1565 4c43e25d11ea fix English grammar Igor Sysoev <igor@sysoev.ru> parents: 1563 diff changeset	2520 v->no_cacheable = 0;
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	2521 v->not_found = 0;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2522 v->data = ctx->vars.host_header.data;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2523
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	2524 return NGX_OK;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2525 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2526
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2527
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	2528 static ngx_int_t
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	2529 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	2530 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	2531 {
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2532 ngx_http_proxy_ctx_t *ctx;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2533
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2534 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	2535
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2536 if (ctx == NULL) {
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2537 v->not_found = 1;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2538 return NGX_OK;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2539 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2540
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2541 v->len = ctx->vars.port.len;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2542 v->valid = 1;
1565 4c43e25d11ea fix English grammar Igor Sysoev <igor@sysoev.ru> parents: 1563 diff changeset	2543 v->no_cacheable = 0;
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	2544 v->not_found = 0;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2545 v->data = ctx->vars.port.data;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2546
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	2547 return NGX_OK;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2548 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2549
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2550
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	2551 static ngx_int_t
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2552 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	2553 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	2554 {
5084 f7fe817c92a2 Correctly handle multiple X-Forwarded-For headers (ticket #106). Ruslan Ermilov <ru@nginx.com> parents: 5072 diff changeset	2555 size_t len;
f7fe817c92a2 Correctly handle multiple X-Forwarded-For headers (ticket #106). Ruslan Ermilov <ru@nginx.com> parents: 5072 diff changeset	2556 u_char *p;
f7fe817c92a2 Correctly handle multiple X-Forwarded-For headers (ticket #106). Ruslan Ermilov <ru@nginx.com> parents: 5072 diff changeset	2557 ngx_uint_t i, n;
f7fe817c92a2 Correctly handle multiple X-Forwarded-For headers (ticket #106). Ruslan Ermilov <ru@nginx.com> parents: 5072 diff changeset	2558 ngx_table_elt_t **h;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2559
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2560 v->valid = 1;
1565 4c43e25d11ea fix English grammar Igor Sysoev <igor@sysoev.ru> parents: 1563 diff changeset	2561 v->no_cacheable = 0;
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	2562 v->not_found = 0;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2563
5084 f7fe817c92a2 Correctly handle multiple X-Forwarded-For headers (ticket #106). Ruslan Ermilov <ru@nginx.com> parents: 5072 diff changeset	2564 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	2565 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	2566
f7fe817c92a2 Correctly handle multiple X-Forwarded-For headers (ticket #106). Ruslan Ermilov <ru@nginx.com> parents: 5072 diff changeset	2567 len = 0;
f7fe817c92a2 Correctly handle multiple X-Forwarded-For headers (ticket #106). Ruslan Ermilov <ru@nginx.com> parents: 5072 diff changeset	2568
f7fe817c92a2 Correctly handle multiple X-Forwarded-For headers (ticket #106). Ruslan Ermilov <ru@nginx.com> parents: 5072 diff changeset	2569 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	2570 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	2571 }
f7fe817c92a2 Correctly handle multiple X-Forwarded-For headers (ticket #106). Ruslan Ermilov <ru@nginx.com> parents: 5072 diff changeset	2572
f7fe817c92a2 Correctly handle multiple X-Forwarded-For headers (ticket #106). Ruslan Ermilov <ru@nginx.com> parents: 5072 diff changeset	2573 if (len == 0) {
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	2574 v->len = r->connection->addr_text.len;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	2575 v->data = r->connection->addr_text.data;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	2576 return NGX_OK;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2577 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2578
5084 f7fe817c92a2 Correctly handle multiple X-Forwarded-For headers (ticket #106). Ruslan Ermilov <ru@nginx.com> parents: 5072 diff changeset	2579 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	2580
f7fe817c92a2 Correctly handle multiple X-Forwarded-For headers (ticket #106). Ruslan Ermilov <ru@nginx.com> parents: 5072 diff changeset	2581 p = ngx_pnalloc(r->pool, len);
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2582 if (p == NULL) {
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	2583 return NGX_ERROR;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2584 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2585
5084 f7fe817c92a2 Correctly handle multiple X-Forwarded-For headers (ticket #106). Ruslan Ermilov <ru@nginx.com> parents: 5072 diff changeset	2586 v->len = len;
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	2587 v->data = p;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2588
5084 f7fe817c92a2 Correctly handle multiple X-Forwarded-For headers (ticket #106). Ruslan Ermilov <ru@nginx.com> parents: 5072 diff changeset	2589 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	2590 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	2591 p++ = ','; p++ = ' ';
f7fe817c92a2 Correctly handle multiple X-Forwarded-For headers (ticket #106). Ruslan Ermilov <ru@nginx.com> parents: 5072 diff changeset	2592 }
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2593
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2594 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	2595
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	2596 return NGX_OK;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2597 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2598
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2599
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2600 static ngx_int_t
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2601 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	2602 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	2603 {
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2604 ngx_http_proxy_ctx_t *ctx;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2605
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	2606 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	2607
4927 93294110728f Request body: always use calculated size of a request body in proxy. Maxim Dounin <mdounin@mdounin.ru> parents: 4925 diff changeset	2608 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	2609 v->not_found = 1;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2610 return NGX_OK;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2611 }
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2612
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2613 v->valid = 1;
1565 4c43e25d11ea fix English grammar Igor Sysoev <igor@sysoev.ru> parents: 1563 diff changeset	2614 v->no_cacheable = 0;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2615 v->not_found = 0;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2616
5188 886800caf360 Proxy: allocate $proxy_internal_body_length from request pool. Ruslan Ermilov <ru@nginx.com> parents: 5084 diff changeset	2617 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	2618
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2619 if (v->data == NULL) {
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2620 return NGX_ERROR;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2621 }
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2622
4927 93294110728f Request body: always use calculated size of a request body in proxy. Maxim Dounin <mdounin@mdounin.ru> parents: 4925 diff changeset	2623 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	2624
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2625 return NGX_OK;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2626 }
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2627
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2628
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2629 static ngx_int_t
6051 d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2630 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	2631 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	2632 {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2633 ngx_http_proxy_ctx_t *ctx;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2634
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2635 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	2636
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2637 if (ctx == NULL \|\| !ctx->internal_chunked) {
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2638 v->not_found = 1;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2639 return NGX_OK;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2640 }
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2641
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2642 v->valid = 1;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2643 v->no_cacheable = 0;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2644 v->not_found = 0;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2645
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2646 v->data = (u_char *) "chunked";
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2647 v->len = sizeof("chunked") - 1;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2648
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2649 return NGX_OK;
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2650 }
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2651
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2652
d97e6be2d292 Proxy: proxy_request_buffering chunked support. Maxim Dounin <mdounin@mdounin.ru> parents: 6050 diff changeset	2653 static ngx_int_t
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2654 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	2655 size_t prefix)
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2656 {
4462 a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2657 size_t len;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2658 ngx_int_t rc;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2659 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	2660 ngx_http_proxy_rewrite_t *pr;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2661 ngx_http_proxy_loc_conf_t *plcf;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2662
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2663 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	2664
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2665 pr = plcf->redirects->elts;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2666
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2667 if (pr == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2668 return NGX_DECLINED;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2669 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2670
4462 a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	2671 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	2672
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2673 for (i = 0; i < plcf->redirects->nelts; i++) {
7715 5c7917292b29 Proxy: changed interface of some internal functions. Ruslan Ermilov <ru@nginx.com> parents: 7714 diff changeset	2674 rc = pr[i].handler(r, &h->value, prefix, len, &pr[i]);
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2675
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2676 if (rc != NGX_DECLINED) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2677 return rc;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2678 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2679 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2680
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2681 return NGX_DECLINED;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2682 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2683
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2684
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2685 static ngx_int_t
4465 8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2686 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	2687 {
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2688 u_char *p;
7716 d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2689 size_t len;
4466 b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2690 ngx_int_t rc, rv;
7716 d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2691 ngx_str_t key, value;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2692 ngx_uint_t i;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2693 ngx_array_t attrs;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2694 ngx_keyval_t *attr;
4465 8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2695 ngx_http_proxy_loc_conf_t *plcf;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2696
7720 a88384c69d1e Proxy: error checking for array init, missed in 7716:d6a5e14aa3e4. Maxim Dounin <mdounin@mdounin.ru> parents: 7716 diff changeset	2697 if (ngx_array_init(&attrs, r->pool, 2, sizeof(ngx_keyval_t)) != NGX_OK) {
a88384c69d1e Proxy: error checking for array init, missed in 7716:d6a5e14aa3e4. Maxim Dounin <mdounin@mdounin.ru> parents: 7716 diff changeset	2698 return NGX_ERROR;
a88384c69d1e Proxy: error checking for array init, missed in 7716:d6a5e14aa3e4. Maxim Dounin <mdounin@mdounin.ru> parents: 7716 diff changeset	2699 }
7716 d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2700
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2701 if (ngx_http_proxy_parse_cookie(&h->value, &attrs) != NGX_OK) {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2702 return NGX_ERROR;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2703 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2704
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2705 attr = attrs.elts;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2706
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2707 if (attr[0].value.data == NULL) {
4465 8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2708 return NGX_DECLINED;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2709 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2710
4466 b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2711 rv = NGX_DECLINED;
4465 8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2712
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2713 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	2714
7716 d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2715 for (i = 1; i < attrs.nelts; i++) {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2716
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2717 key = &attr[i].key;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2718 value = &attr[i].value;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2719
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2720 if (plcf->cookie_domains && key->len == 6
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2721 && ngx_strncasecmp(key->data, (u_char *) "domain", 6) == 0
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2722 && value->data)
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2723 {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2724 rc = ngx_http_proxy_rewrite_cookie_value(r, value,
4465 8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2725 plcf->cookie_domains);
4466 b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2726 if (rc == NGX_ERROR) {
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2727 return NGX_ERROR;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2728 }
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2729
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2730 if (rc != NGX_DECLINED) {
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2731 rv = rc;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2732 }
4465 8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2733 }
7716 d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2734
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2735 if (plcf->cookie_paths && key->len == 4
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2736 && ngx_strncasecmp(key->data, (u_char *) "path", 4) == 0
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2737 && value->data)
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2738 {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2739 rc = ngx_http_proxy_rewrite_cookie_value(r, value,
4466 b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2740 plcf->cookie_paths);
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2741 if (rc == NGX_ERROR) {
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2742 return NGX_ERROR;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2743 }
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2744
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2745 if (rc != NGX_DECLINED) {
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2746 rv = rc;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2747 }
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2748 }
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2749 }
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	2750
7716 d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2751 if (plcf->cookie_flags) {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2752 rc = ngx_http_proxy_rewrite_cookie_flags(r, &attrs,
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2753 plcf->cookie_flags);
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2754 if (rc == NGX_ERROR) {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2755 return NGX_ERROR;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2756 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2757
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2758 if (rc != NGX_DECLINED) {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2759 rv = rc;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2760 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2761
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2762 attr = attrs.elts;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2763 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2764
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2765 if (rv != NGX_OK) {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2766 return rv;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2767 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2768
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2769 len = 0;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2770
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2771 for (i = 0; i < attrs.nelts; i++) {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2772
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2773 if (attr[i].key.data == NULL) {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2774 continue;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2775 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2776
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2777 if (i > 0) {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2778 len += 2;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2779 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2780
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2781 len += attr[i].key.len;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2782
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2783 if (attr[i].value.data) {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2784 len += 1 + attr[i].value.len;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2785 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2786 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2787
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2788 p = ngx_pnalloc(r->pool, len + 1);
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2789 if (p == NULL) {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2790 return NGX_ERROR;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2791 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2792
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2793 h->value.data = p;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2794 h->value.len = len;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2795
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2796 for (i = 0; i < attrs.nelts; i++) {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2797
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2798 if (attr[i].key.data == NULL) {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2799 continue;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2800 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2801
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2802 if (i > 0) {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2803 *p++ = ';';
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2804 *p++ = ' ';
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2805 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2806
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2807 p = ngx_cpymem(p, attr[i].key.data, attr[i].key.len);
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2808
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2809 if (attr[i].value.data) {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2810 *p++ = '=';
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2811 p = ngx_cpymem(p, attr[i].value.data, attr[i].value.len);
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2812 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2813 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2814
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2815 *p = '\0';
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2816
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2817 return NGX_OK;
4465 8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2818 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2819
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2820
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2821 static ngx_int_t
7716 d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2822 ngx_http_proxy_parse_cookie(ngx_str_t value, ngx_array_t attrs)
4465 8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2823 {
7716 d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2824 u_char start, end, p, last;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2825 ngx_str_t name, val;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2826 ngx_keyval_t *attr;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2827
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2828 start = value->data;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2829 end = value->data + value->len;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2830
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2831 for ( ;; ) {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2832
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2833 last = (u_char *) ngx_strchr(start, ';');
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2834
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2835 if (last == NULL) {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2836 last = end;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2837 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2838
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2839 while (start < last && *start == ' ') { start++; }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2840
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2841 for (p = start; p < last && p != '='; p++) { / void */ }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2842
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2843 name.data = start;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2844 name.len = p - start;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2845
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2846 while (name.len && name.data[name.len - 1] == ' ') {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2847 name.len--;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2848 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2849
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2850 if (p < last) {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2851
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2852 p++;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2853
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2854 while (p < last && *p == ' ') { p++; }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2855
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2856 val.data = p;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2857 val.len = last - val.data;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2858
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2859 while (val.len && val.data[val.len - 1] == ' ') {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2860 val.len--;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2861 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2862
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2863 } else {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2864 ngx_str_null(&val);
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2865 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2866
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2867 attr = ngx_array_push(attrs);
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2868 if (attr == NULL) {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2869 return NGX_ERROR;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2870 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2871
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2872 attr->key = name;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2873 attr->value = val;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2874
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2875 if (last == end) {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2876 break;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2877 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2878
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2879 start = last + 1;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2880 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2881
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2882 return NGX_OK;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2883 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2884
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2885
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2886 static ngx_int_t
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2887 ngx_http_proxy_rewrite_cookie_value(ngx_http_request_t r, ngx_str_t value,
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2888 ngx_array_t *rewrites)
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2889 {
4465 8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2890 ngx_int_t rc;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2891 ngx_uint_t i;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2892 ngx_http_proxy_rewrite_t *pr;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2893
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2894 pr = rewrites->elts;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2895
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2896 for (i = 0; i < rewrites->nelts; i++) {
7716 d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2897 rc = pr[i].handler(r, value, 0, value->len, &pr[i]);
4465 8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2898
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2899 if (rc != NGX_DECLINED) {
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2900 return rc;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2901 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2902 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2903
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2904 return NGX_DECLINED;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2905 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2906
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2907
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	2908 static ngx_int_t
7716 d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2909 ngx_http_proxy_rewrite_cookie_flags(ngx_http_request_t r, ngx_array_t attrs,
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2910 ngx_array_t *flags)
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2911 {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2912 ngx_str_t pattern;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2913 #if (NGX_PCRE)
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2914 ngx_int_t rc;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2915 #endif
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2916 ngx_uint_t i;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2917 ngx_keyval_t *attr;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2918 ngx_http_proxy_cookie_flags_t *pcf;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2919
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2920 attr = attrs->elts;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2921 pcf = flags->elts;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2922
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2923 for (i = 0; i < flags->nelts; i++) {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2924
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2925 #if (NGX_PCRE)
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2926 if (pcf[i].regex) {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2927 rc = ngx_http_regex_exec(r, pcf[i].cookie.regex, &attr[0].key);
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2928
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2929 if (rc == NGX_ERROR) {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2930 return NGX_ERROR;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2931 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2932
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2933 if (rc == NGX_OK) {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2934 break;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2935 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2936
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2937 /* NGX_DECLINED */
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2938
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2939 continue;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2940 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2941 #endif
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2942
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2943 if (ngx_http_complex_value(r, &pcf[i].cookie.complex, &pattern)
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2944 != NGX_OK)
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2945 {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2946 return NGX_ERROR;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2947 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2948
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2949 if (pattern.len == attr[0].key.len
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2950 && ngx_strncasecmp(attr[0].key.data, pattern.data, pattern.len)
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2951 == 0)
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2952 {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2953 break;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2954 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2955 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2956
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2957 if (i == flags->nelts) {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2958 return NGX_DECLINED;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2959 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2960
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2961 return ngx_http_proxy_edit_cookie_flags(r, attrs, pcf[i].flags);
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2962 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2963
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2964
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2965 static ngx_int_t
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2966 ngx_http_proxy_edit_cookie_flags(ngx_http_request_t r, ngx_array_t attrs,
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2967 ngx_uint_t flags)
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2968 {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2969 ngx_str_t key, value;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2970 ngx_uint_t i;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2971 ngx_keyval_t *attr;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2972
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2973 attr = attrs->elts;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2974
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2975 for (i = 1; i < attrs->nelts; i++) {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2976 key = &attr[i].key;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2977
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2978 if (key->len == 6
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2979 && ngx_strncasecmp(key->data, (u_char *) "secure", 6) == 0)
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2980 {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2981 if (flags & NGX_HTTP_PROXY_COOKIE_SECURE_ON) {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2982 flags &= ~NGX_HTTP_PROXY_COOKIE_SECURE_ON;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2983
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2984 } else if (flags & NGX_HTTP_PROXY_COOKIE_SECURE_OFF) {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2985 key->data = NULL;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2986 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2987
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2988 continue;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2989 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2990
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2991 if (key->len == 8
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2992 && ngx_strncasecmp(key->data, (u_char *) "httponly", 8) == 0)
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2993 {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2994 if (flags & NGX_HTTP_PROXY_COOKIE_HTTPONLY_ON) {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2995 flags &= ~NGX_HTTP_PROXY_COOKIE_HTTPONLY_ON;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2996
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2997 } else if (flags & NGX_HTTP_PROXY_COOKIE_HTTPONLY_OFF) {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2998 key->data = NULL;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	2999 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3000
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3001 continue;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3002 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3003
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3004 if (key->len == 8
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3005 && ngx_strncasecmp(key->data, (u_char *) "samesite", 8) == 0)
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3006 {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3007 value = &attr[i].value;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3008
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3009 if (flags & NGX_HTTP_PROXY_COOKIE_SAMESITE_STRICT) {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3010 flags &= ~NGX_HTTP_PROXY_COOKIE_SAMESITE_STRICT;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3011
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3012 if (value->len != 6
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3013 \|\| ngx_strncasecmp(value->data, (u_char *) "strict", 6)
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3014 != 0)
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3015 {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3016 ngx_str_set(key, "SameSite");
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3017 ngx_str_set(value, "Strict");
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3018 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3019
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3020 } else if (flags & NGX_HTTP_PROXY_COOKIE_SAMESITE_LAX) {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3021 flags &= ~NGX_HTTP_PROXY_COOKIE_SAMESITE_LAX;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3022
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3023 if (value->len != 3
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3024 \|\| ngx_strncasecmp(value->data, (u_char *) "lax", 3) != 0)
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3025 {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3026 ngx_str_set(key, "SameSite");
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3027 ngx_str_set(value, "Lax");
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3028 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3029
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3030 } else if (flags & NGX_HTTP_PROXY_COOKIE_SAMESITE_NONE) {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3031 flags &= ~NGX_HTTP_PROXY_COOKIE_SAMESITE_NONE;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3032
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3033 if (value->len != 4
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3034 \|\| ngx_strncasecmp(value->data, (u_char *) "none", 4) != 0)
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3035 {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3036 ngx_str_set(key, "SameSite");
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3037 ngx_str_set(value, "None");
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3038 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3039
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3040 } else if (flags & NGX_HTTP_PROXY_COOKIE_SAMESITE_OFF) {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3041 key->data = NULL;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3042 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3043
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3044 continue;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3045 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3046 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3047
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3048 if (flags & NGX_HTTP_PROXY_COOKIE_SECURE_ON) {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3049 attr = ngx_array_push(attrs);
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3050 if (attr == NULL) {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3051 return NGX_ERROR;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3052 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3053
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3054 ngx_str_set(&attr->key, "Secure");
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3055 ngx_str_null(&attr->value);
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3056 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3057
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3058 if (flags & NGX_HTTP_PROXY_COOKIE_HTTPONLY_ON) {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3059 attr = ngx_array_push(attrs);
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3060 if (attr == NULL) {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3061 return NGX_ERROR;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3062 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3063
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3064 ngx_str_set(&attr->key, "HttpOnly");
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3065 ngx_str_null(&attr->value);
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3066 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3067
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3068 if (flags & (NGX_HTTP_PROXY_COOKIE_SAMESITE_STRICT
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3069 \|NGX_HTTP_PROXY_COOKIE_SAMESITE_LAX
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3070 \|NGX_HTTP_PROXY_COOKIE_SAMESITE_NONE))
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3071 {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3072 attr = ngx_array_push(attrs);
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3073 if (attr == NULL) {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3074 return NGX_ERROR;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3075 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3076
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3077 ngx_str_set(&attr->key, "SameSite");
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3078
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3079 if (flags & NGX_HTTP_PROXY_COOKIE_SAMESITE_STRICT) {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3080 ngx_str_set(&attr->value, "Strict");
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3081
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3082 } else if (flags & NGX_HTTP_PROXY_COOKIE_SAMESITE_LAX) {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3083 ngx_str_set(&attr->value, "Lax");
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3084
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3085 } else {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3086 ngx_str_set(&attr->value, "None");
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3087 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3088 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3089
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3090 return NGX_OK;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3091 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3092
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3093
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3094 static ngx_int_t
7715 5c7917292b29 Proxy: changed interface of some internal functions. Ruslan Ermilov <ru@nginx.com> parents: 7714 diff changeset	3095 ngx_http_proxy_rewrite_complex_handler(ngx_http_request_t r, ngx_str_t value,
5c7917292b29 Proxy: changed interface of some internal functions. Ruslan Ermilov <ru@nginx.com> parents: 7714 diff changeset	3096 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	3097 {
4462 a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	3098 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	3099
103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	3100 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	3101 return NGX_ERROR;
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3102 }
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3103
4462 a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	3104 if (pattern.len > len
7715 5c7917292b29 Proxy: changed interface of some internal functions. Ruslan Ermilov <ru@nginx.com> parents: 7714 diff changeset	3105 \|\| ngx_rstrncmp(value->data + prefix, pattern.data, pattern.len) != 0)
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3106 {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3107 return NGX_DECLINED;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3108 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3109
4336 99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3110 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	3111 return NGX_ERROR;
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3112 }
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3113
7715 5c7917292b29 Proxy: changed interface of some internal functions. Ruslan Ermilov <ru@nginx.com> parents: 7714 diff changeset	3114 return ngx_http_proxy_rewrite(r, value, prefix, pattern.len, &replacement);
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3115 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3116
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3117
4336 99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3118 #if (NGX_PCRE)
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3119
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3120 static ngx_int_t
7715 5c7917292b29 Proxy: changed interface of some internal functions. Ruslan Ermilov <ru@nginx.com> parents: 7714 diff changeset	3121 ngx_http_proxy_rewrite_regex_handler(ngx_http_request_t r, ngx_str_t value,
4462 a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	3122 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	3123 {
4462 a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	3124 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	3125
a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	3126 pattern.len = len;
7715 5c7917292b29 Proxy: changed interface of some internal functions. Ruslan Ermilov <ru@nginx.com> parents: 7714 diff changeset	3127 pattern.data = value->data + prefix;
4461 103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	3128
103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	3129 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	3130 return NGX_DECLINED;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3131 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3132
4336 99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3133 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	3134 return NGX_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3135 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3136
7715 5c7917292b29 Proxy: changed interface of some internal functions. Ruslan Ermilov <ru@nginx.com> parents: 7714 diff changeset	3137 return ngx_http_proxy_rewrite(r, value, prefix, len, &replacement);
4462 a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	3138 }
a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	3139
a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	3140 #endif
a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	3141
a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	3142
a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	3143 static ngx_int_t
7715 5c7917292b29 Proxy: changed interface of some internal functions. Ruslan Ermilov <ru@nginx.com> parents: 7714 diff changeset	3144 ngx_http_proxy_rewrite_domain_handler(ngx_http_request_t r, ngx_str_t value,
5c7917292b29 Proxy: changed interface of some internal functions. Ruslan Ermilov <ru@nginx.com> parents: 7714 diff changeset	3145 size_t prefix, size_t len, ngx_http_proxy_rewrite_t *pr)
4465 8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3146 {
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3147 u_char *p;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3148 ngx_str_t pattern, replacement;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3149
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3150 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	3151 return NGX_ERROR;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3152 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3153
7715 5c7917292b29 Proxy: changed interface of some internal functions. Ruslan Ermilov <ru@nginx.com> parents: 7714 diff changeset	3154 p = value->data + prefix;
4465 8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3155
7716 d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3156 if (len && p[0] == '.') {
4465 8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3157 p++;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3158 prefix++;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3159 len--;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3160 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3161
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3162 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	3163 return NGX_DECLINED;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3164 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3165
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3166 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	3167 return NGX_ERROR;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3168 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3169
7715 5c7917292b29 Proxy: changed interface of some internal functions. Ruslan Ermilov <ru@nginx.com> parents: 7714 diff changeset	3170 return ngx_http_proxy_rewrite(r, value, prefix, len, &replacement);
4465 8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3171 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3172
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3173
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3174 static ngx_int_t
7715 5c7917292b29 Proxy: changed interface of some internal functions. Ruslan Ermilov <ru@nginx.com> parents: 7714 diff changeset	3175 ngx_http_proxy_rewrite(ngx_http_request_t r, ngx_str_t value, size_t prefix,
4462 a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	3176 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	3177 {
a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	3178 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	3179 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	3180
7715 5c7917292b29 Proxy: changed interface of some internal functions. Ruslan Ermilov <ru@nginx.com> parents: 7714 diff changeset	3181 if (len == value->len) {
5c7917292b29 Proxy: changed interface of some internal functions. Ruslan Ermilov <ru@nginx.com> parents: 7714 diff changeset	3182 value = replacement;
5c7917292b29 Proxy: changed interface of some internal functions. Ruslan Ermilov <ru@nginx.com> parents: 7714 diff changeset	3183 return NGX_OK;
5c7917292b29 Proxy: changed interface of some internal functions. Ruslan Ermilov <ru@nginx.com> parents: 7714 diff changeset	3184 }
5c7917292b29 Proxy: changed interface of some internal functions. Ruslan Ermilov <ru@nginx.com> parents: 7714 diff changeset	3185
5c7917292b29 Proxy: changed interface of some internal functions. Ruslan Ermilov <ru@nginx.com> parents: 7714 diff changeset	3186 new_len = replacement->len + value->len - len;
4462 a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	3187
a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	3188 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	3189
5676 fbfdf8017748 Proxy: fixed possible uninitialized memory access. Valentin Bartenev <vbart@nginx.com> parents: 5661 diff changeset	3190 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	3191 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	3192 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	3193 }
a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	3194
7715 5c7917292b29 Proxy: changed interface of some internal functions. Ruslan Ermilov <ru@nginx.com> parents: 7714 diff changeset	3195 p = ngx_copy(data, value->data, prefix);
4462 a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	3196 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	3197
7715 5c7917292b29 Proxy: changed interface of some internal functions. Ruslan Ermilov <ru@nginx.com> parents: 7714 diff changeset	3198 ngx_memcpy(p, value->data + prefix + len,
5c7917292b29 Proxy: changed interface of some internal functions. Ruslan Ermilov <ru@nginx.com> parents: 7714 diff changeset	3199 value->len - len - prefix + 1);
5c7917292b29 Proxy: changed interface of some internal functions. Ruslan Ermilov <ru@nginx.com> parents: 7714 diff changeset	3200
5c7917292b29 Proxy: changed interface of some internal functions. Ruslan Ermilov <ru@nginx.com> parents: 7714 diff changeset	3201 value->data = data;
4462 a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	3202
a73c63bdce32 Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a Valentin Bartenev <vbart@nginx.com> parents: 4461 diff changeset	3203 } else {
7715 5c7917292b29 Proxy: changed interface of some internal functions. Ruslan Ermilov <ru@nginx.com> parents: 7714 diff changeset	3204 p = ngx_copy(value->data + prefix, replacement->data, replacement->len);
5c7917292b29 Proxy: changed interface of some internal functions. Ruslan Ermilov <ru@nginx.com> parents: 7714 diff changeset	3205
5c7917292b29 Proxy: changed interface of some internal functions. Ruslan Ermilov <ru@nginx.com> parents: 7714 diff changeset	3206 ngx_memmove(p, value->data + prefix + len,
5c7917292b29 Proxy: changed interface of some internal functions. Ruslan Ermilov <ru@nginx.com> parents: 7714 diff changeset	3207 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	3208 }
3d51ba7f347b Fixed: proxy_redirect with regex might broke Refresh header. Valentin Bartenev <vbart@nginx.com> parents: 4385 diff changeset	3209
7715 5c7917292b29 Proxy: changed interface of some internal functions. Ruslan Ermilov <ru@nginx.com> parents: 7714 diff changeset	3210 value->len = new_len;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3211
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3212 return NGX_OK;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3213 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3214
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 static ngx_int_t
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3217 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	3218 {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3219 ngx_http_variable_t var, v;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3220
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3221 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	3222 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	3223 if (var == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3224 return NGX_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3225 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3226
637 e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 629 diff changeset	3227 var->get_handler = v->get_handler;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3228 var->data = v->data;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3229 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3230
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3231 return NGX_OK;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3232 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3233
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3234
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3235 static void *
5951 610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	3236 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	3237 {
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	3238 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	3239
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	3240 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	3241 if (conf == NULL) {
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	3242 return NULL;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	3243 }
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	3244
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	3245 #if (NGX_HTTP_CACHE)
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	3246 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	3247 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	3248 != NGX_OK)
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	3249 {
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	3250 return NULL;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	3251 }
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	3252 #endif
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	3253
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	3254 return conf;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	3255 }
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	3256
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	3257
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	3258 static void *
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3259 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	3260 {
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3261 ngx_http_proxy_loc_conf_t *conf;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3262
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3263 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	3264 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	3265 return NULL;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3266 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3267
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3268 /*
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3269 * set by ngx_pcalloc():
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3270 *
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3271 * conf->upstream.bufs.num = 0;
2786 4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2784 diff changeset	3272 * conf->upstream.ignore_headers = 0;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3273 * conf->upstream.next_upstream = 0;
5949 634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	3274 * conf->upstream.cache_zone = NULL;
2875 6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2786 diff changeset	3275 * conf->upstream.cache_use_stale = 0;
6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2786 diff changeset	3276 * conf->upstream.cache_methods = 0;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3277 * conf->upstream.temp_path = NULL;
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	3278 * conf->upstream.hide_headers_hash = { NULL, 0 };
1295 5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	3279 * conf->upstream.store_lengths = NULL;
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	3280 * 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	3281 * conf->upstream.ssl_name = NULL;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3282 *
6781 ca27074f8f0f Proxy: support variables for proxy_method directive. Dmitry Lazurkin <dilaz03@gmail.com> parents: 6747 diff changeset	3283 * conf->method = NULL;
7238 06cf0c4b8618 Upstream: fixed comments after 13f8dec720b5. Ruslan Ermilov <ru@nginx.com> parents: 7220 diff changeset	3284 * conf->location = NULL;
06cf0c4b8618 Upstream: fixed comments after 13f8dec720b5. Ruslan Ermilov <ru@nginx.com> parents: 7220 diff changeset	3285 * conf->url = { 0, NULL };
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	3286 * conf->headers.lengths = NULL;
f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	3287 * conf->headers.values = NULL;
f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	3288 * 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	3289 * conf->headers_cache.lengths = NULL;
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	3290 * conf->headers_cache.values = NULL;
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	3291 * 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	3292 * conf->body_lengths = NULL;
29fa5023bd6f Proxy: renamed and rearranged fields in proxy configuration. Roman Arutyunyan <arut@nginx.com> parents: 5909 diff changeset	3293 * conf->body_values = NULL;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3294 * conf->body_source = { 0, NULL };
3470 b982f2dee8cf fix proxy_redirect name in error message Igor Sysoev <igor@sysoev.ru> parents: 3399 diff changeset	3295 * conf->redirects = NULL;
5385 7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	3296 * conf->ssl = 0;
7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	3297 * conf->ssl_protocols = 0;
5390 919d230ecdbe Proxy: added the "proxy_ssl_ciphers" directive. Piotr Sikora <piotr@cloudflare.com> parents: 5385 diff changeset	3298 * conf->ssl_ciphers = { 0, NULL };
5661 060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	3299 * conf->ssl_trusted_certificate = { 0, NULL };
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	3300 * conf->ssl_crl = { 0, NULL };
5900 20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	3301 * conf->ssl_certificate = { 0, NULL };
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	3302 * conf->ssl_certificate_key = { 0, NULL };
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3303 */
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3304
1295 5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	3305 conf->upstream.store = NGX_CONF_UNSET;
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	3306 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	3307 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	3308 conf->upstream.buffering = NGX_CONF_UNSET;
6050 a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	3309 conf->upstream.request_buffering = NGX_CONF_UNSET;
629 65bf042c0b4f nginx-0.3.36-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 627 diff changeset	3310 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	3311 conf->upstream.force_ranges = NGX_CONF_UNSET;
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 579 diff changeset	3312
5008 fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 4962 diff changeset	3313 conf->upstream.local = NGX_CONF_UNSET_PTR;
7371 8b68d50090e4 Upstream: proxy_socket_keepalive and friends. Vladimir Homutov <vl@nginx.com> parents: 7321 diff changeset	3314 conf->upstream.socket_keepalive = NGX_CONF_UNSET;
5008 fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 4962 diff changeset	3315
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3316 conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3317 conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3318 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	3319 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	3320
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3321 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	3322 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	3323 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	3324
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3325 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	3326 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	3327 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	3328
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3329 conf->upstream.pass_request_headers = NGX_CONF_UNSET;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3330 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	3331
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3332 #if (NGX_HTTP_CACHE)
5949 634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	3333 conf->upstream.cache = NGX_CONF_UNSET;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3334 conf->upstream.cache_min_uses = NGX_CONF_UNSET_UINT;
6793 0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6785 diff changeset	3335 conf->upstream.cache_max_range_offset = NGX_CONF_UNSET;
3699 b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3692 diff changeset	3336 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	3337 conf->upstream.no_cache = NGX_CONF_UNSET_PTR;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3338 conf->upstream.cache_valid = NGX_CONF_UNSET_PTR;
4385 70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4377 diff changeset	3339 conf->upstream.cache_lock = NGX_CONF_UNSET;
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4377 diff changeset	3340 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	3341 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	3342 conf->upstream.cache_revalidate = NGX_CONF_UNSET;
6290 4d5ac1a31d44 Upstream: proxy_cache_convert_head directive. Roman Arutyunyan <arut@nginx.com> parents: 6157 diff changeset	3343 conf->upstream.cache_convert_head = NGX_CONF_UNSET;
6906 1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6793 diff changeset	3344 conf->upstream.cache_background_update = NGX_CONF_UNSET;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3345 #endif
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3346
1701 40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	3347 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	3348 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	3349
657 400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	3350 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	3351
2184 274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2135 diff changeset	3352 #if (NGX_HTTP_SSL)
274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2135 diff changeset	3353 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	3354 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	3355 conf->upstream.ssl_verify = NGX_CONF_UNSET;
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	3356 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	3357 conf->ssl_passwords = NGX_CONF_UNSET_PTR;
7730 1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7728 diff changeset	3358 conf->ssl_conf_commands = NGX_CONF_UNSET_PTR;
2184 274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2135 diff changeset	3359 #endif
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3360
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3361 /* "proxy_cyclic_temp_file" is disabled */
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3362 conf->upstream.cyclic_temp_file = 0;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3363
7728 485dba3e2a01 Core: ngx_conf_set_keyval_slot() now accepts NGX_CONF_UNSET_PTR. Maxim Dounin <mdounin@mdounin.ru> parents: 7720 diff changeset	3364 conf->headers_source = NGX_CONF_UNSET_PTR;
485dba3e2a01 Core: ngx_conf_set_keyval_slot() now accepts NGX_CONF_UNSET_PTR. Maxim Dounin <mdounin@mdounin.ru> parents: 7720 diff changeset	3365
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3366 conf->redirect = NGX_CONF_UNSET;
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	3367 conf->upstream.change_buffering = 1;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3368
4465 8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3369 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	3370 conf->cookie_paths = NGX_CONF_UNSET_PTR;
7716 d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3371 conf->cookie_flags = NGX_CONF_UNSET_PTR;
4465 8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3372
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	3373 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	3374
1180 1666b7b0bafc proxy_headers_hash_max_size and proxy_headers_hash_bucket_size Igor Sysoev <igor@sysoev.ru> parents: 1125 diff changeset	3375 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	3376 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	3377
3976 215fe9223419 update r3945 with more descriptive error message Igor Sysoev <igor@sysoev.ru> parents: 3862 diff changeset	3378 ngx_str_set(&conf->upstream.module, "proxy");
215fe9223419 update r3945 with more descriptive error message Igor Sysoev <igor@sysoev.ru> parents: 3862 diff changeset	3379
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3380 return conf;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3381 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3382
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3383
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3384 static char *
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3385 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	3386 {
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3387 ngx_http_proxy_loc_conf_t *prev = parent;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3388 ngx_http_proxy_loc_conf_t *conf = child;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3389
3862 f4c49c9e4bb5 always test proxy_redirect with slash, this fixes a case when nginx uses Igor Sysoev <igor@sysoev.ru> parents: 3734 diff changeset	3390 u_char *p;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3391 size_t size;
5909 8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	3392 ngx_int_t rc;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3393 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	3394 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	3395 ngx_http_proxy_rewrite_t *pr;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3396 ngx_http_script_compile_t sc;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3397
5948 f2ff0aa89126 Upstream: mutually exclusive inheritance of "cache" and "store". Valentin Bartenev <vbart@nginx.com> parents: 5947 diff changeset	3398 #if (NGX_HTTP_CACHE)
f2ff0aa89126 Upstream: mutually exclusive inheritance of "cache" and "store". Valentin Bartenev <vbart@nginx.com> parents: 5947 diff changeset	3399
f2ff0aa89126 Upstream: mutually exclusive inheritance of "cache" and "store". Valentin Bartenev <vbart@nginx.com> parents: 5947 diff changeset	3400 if (conf->upstream.store > 0) {
5949 634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	3401 conf->upstream.cache = 0;
5948 f2ff0aa89126 Upstream: mutually exclusive inheritance of "cache" and "store". Valentin Bartenev <vbart@nginx.com> parents: 5947 diff changeset	3402 }
f2ff0aa89126 Upstream: mutually exclusive inheritance of "cache" and "store". Valentin Bartenev <vbart@nginx.com> parents: 5947 diff changeset	3403
5949 634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	3404 if (conf->upstream.cache > 0) {
5948 f2ff0aa89126 Upstream: mutually exclusive inheritance of "cache" and "store". Valentin Bartenev <vbart@nginx.com> parents: 5947 diff changeset	3405 conf->upstream.store = 0;
f2ff0aa89126 Upstream: mutually exclusive inheritance of "cache" and "store". Valentin Bartenev <vbart@nginx.com> parents: 5947 diff changeset	3406 }
f2ff0aa89126 Upstream: mutually exclusive inheritance of "cache" and "store". Valentin Bartenev <vbart@nginx.com> parents: 5947 diff changeset	3407
f2ff0aa89126 Upstream: mutually exclusive inheritance of "cache" and "store". Valentin Bartenev <vbart@nginx.com> parents: 5947 diff changeset	3408 #endif
f2ff0aa89126 Upstream: mutually exclusive inheritance of "cache" and "store". Valentin Bartenev <vbart@nginx.com> parents: 5947 diff changeset	3409
5940 e3b3b89d74e8 Upstream: fixed inheritance of proxy_store and friends. Valentin Bartenev <vbart@nginx.com> parents: 5939 diff changeset	3410 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	3411 ngx_conf_merge_value(conf->upstream.store,
2894 d26f4e80c71f style fix Igor Sysoev <igor@sysoev.ru> parents: 2875 diff changeset	3412 prev->upstream.store, 0);
1295 5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	3413
5947 d9025ea1f5a5 Upstream: simplified proxy_store and friends configuration code. Valentin Bartenev <vbart@nginx.com> parents: 5940 diff changeset	3414 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	3415 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	3416 }
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	3417
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	3418 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	3419 prev->upstream.store_access, 0600);
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1244 diff changeset	3420
5832 d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5738 diff changeset	3421 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	3422 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	3423
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 579 diff changeset	3424 ngx_conf_merge_value(conf->upstream.buffering,
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 579 diff changeset	3425 prev->upstream.buffering, 1);
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 579 diff changeset	3426
6050 a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	3427 ngx_conf_merge_value(conf->upstream.request_buffering,
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	3428 prev->upstream.request_buffering, 1);
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6043 diff changeset	3429
629 65bf042c0b4f nginx-0.3.36-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 627 diff changeset	3430 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	3431 prev->upstream.ignore_client_abort, 0);
65bf042c0b4f nginx-0.3.36-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 627 diff changeset	3432
5874 2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	3433 ngx_conf_merge_value(conf->upstream.force_ranges,
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	3434 prev->upstream.force_ranges, 0);
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	3435
5008 fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 4962 diff changeset	3436 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	3437 prev->upstream.local, NULL);
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 4962 diff changeset	3438
7371 8b68d50090e4 Upstream: proxy_socket_keepalive and friends. Vladimir Homutov <vl@nginx.com> parents: 7321 diff changeset	3439 ngx_conf_merge_value(conf->upstream.socket_keepalive,
8b68d50090e4 Upstream: proxy_socket_keepalive and friends. Vladimir Homutov <vl@nginx.com> parents: 7321 diff changeset	3440 prev->upstream.socket_keepalive, 0);
8b68d50090e4 Upstream: proxy_socket_keepalive and friends. Vladimir Homutov <vl@nginx.com> parents: 7321 diff changeset	3441
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3442 ngx_conf_merge_msec_value(conf->upstream.connect_timeout,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3443 prev->upstream.connect_timeout, 60000);
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3444
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3445 ngx_conf_merge_msec_value(conf->upstream.send_timeout,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3446 prev->upstream.send_timeout, 60000);
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3447
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3448 ngx_conf_merge_msec_value(conf->upstream.read_timeout,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3449 prev->upstream.read_timeout, 60000);
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3450
5832 d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5738 diff changeset	3451 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	3452 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	3453
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3454 ngx_conf_merge_size_value(conf->upstream.send_lowat,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3455 prev->upstream.send_lowat, 0);
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3456
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 579 diff changeset	3457 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	3458 prev->upstream.buffer_size,
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3459 (size_t) ngx_pagesize);
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3460
5883 973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5874 diff changeset	3461 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	3462 prev->upstream.limit_rate, 0);
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5874 diff changeset	3463
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3464 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	3465 8, ngx_pagesize);
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3466
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3467 if (conf->upstream.bufs.num < 2) {
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3468 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	3469 "there must be at least 2 \"proxy_buffers\"");
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3470 return NGX_CONF_ERROR;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3471 }
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3472
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3473
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 579 diff changeset	3474 size = conf->upstream.buffer_size;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3475 if (size < conf->upstream.bufs.size) {
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3476 size = conf->upstream.bufs.size;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3477 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3478
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3479
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3480 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	3481 prev->upstream.busy_buffers_size_conf,
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3482 NGX_CONF_UNSET_SIZE);
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3483
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3484 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	3485 conf->upstream.busy_buffers_size = 2 * size;
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3486 } else {
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3487 conf->upstream.busy_buffers_size =
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3488 conf->upstream.busy_buffers_size_conf;
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3489 }
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3490
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3491 if (conf->upstream.busy_buffers_size < size) {
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3492 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	3493 "\"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	3494 "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	3495 "one of the \"proxy_buffers\"");
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3496
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3497 return NGX_CONF_ERROR;
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3498 }
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3499
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3500 if (conf->upstream.busy_buffers_size
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3501 > (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	3502 {
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3503 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3504 "\"proxy_busy_buffers_size\" must be less than "
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3505 "the size of all \"proxy_buffers\" minus one buffer");
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3506
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3507 return NGX_CONF_ERROR;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3508 }
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3509
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3510
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3511 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	3512 prev->upstream.temp_file_write_size_conf,
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3513 NGX_CONF_UNSET_SIZE);
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3514
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3515 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	3516 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	3517 } else {
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3518 conf->upstream.temp_file_write_size =
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3519 conf->upstream.temp_file_write_size_conf;
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3520 }
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3521
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3522 if (conf->upstream.temp_file_write_size < size) {
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3523 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	3524 "\"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	3525 "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	3526 "one of the \"proxy_buffers\"");
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3527
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3528 return NGX_CONF_ERROR;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3529 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3530
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3531 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	3532 prev->upstream.max_temp_file_size_conf,
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3533 NGX_CONF_UNSET_SIZE);
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3534
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3535 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	3536 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	3537 } else {
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3538 conf->upstream.max_temp_file_size =
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3539 conf->upstream.max_temp_file_size_conf;
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3540 }
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3541
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3542 if (conf->upstream.max_temp_file_size != 0
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3543 && conf->upstream.max_temp_file_size < size)
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3544 {
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3545 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	3546 "\"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	3547 "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	3548 "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	3549 "one of the \"proxy_buffers\"");
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3550
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3551 return NGX_CONF_ERROR;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3552 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3553
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	3554
2786 4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2784 diff changeset	3555 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	3556 prev->upstream.ignore_headers,
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2784 diff changeset	3557 NGX_CONF_BITMASK_SET);
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2784 diff changeset	3558
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2784 diff changeset	3559
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3560 ngx_conf_merge_bitmask_value(conf->upstream.next_upstream,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3561 prev->upstream.next_upstream,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3562 (NGX_CONF_BITMASK_SET
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3563 \|NGX_HTTP_UPSTREAM_FT_ERROR
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3564 \|NGX_HTTP_UPSTREAM_FT_TIMEOUT));
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3565
665 5fd7a5e99047 nginx-0.3.54-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	3566 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	3567 conf->upstream.next_upstream = NGX_CONF_BITMASK_SET
5fd7a5e99047 nginx-0.3.54-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	3568 \|NGX_HTTP_UPSTREAM_FT_OFF;
5fd7a5e99047 nginx-0.3.54-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	3569 }
5fd7a5e99047 nginx-0.3.54-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	3570
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3571 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	3572 prev->upstream.temp_path,
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3573 &ngx_http_proxy_temp_path)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3574 != NGX_OK)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3575 {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3576 return NGX_CONF_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3577 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3578
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3579
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3580 #if (NGX_HTTP_CACHE)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3581
5949 634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	3582 if (conf->upstream.cache == NGX_CONF_UNSET) {
634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	3583 ngx_conf_merge_value(conf->upstream.cache,
634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	3584 prev->upstream.cache, 0);
634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	3585
634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	3586 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	3587 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	3588 }
634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	3589
634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	3590 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	3591 ngx_shm_zone_t *shm_zone;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3592
5949 634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	3593 shm_zone = conf->upstream.cache_zone;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3594
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3595 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3596 "\"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	3597 &shm_zone->shm.name);
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3598
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3599 return NGX_CONF_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3600 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3601
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3602 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	3603 prev->upstream.cache_min_uses, 1);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3604
6793 0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6785 diff changeset	3605 ngx_conf_merge_off_value(conf->upstream.cache_max_range_offset,
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6785 diff changeset	3606 prev->upstream.cache_max_range_offset,
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6785 diff changeset	3607 NGX_MAX_OFF_T_VALUE);
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6785 diff changeset	3608
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3609 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	3610 prev->upstream.cache_use_stale,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3611 (NGX_CONF_BITMASK_SET
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3612 \|NGX_HTTP_UPSTREAM_FT_OFF));
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3613
4401 d45742815c90 Fixed proxy_cache_use_stale in "no live upstreams" case. Maxim Dounin <mdounin@mdounin.ru> parents: 4400 diff changeset	3614 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	3615 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	3616 \|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	3617 }
d45742815c90 Fixed proxy_cache_use_stale in "no live upstreams" case. Maxim Dounin <mdounin@mdounin.ru> parents: 4400 diff changeset	3618
d45742815c90 Fixed proxy_cache_use_stale in "no live upstreams" case. Maxim Dounin <mdounin@mdounin.ru> parents: 4400 diff changeset	3619 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	3620 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	3621 }
d45742815c90 Fixed proxy_cache_use_stale in "no live upstreams" case. Maxim Dounin <mdounin@mdounin.ru> parents: 4400 diff changeset	3622
2875 6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2786 diff changeset	3623 if (conf->upstream.cache_methods == 0) {
6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2786 diff changeset	3624 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	3625 }
6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2786 diff changeset	3626
6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2786 diff changeset	3627 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	3628
3699 b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3692 diff changeset	3629 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	3630 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	3631
3526 62a4fd1e6e2c proxy_no_cache and fastcgi_no_cache Igor Sysoev <igor@sysoev.ru> parents: 3523 diff changeset	3632 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	3633 prev->upstream.no_cache, NULL);
62a4fd1e6e2c proxy_no_cache and fastcgi_no_cache Igor Sysoev <igor@sysoev.ru> parents: 3523 diff changeset	3634
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3635 ngx_conf_merge_ptr_value(conf->upstream.cache_valid,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3636 prev->upstream.cache_valid, NULL);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3637
2672 b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	3638 if (conf->cache_key.value.data == NULL) {
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	3639 conf->cache_key = prev->cache_key;
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	3640 }
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	3641
4385 70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4377 diff changeset	3642 ngx_conf_merge_value(conf->upstream.cache_lock,
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4377 diff changeset	3643 prev->upstream.cache_lock, 0);
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4377 diff changeset	3644
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4377 diff changeset	3645 ngx_conf_merge_msec_value(conf->upstream.cache_lock_timeout,
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4377 diff changeset	3646 prev->upstream.cache_lock_timeout, 5000);
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4377 diff changeset	3647
5905 2f7e557eab5b Cache: proxy_cache_lock_age and friends. Roman Arutyunyan <arut@nginx.com> parents: 5900 diff changeset	3648 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	3649 prev->upstream.cache_lock_age, 5000);
2f7e557eab5b Cache: proxy_cache_lock_age and friends. Roman Arutyunyan <arut@nginx.com> parents: 5900 diff changeset	3650
5441 43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5391 diff changeset	3651 ngx_conf_merge_value(conf->upstream.cache_revalidate,
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5391 diff changeset	3652 prev->upstream.cache_revalidate, 0);
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5391 diff changeset	3653
6290 4d5ac1a31d44 Upstream: proxy_cache_convert_head directive. Roman Arutyunyan <arut@nginx.com> parents: 6157 diff changeset	3654 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	3655 prev->upstream.cache_convert_head, 1);
4d5ac1a31d44 Upstream: proxy_cache_convert_head directive. Roman Arutyunyan <arut@nginx.com> parents: 6157 diff changeset	3656
6906 1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6793 diff changeset	3657 ngx_conf_merge_value(conf->upstream.cache_background_update,
1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6793 diff changeset	3658 prev->upstream.cache_background_update, 0);
1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6793 diff changeset	3659
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3660 #endif
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3661
6781 ca27074f8f0f Proxy: support variables for proxy_method directive. Dmitry Lazurkin <dilaz03@gmail.com> parents: 6747 diff changeset	3662 if (conf->method == NULL) {
ca27074f8f0f Proxy: support variables for proxy_method directive. Dmitry Lazurkin <dilaz03@gmail.com> parents: 6747 diff changeset	3663 conf->method = prev->method;
ca27074f8f0f Proxy: support variables for proxy_method directive. Dmitry Lazurkin <dilaz03@gmail.com> parents: 6747 diff changeset	3664 }
5012 bbdb172f0927 Proxy: fixed proxy_method to always add space. Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3665
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3666 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	3667 prev->upstream.pass_request_headers, 1);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3668 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	3669 prev->upstream.pass_request_body, 1);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3670
657 400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	3671 ngx_conf_merge_value(conf->upstream.intercept_errors,
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	3672 prev->upstream.intercept_errors, 0);
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3673
2184 274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2135 diff changeset	3674 #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	3675
2184 274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2135 diff changeset	3676 ngx_conf_merge_value(conf->upstream.ssl_session_reuse,
274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2135 diff changeset	3677 prev->upstream.ssl_session_reuse, 1);
5385 7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	3678
7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	3679 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	3680 (NGX_CONF_BITMASK_SET\|NGX_SSL_TLSv1
b2899e7d0ef8 Disabled SSLv3 by default (ticket #653). Maxim Dounin <mdounin@mdounin.ru> parents: 6056 diff changeset	3681 \|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	3682
5390 919d230ecdbe Proxy: added the "proxy_ssl_ciphers" directive. Piotr Sikora <piotr@cloudflare.com> parents: 5385 diff changeset	3683 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	3684 "DEFAULT");
919d230ecdbe Proxy: added the "proxy_ssl_ciphers" directive. Piotr Sikora <piotr@cloudflare.com> parents: 5385 diff changeset	3685
5660 7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	3686 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	3687 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	3688 }
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	3689
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	3690 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	3691 prev->upstream.ssl_server_name, 0);
5661 060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	3692 ngx_conf_merge_value(conf->upstream.ssl_verify,
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	3693 prev->upstream.ssl_verify, 0);
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	3694 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	3695 prev->ssl_verify_depth, 1);
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	3696 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	3697 prev->ssl_trusted_certificate, "");
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	3698 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	3699
5900 20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	3700 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	3701 prev->ssl_certificate, "");
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	3702 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	3703 prev->ssl_certificate_key, "");
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	3704 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	3705
7730 1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7728 diff changeset	3706 ngx_conf_merge_ptr_value(conf->ssl_conf_commands,
1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7728 diff changeset	3707 prev->ssl_conf_commands, NULL);
1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7728 diff changeset	3708
5385 7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	3709 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	3710 return NGX_CONF_ERROR;
7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	3711 }
5660 7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	3712
2184 274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2135 diff changeset	3713 #endif
274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2135 diff changeset	3714
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3715 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	3716
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3717 if (conf->redirect) {
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3718
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3719 if (conf->redirects == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3720 conf->redirects = prev->redirects;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3721 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3722
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3723 if (conf->redirects == NULL && conf->url.data) {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3724
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3725 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	3726 sizeof(ngx_http_proxy_rewrite_t));
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3727 if (conf->redirects == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3728 return NGX_CONF_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3729 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3730
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3731 pr = ngx_array_push(conf->redirects);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3732 if (pr == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3733 return NGX_CONF_ERROR;
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
4461 103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	3736 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	3737 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	3738
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3739 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	3740
4461 103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	3741 pr->handler = ngx_http_proxy_rewrite_complex_handler;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3742
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3743 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	3744 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	3745 pr->replacement.value = conf->location;
653 7cbef16c71a1 nginx-0.3.48-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 651 diff changeset	3746
7cbef16c71a1 nginx-0.3.48-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 651 diff changeset	3747 } else {
4461 103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	3748 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	3749 + sizeof("/") - 1;
103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	3750
103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	3751 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	3752 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	3753 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	3754 }
f4c49c9e4bb5 always test proxy_redirect with slash, this fixes a case when nginx uses Igor Sysoev <igor@sysoev.ru> parents: 3734 diff changeset	3755
4461 103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	3756 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	3757
f4c49c9e4bb5 always test proxy_redirect with slash, this fixes a case when nginx uses Igor Sysoev <igor@sysoev.ru> parents: 3734 diff changeset	3758 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	3759 *p = '/';
f4c49c9e4bb5 always test proxy_redirect with slash, this fixes a case when nginx uses Igor Sysoev <igor@sysoev.ru> parents: 3734 diff changeset	3760
4336 99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	3761 ngx_str_set(&pr->replacement.value, "/");
653 7cbef16c71a1 nginx-0.3.48-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 651 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
4465 8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	3766 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	3767
4466 b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	3768 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	3769
7716 d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3770 ngx_conf_merge_ptr_value(conf->cookie_flags, prev->cookie_flags, NULL);
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	3771
4126 bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	3772 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	3773 NGX_HTTP_VERSION_10);
bba9a5ccc6cd Proxy: basic HTTP/1.1 support (including keepalive). Maxim Dounin <mdounin@mdounin.ru> parents: 4125 diff changeset	3774
1180 1666b7b0bafc proxy_headers_hash_max_size and proxy_headers_hash_bucket_size Igor Sysoev <igor@sysoev.ru> parents: 1125 diff changeset	3775 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	3776 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	3777
1666b7b0bafc proxy_headers_hash_max_size and proxy_headers_hash_bucket_size Igor Sysoev <igor@sysoev.ru> parents: 1125 diff changeset	3778 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	3779 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	3780
1666b7b0bafc proxy_headers_hash_max_size and proxy_headers_hash_bucket_size Igor Sysoev <igor@sysoev.ru> parents: 1125 diff changeset	3781 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	3782 ngx_cacheline_size);
1666b7b0bafc proxy_headers_hash_max_size and proxy_headers_hash_bucket_size Igor Sysoev <igor@sysoev.ru> parents: 1125 diff changeset	3783
1701 40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	3784 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	3785 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	3786 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	3787
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	3788 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	3789 &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	3790 != NGX_OK)
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	3791 {
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	3792 return NGX_CONF_ERROR;
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	3793 }
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	3794
5938 cd2abf7e7740 Upstream: fixed unexpected inheritance into limit_except blocks. Maxim Dounin <mdounin@mdounin.ru> parents: 5937 diff changeset	3795 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	3796
cd2abf7e7740 Upstream: fixed unexpected inheritance into limit_except blocks. Maxim Dounin <mdounin@mdounin.ru> parents: 5937 diff changeset	3797 if (clcf->noname
cd2abf7e7740 Upstream: fixed unexpected inheritance into limit_except blocks. Maxim Dounin <mdounin@mdounin.ru> parents: 5937 diff changeset	3798 && 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	3799 {
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 843 diff changeset	3800 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	3801 conf->location = prev->location;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	3802 conf->vars = prev->vars;
5937 5b9f711dc819 Upstream: inheritance of proxy_pass and friends (ticket #645). Maxim Dounin <mdounin@mdounin.ru> parents: 5936 diff changeset	3803
3734 e3a6785b5be4 ) make code consistent to fastcgi, etc Igor Sysoev <igor@sysoev.ru>* parents: 3733 diff changeset	3804 conf->proxy_lengths = prev->proxy_lengths;
e3a6785b5be4 ) make code consistent to fastcgi, etc Igor Sysoev <igor@sysoev.ru>* parents: 3733 diff changeset	3805 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	3806
5b9f711dc819 Upstream: inheritance of proxy_pass and friends (ticket #645). Maxim Dounin <mdounin@mdounin.ru> parents: 5936 diff changeset	3807 #if (NGX_HTTP_SSL)
5b9f711dc819 Upstream: inheritance of proxy_pass and friends (ticket #645). Maxim Dounin <mdounin@mdounin.ru> parents: 5936 diff changeset	3808 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	3809 #endif
3734 e3a6785b5be4 ) make code consistent to fastcgi, etc Igor Sysoev <igor@sysoev.ru>* parents: 3733 diff changeset	3810 }
e3a6785b5be4 ) make code consistent to fastcgi, etc Igor Sysoev <igor@sysoev.ru>* parents: 3733 diff changeset	3811
5938 cd2abf7e7740 Upstream: fixed unexpected inheritance into limit_except blocks. Maxim Dounin <mdounin@mdounin.ru> parents: 5937 diff changeset	3812 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	3813 && (conf->upstream.upstream \|\| conf->proxy_lengths))
cd2abf7e7740 Upstream: fixed unexpected inheritance into limit_except blocks. Maxim Dounin <mdounin@mdounin.ru> parents: 5937 diff changeset	3814 {
cd2abf7e7740 Upstream: fixed unexpected inheritance into limit_except blocks. Maxim Dounin <mdounin@mdounin.ru> parents: 5937 diff changeset	3815 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	3816 }
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3817
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3818 if (conf->body_source.data == NULL) {
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	3819 conf->body_flushes = prev->body_flushes;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3820 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	3821 conf->body_lengths = prev->body_lengths;
29fa5023bd6f Proxy: renamed and rearranged fields in proxy configuration. Roman Arutyunyan <arut@nginx.com> parents: 5909 diff changeset	3822 conf->body_values = prev->body_values;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3823 }
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3824
5910 29fa5023bd6f Proxy: renamed and rearranged fields in proxy configuration. Roman Arutyunyan <arut@nginx.com> parents: 5909 diff changeset	3825 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	3826
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3827 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	3828
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3829 sc.cf = cf;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3830 sc.source = &conf->body_source;
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	3831 sc.flushes = &conf->body_flushes;
5910 29fa5023bd6f Proxy: renamed and rearranged fields in proxy configuration. Roman Arutyunyan <arut@nginx.com> parents: 5909 diff changeset	3832 sc.lengths = &conf->body_lengths;
29fa5023bd6f Proxy: renamed and rearranged fields in proxy configuration. Roman Arutyunyan <arut@nginx.com> parents: 5909 diff changeset	3833 sc.values = &conf->body_values;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3834 sc.complete_lengths = 1;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3835 sc.complete_values = 1;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3836
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3837 if (ngx_http_script_compile(&sc) != NGX_OK) {
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3838 return NGX_CONF_ERROR;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3839 }
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3840 }
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3841
7728 485dba3e2a01 Core: ngx_conf_set_keyval_slot() now accepts NGX_CONF_UNSET_PTR. Maxim Dounin <mdounin@mdounin.ru> parents: 7720 diff changeset	3842 ngx_conf_merge_ptr_value(conf->headers_source, prev->headers_source, NULL);
485dba3e2a01 Core: ngx_conf_set_keyval_slot() now accepts NGX_CONF_UNSET_PTR. Maxim Dounin <mdounin@mdounin.ru> parents: 7720 diff changeset	3843
485dba3e2a01 Core: ngx_conf_set_keyval_slot() now accepts NGX_CONF_UNSET_PTR. Maxim Dounin <mdounin@mdounin.ru> parents: 7720 diff changeset	3844 if (conf->headers_source == prev->headers_source) {
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	3845 conf->headers = prev->headers;
5909 8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	3846 #if (NGX_HTTP_CACHE)
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	3847 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	3848 #endif
5907 195561ef367f Upstream: moved header initializations to separate functions. Roman Arutyunyan <arut@nginx.com> parents: 5905 diff changeset	3849 }
195561ef367f Upstream: moved header initializations to separate functions. Roman Arutyunyan <arut@nginx.com> parents: 5905 diff changeset	3850
5909 8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	3851 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	3852 ngx_http_proxy_headers);
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	3853 if (rc != NGX_OK) {
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	3854 return NGX_CONF_ERROR;
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	3855 }
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	3856
5907 195561ef367f Upstream: moved header initializations to separate functions. Roman Arutyunyan <arut@nginx.com> parents: 5905 diff changeset	3857 #if (NGX_HTTP_CACHE)
5909 8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	3858
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	3859 if (conf->upstream.cache) {
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	3860 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	3861 ngx_http_proxy_cache_headers);
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	3862 if (rc != NGX_OK) {
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	3863 return NGX_CONF_ERROR;
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	3864 }
5907 195561ef367f Upstream: moved header initializations to separate functions. Roman Arutyunyan <arut@nginx.com> parents: 5905 diff changeset	3865 }
5909 8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	3866
5907 195561ef367f Upstream: moved header initializations to separate functions. Roman Arutyunyan <arut@nginx.com> parents: 5905 diff changeset	3867 #endif
195561ef367f Upstream: moved header initializations to separate functions. Roman Arutyunyan <arut@nginx.com> parents: 5905 diff changeset	3868
6747 20eb4587225b Upstream: handling of proxy_set_header at http level. Maxim Dounin <mdounin@mdounin.ru> parents: 6746 diff changeset	3869 /*
20eb4587225b Upstream: handling of proxy_set_header at http level. Maxim Dounin <mdounin@mdounin.ru> parents: 6746 diff changeset	3870 * special handling to preserve conf->headers in the "http" section
20eb4587225b Upstream: handling of proxy_set_header at http level. Maxim Dounin <mdounin@mdounin.ru> parents: 6746 diff changeset	3871 * to inherit it to all servers
20eb4587225b Upstream: handling of proxy_set_header at http level. Maxim Dounin <mdounin@mdounin.ru> parents: 6746 diff changeset	3872 */
20eb4587225b Upstream: handling of proxy_set_header at http level. Maxim Dounin <mdounin@mdounin.ru> parents: 6746 diff changeset	3873
20eb4587225b Upstream: handling of proxy_set_header at http level. Maxim Dounin <mdounin@mdounin.ru> parents: 6746 diff changeset	3874 if (prev->headers.hash.buckets == NULL
20eb4587225b Upstream: handling of proxy_set_header at http level. Maxim Dounin <mdounin@mdounin.ru> parents: 6746 diff changeset	3875 && conf->headers_source == prev->headers_source)
20eb4587225b Upstream: handling of proxy_set_header at http level. Maxim Dounin <mdounin@mdounin.ru> parents: 6746 diff changeset	3876 {
20eb4587225b Upstream: handling of proxy_set_header at http level. Maxim Dounin <mdounin@mdounin.ru> parents: 6746 diff changeset	3877 prev->headers = conf->headers;
20eb4587225b Upstream: handling of proxy_set_header at http level. Maxim Dounin <mdounin@mdounin.ru> parents: 6746 diff changeset	3878 #if (NGX_HTTP_CACHE)
20eb4587225b Upstream: handling of proxy_set_header at http level. Maxim Dounin <mdounin@mdounin.ru> parents: 6746 diff changeset	3879 prev->headers_cache = conf->headers_cache;
20eb4587225b Upstream: handling of proxy_set_header at http level. Maxim Dounin <mdounin@mdounin.ru> parents: 6746 diff changeset	3880 #endif
20eb4587225b Upstream: handling of proxy_set_header at http level. Maxim Dounin <mdounin@mdounin.ru> parents: 6746 diff changeset	3881 }
20eb4587225b Upstream: handling of proxy_set_header at http level. Maxim Dounin <mdounin@mdounin.ru> parents: 6746 diff changeset	3882
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3883 return NGX_CONF_OK;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3884 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3885
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3886
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3887 static ngx_int_t
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	3888 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	3889 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	3890 {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3891 u_char *p;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3892 size_t size;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3893 uintptr_t *code;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3894 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	3895 ngx_array_t headers_names, headers_merged;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3896 ngx_keyval_t src, s, *h;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3897 ngx_hash_key_t *hk;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3898 ngx_hash_init_t hash;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3899 ngx_http_script_compile_t sc;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3900 ngx_http_script_copy_code_t *copy;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3901
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	3902 if (headers->hash.buckets) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3903 return NGX_OK;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3904 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3905
3561 20708cffd6dc use local headers_names array instead of stored in configuration Igor Sysoev <igor@sysoev.ru> parents: 3526 diff changeset	3906 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	3907 != NGX_OK)
20708cffd6dc use local headers_names array instead of stored in configuration Igor Sysoev <igor@sysoev.ru> parents: 3526 diff changeset	3908 {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3909 return NGX_ERROR;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3910 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3911
4274 595560d9dcbf Fixed proxy_set_header inheritance with proxy_cache (ticket #45). Maxim Dounin <mdounin@mdounin.ru> parents: 4205 diff changeset	3912 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	3913 != NGX_OK)
595560d9dcbf Fixed proxy_set_header inheritance with proxy_cache (ticket #45). Maxim Dounin <mdounin@mdounin.ru> parents: 4205 diff changeset	3914 {
595560d9dcbf Fixed proxy_set_header inheritance with proxy_cache (ticket #45). Maxim Dounin <mdounin@mdounin.ru> parents: 4205 diff changeset	3915 return NGX_ERROR;
595560d9dcbf Fixed proxy_set_header inheritance with proxy_cache (ticket #45). Maxim Dounin <mdounin@mdounin.ru> parents: 4205 diff changeset	3916 }
595560d9dcbf Fixed proxy_set_header inheritance with proxy_cache (ticket #45). Maxim Dounin <mdounin@mdounin.ru> parents: 4205 diff changeset	3917
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	3918 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	3919 if (headers->lengths == NULL) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3920 return NGX_ERROR;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3921 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3922
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	3923 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	3924 if (headers->values == NULL) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3925 return NGX_ERROR;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3926 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3927
6746 63991ab67b3a Proxy: do not create conf->headers_source when not needed. Maxim Dounin <mdounin@mdounin.ru> parents: 6591 diff changeset	3928 if (conf->headers_source) {
63991ab67b3a Proxy: do not create conf->headers_source when not needed. Maxim Dounin <mdounin@mdounin.ru> parents: 6591 diff changeset	3929
63991ab67b3a Proxy: do not create conf->headers_source when not needed. Maxim Dounin <mdounin@mdounin.ru> parents: 6591 diff changeset	3930 src = conf->headers_source->elts;
63991ab67b3a Proxy: do not create conf->headers_source when not needed. Maxim Dounin <mdounin@mdounin.ru> parents: 6591 diff changeset	3931 for (i = 0; i < conf->headers_source->nelts; i++) {
63991ab67b3a Proxy: do not create conf->headers_source when not needed. Maxim Dounin <mdounin@mdounin.ru> parents: 6591 diff changeset	3932
63991ab67b3a Proxy: do not create conf->headers_source when not needed. Maxim Dounin <mdounin@mdounin.ru> parents: 6591 diff changeset	3933 s = ngx_array_push(&headers_merged);
63991ab67b3a Proxy: do not create conf->headers_source when not needed. Maxim Dounin <mdounin@mdounin.ru> parents: 6591 diff changeset	3934 if (s == NULL) {
63991ab67b3a Proxy: do not create conf->headers_source when not needed. Maxim Dounin <mdounin@mdounin.ru> parents: 6591 diff changeset	3935 return NGX_ERROR;
63991ab67b3a Proxy: do not create conf->headers_source when not needed. Maxim Dounin <mdounin@mdounin.ru> parents: 6591 diff changeset	3936 }
63991ab67b3a Proxy: do not create conf->headers_source when not needed. Maxim Dounin <mdounin@mdounin.ru> parents: 6591 diff changeset	3937
63991ab67b3a Proxy: do not create conf->headers_source when not needed. Maxim Dounin <mdounin@mdounin.ru> parents: 6591 diff changeset	3938 *s = src[i];
4274 595560d9dcbf Fixed proxy_set_header inheritance with proxy_cache (ticket #45). Maxim Dounin <mdounin@mdounin.ru> parents: 4205 diff changeset	3939 }
595560d9dcbf Fixed proxy_set_header inheritance with proxy_cache (ticket #45). Maxim Dounin <mdounin@mdounin.ru> parents: 4205 diff changeset	3940 }
595560d9dcbf Fixed proxy_set_header inheritance with proxy_cache (ticket #45). Maxim Dounin <mdounin@mdounin.ru> parents: 4205 diff changeset	3941
5909 8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	3942 h = default_headers;
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	3943
2705 d040c3786239 do not pass if-... headers for cacheable responses Igor Sysoev <igor@sysoev.ru> parents: 2672 diff changeset	3944 while (h->key.len) {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3945
4274 595560d9dcbf Fixed proxy_set_header inheritance with proxy_cache (ticket #45). Maxim Dounin <mdounin@mdounin.ru> parents: 4205 diff changeset	3946 src = headers_merged.elts;
595560d9dcbf Fixed proxy_set_header inheritance with proxy_cache (ticket #45). Maxim Dounin <mdounin@mdounin.ru> parents: 4205 diff changeset	3947 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	3948 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	3949 goto next;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3950 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3951 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3952
4274 595560d9dcbf Fixed proxy_set_header inheritance with proxy_cache (ticket #45). Maxim Dounin <mdounin@mdounin.ru> parents: 4205 diff changeset	3953 s = ngx_array_push(&headers_merged);
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3954 if (s == NULL) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3955 return NGX_ERROR;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3956 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3957
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3958 s = h;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3959
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3960 next:
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3961
2705 d040c3786239 do not pass if-... headers for cacheable responses Igor Sysoev <igor@sysoev.ru> parents: 2672 diff changeset	3962 h++;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3963 }
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3964
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3965
4274 595560d9dcbf Fixed proxy_set_header inheritance with proxy_cache (ticket #45). Maxim Dounin <mdounin@mdounin.ru> parents: 4205 diff changeset	3966 src = headers_merged.elts;
595560d9dcbf Fixed proxy_set_header inheritance with proxy_cache (ticket #45). Maxim Dounin <mdounin@mdounin.ru> parents: 4205 diff changeset	3967 for (i = 0; i < headers_merged.nelts; i++) {
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3968
3561 20708cffd6dc use local headers_names array instead of stored in configuration Igor Sysoev <igor@sysoev.ru> parents: 3526 diff changeset	3969 hk = ngx_array_push(&headers_names);
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	3970 if (hk == NULL) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	3971 return NGX_ERROR;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3972 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3973
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	3974 hk->key = src[i].key;
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	3975 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	3976 hk->value = (void *) 1;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3977
519 12234c998d83 nginx-0.1.34-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 517 diff changeset	3978 if (src[i].value.len == 0) {
12234c998d83 nginx-0.1.34-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 517 diff changeset	3979 continue;
12234c998d83 nginx-0.1.34-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 517 diff changeset	3980 }
12234c998d83 nginx-0.1.34-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 517 diff changeset	3981
7047 3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	3982 copy = ngx_array_push_n(headers->lengths,
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	3983 sizeof(ngx_http_script_copy_code_t));
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	3984 if (copy == NULL) {
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	3985 return NGX_ERROR;
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	3986 }
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	3987
7271 9e25a5380a21 Silenced -Wcast-function-type warnings (closes #1546). Sergey Kandaurov <pluknet@nginx.com> parents: 7238 diff changeset	3988 copy->code = (ngx_http_script_code_pt) (void *)
9e25a5380a21 Silenced -Wcast-function-type warnings (closes #1546). Sergey Kandaurov <pluknet@nginx.com> parents: 7238 diff changeset	3989 ngx_http_script_copy_len_code;
7047 3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	3990 copy->len = src[i].key.len;
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	3991
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	3992 size = (sizeof(ngx_http_script_copy_code_t)
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	3993 + src[i].key.len + sizeof(uintptr_t) - 1)
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	3994 & ~(sizeof(uintptr_t) - 1);
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	3995
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	3996 copy = ngx_array_push_n(headers->values, size);
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	3997 if (copy == NULL) {
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	3998 return NGX_ERROR;
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	3999 }
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	4000
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	4001 copy->code = ngx_http_script_copy_code;
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	4002 copy->len = src[i].key.len;
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	4003
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	4004 p = (u_char *) copy + sizeof(ngx_http_script_copy_code_t);
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	4005 ngx_memcpy(p, src[i].key.data, src[i].key.len);
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	4006
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	4007 ngx_memzero(&sc, sizeof(ngx_http_script_compile_t));
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	4008
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	4009 sc.cf = cf;
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	4010 sc.source = &src[i].value;
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	4011 sc.flushes = &headers->flushes;
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	4012 sc.lengths = &headers->lengths;
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	4013 sc.values = &headers->values;
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	4014
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	4015 if (ngx_http_script_compile(&sc) != NGX_OK) {
3fef8c5caa75 Proxy: split configured header names and values. Piotr Sikora <piotrsikora@google.com> parents: 7001 diff changeset	4016 return NGX_ERROR;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4017 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4018
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	4019 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	4020 if (code == NULL) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4021 return NGX_ERROR;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4022 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4023
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4024 *code = (uintptr_t) NULL;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4025
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	4026 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	4027 if (code == NULL) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4028 return NGX_ERROR;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4029 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4030
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4031 *code = (uintptr_t) NULL;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4032 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4033
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	4034 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	4035 if (code == NULL) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4036 return NGX_ERROR;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4037 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4038
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4039 *code = (uintptr_t) NULL;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4040
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4041
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	4042 hash.hash = &headers->hash;
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	4043 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	4044 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	4045 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	4046 hash.name = "proxy_headers_hash";
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	4047 hash.pool = cf->pool;
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	4048 hash.temp_pool = NULL;
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	4049
3561 20708cffd6dc use local headers_names array instead of stored in configuration Igor Sysoev <igor@sysoev.ru> parents: 3526 diff changeset	4050 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	4051 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4052
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4053
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4054 static char *
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4055 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	4056 {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4057 ngx_http_proxy_loc_conf_t *plcf = conf;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4058
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4059 size_t add;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4060 u_short port;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4061 ngx_str_t value, url;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4062 ngx_url_t u;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4063 ngx_uint_t n;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4064 ngx_http_core_loc_conf_t *clcf;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4065 ngx_http_script_compile_t sc;
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4066
2391 d88e757cc7d8 delete surplus upstream.schema field Igor Sysoev <igor@sysoev.ru> parents: 2285 diff changeset	4067 if (plcf->upstream.upstream \|\| plcf->proxy_lengths) {
555 7bd37aef1e7e nginx-0.2.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 551 diff changeset	4068 return "is duplicate";
7bd37aef1e7e nginx-0.2.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 551 diff changeset	4069 }
7bd37aef1e7e nginx-0.2.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 551 diff changeset	4070
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4071 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	4072
2989 dff9764eaca2 do auto redirect for proxy_pass/fastcgi_pass with variables Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	4073 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	4074
7321 45e513c3540d Fixed invalid access to location defined as an empty string. Ruslan Ermilov <ru@nginx.com> parents: 7320 diff changeset	4075 if (clcf->name.len && clcf->name.data[clcf->name.len - 1] == '/') {
2989 dff9764eaca2 do auto redirect for proxy_pass/fastcgi_pass with variables Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	4076 clcf->auto_redirect = 1;
dff9764eaca2 do auto redirect for proxy_pass/fastcgi_pass with variables Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	4077 }
dff9764eaca2 do auto redirect for proxy_pass/fastcgi_pass with variables Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	4078
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4079 value = cf->args->elts;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4080
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4081 url = &value[1];
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4082
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4083 n = ngx_http_script_variables_count(url);
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4084
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4085 if (n) {
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4086
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4087 ngx_memzero(&sc, sizeof(ngx_http_script_compile_t));
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4088
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4089 sc.cf = cf;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4090 sc.source = url;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4091 sc.lengths = &plcf->proxy_lengths;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4092 sc.values = &plcf->proxy_values;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4093 sc.variables = n;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4094 sc.complete_lengths = 1;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4095 sc.complete_values = 1;
1679 ca317d9b5c09 style fix: remove trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 1671 diff changeset	4096
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4097 if (ngx_http_script_compile(&sc) != NGX_OK) {
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4098 return NGX_CONF_ERROR;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4099 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4100
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4101 #if (NGX_HTTP_SSL)
5385 7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	4102 plcf->ssl = 1;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4103 #endif
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4104
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4105 return NGX_CONF_OK;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4106 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4107
1107 db7c468c447d ngx_strcasecmp()/ngx_strncasecmp() Igor Sysoev <igor@sysoev.ru> parents: 969 diff changeset	4108 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	4109 add = 7;
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	4110 port = 80;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	4111
1107 db7c468c447d ngx_strcasecmp()/ngx_strncasecmp() Igor Sysoev <igor@sysoev.ru> parents: 969 diff changeset	4112 } 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	4113
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	4114 #if (NGX_HTTP_SSL)
5385 7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	4115 plcf->ssl = 1;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	4116
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	4117 add = 8;
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	4118 port = 443;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	4119 #else
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	4120 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	4121 "https protocol requires SSL support");
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	4122 return NGX_CONF_ERROR;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	4123 #endif
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	4124
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	4125 } else {
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4126 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	4127 return NGX_CONF_ERROR;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4128 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4129
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4130 ngx_memzero(&u, sizeof(ngx_url_t));
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4131
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4132 u.url.len = url->len - add;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4133 u.url.data = url->data + add;
906 a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 896 diff changeset	4134 u.default_port = port;
a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 896 diff changeset	4135 u.uri_part = 1;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 843 diff changeset	4136 u.no_resolve = 1;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 843 diff changeset	4137
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 843 diff changeset	4138 plcf->upstream.upstream = ngx_http_upstream_add(cf, &u, 0);
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 843 diff changeset	4139 if (plcf->upstream.upstream == NULL) {
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4140 return NGX_CONF_ERROR;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4141 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4142
2391 d88e757cc7d8 delete surplus upstream.schema field Igor Sysoev <igor@sysoev.ru> parents: 2285 diff changeset	4143 plcf->vars.schema.len = add;
d88e757cc7d8 delete surplus upstream.schema field Igor Sysoev <igor@sysoev.ru> parents: 2285 diff changeset	4144 plcf->vars.schema.data = url->data;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4145 plcf->vars.key_start = plcf->vars.schema;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4146
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4147 ngx_http_proxy_set_vars(&u, &plcf->vars);
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4148
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4149 plcf->location = clcf->name;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4150
1353 7443fbe0b013 named location Igor Sysoev <igor@sysoev.ru> parents: 1339 diff changeset	4151 if (clcf->named
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4152 #if (NGX_PCRE)
1353 7443fbe0b013 named location Igor Sysoev <igor@sysoev.ru> parents: 1339 diff changeset	4153 \|\| clcf->regex
7443fbe0b013 named location Igor Sysoev <igor@sysoev.ru> parents: 1339 diff changeset	4154 #endif
7443fbe0b013 named location Igor Sysoev <igor@sysoev.ru> parents: 1339 diff changeset	4155 \|\| clcf->noname)
7443fbe0b013 named location Igor Sysoev <igor@sysoev.ru> parents: 1339 diff changeset	4156 {
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4157 if (plcf->vars.uri.len) {
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	4158 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	4159 "\"proxy_pass\" cannot have URI part in "
843 ebab9490204c allow proxy_pass inside limit_except Igor Sysoev <igor@sysoev.ru> parents: 812 diff changeset	4160 "location given by regular expression, "
1353 7443fbe0b013 named location Igor Sysoev <igor@sysoev.ru> parents: 1339 diff changeset	4161 "or inside named location, "
4593 834049edae24 Fixed grammar in error messages. Ruslan Ermilov <ru@nginx.com> parents: 4529 diff changeset	4162 "or inside \"if\" statement, "
834049edae24 Fixed grammar in error messages. Ruslan Ermilov <ru@nginx.com> parents: 4529 diff changeset	4163 "or inside \"limit_except\" block");
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	4164 return NGX_CONF_ERROR;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	4165 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	4166
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4167 plcf->location.len = 0;
555 7bd37aef1e7e nginx-0.2.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 551 diff changeset	4168 }
7bd37aef1e7e nginx-0.2.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 551 diff changeset	4169
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4170 plcf->url = *url;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4171
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4172 return NGX_CONF_OK;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4173 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4174
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4175
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4176 static char *
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4177 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	4178 {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4179 ngx_http_proxy_loc_conf_t *plcf = conf;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4180
4336 99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	4181 u_char *p;
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	4182 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	4183 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	4184 ngx_http_compile_complex_value_t ccv;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4185
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4186 if (plcf->redirect == 0) {
7714 8dbc9ee97998 Proxy: strengthen syntax checking for some directives. Ruslan Ermilov <ru@nginx.com> parents: 7677 diff changeset	4187 return "is duplicate";
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4188 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4189
4422 b1a9d725ab69 Fixed proxy_redirect off inheritance. Valentin Bartenev <vbart@nginx.com> parents: 4412 diff changeset	4190 plcf->redirect = 1;
b1a9d725ab69 Fixed proxy_redirect off inheritance. Valentin Bartenev <vbart@nginx.com> parents: 4412 diff changeset	4191
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4192 value = cf->args->elts;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4193
2784 c2230102df6f ) check a proxy_redirect single parameter Igor Sysoev <igor@sysoev.ru>* parents: 2753 diff changeset	4194 if (cf->args->nelts == 2) {
c2230102df6f ) check a proxy_redirect single parameter Igor Sysoev <igor@sysoev.ru>* parents: 2753 diff changeset	4195 if (ngx_strcmp(value[1].data, "off") == 0) {
7714 8dbc9ee97998 Proxy: strengthen syntax checking for some directives. Ruslan Ermilov <ru@nginx.com> parents: 7677 diff changeset	4196
8dbc9ee97998 Proxy: strengthen syntax checking for some directives. Ruslan Ermilov <ru@nginx.com> parents: 7677 diff changeset	4197 if (plcf->redirects) {
8dbc9ee97998 Proxy: strengthen syntax checking for some directives. Ruslan Ermilov <ru@nginx.com> parents: 7677 diff changeset	4198 return "is duplicate";
8dbc9ee97998 Proxy: strengthen syntax checking for some directives. Ruslan Ermilov <ru@nginx.com> parents: 7677 diff changeset	4199 }
8dbc9ee97998 Proxy: strengthen syntax checking for some directives. Ruslan Ermilov <ru@nginx.com> parents: 7677 diff changeset	4200
2784 c2230102df6f ) check a proxy_redirect single parameter Igor Sysoev <igor@sysoev.ru>* parents: 2753 diff changeset	4201 plcf->redirect = 0;
c2230102df6f ) check a proxy_redirect single parameter Igor Sysoev <igor@sysoev.ru>* parents: 2753 diff changeset	4202 return NGX_CONF_OK;
c2230102df6f ) check a proxy_redirect single parameter Igor Sysoev <igor@sysoev.ru>* parents: 2753 diff changeset	4203 }
c2230102df6f ) check a proxy_redirect single parameter Igor Sysoev <igor@sysoev.ru>* parents: 2753 diff changeset	4204
c2230102df6f ) check a proxy_redirect single parameter Igor Sysoev <igor@sysoev.ru>* parents: 2753 diff changeset	4205 if (ngx_strcmp(value[1].data, "default") != 0) {
c2230102df6f ) check a proxy_redirect single parameter Igor Sysoev <igor@sysoev.ru>* parents: 2753 diff changeset	4206 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	4207 "invalid parameter \"%V\"", &value[1]);
c2230102df6f ) check a proxy_redirect single parameter Igor Sysoev <igor@sysoev.ru>* parents: 2753 diff changeset	4208 return NGX_CONF_ERROR;
c2230102df6f ) check a proxy_redirect single parameter Igor Sysoev <igor@sysoev.ru>* parents: 2753 diff changeset	4209 }
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4210 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4211
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4212 if (plcf->redirects == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4213 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	4214 sizeof(ngx_http_proxy_rewrite_t));
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4215 if (plcf->redirects == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4216 return NGX_CONF_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4217 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4218 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4219
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4220 pr = ngx_array_push(plcf->redirects);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4221 if (pr == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4222 return NGX_CONF_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4223 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4224
7714 8dbc9ee97998 Proxy: strengthen syntax checking for some directives. Ruslan Ermilov <ru@nginx.com> parents: 7677 diff changeset	4225 if (cf->args->nelts == 2
8dbc9ee97998 Proxy: strengthen syntax checking for some directives. Ruslan Ermilov <ru@nginx.com> parents: 7677 diff changeset	4226 && ngx_strcmp(value[1].data, "default") == 0)
8dbc9ee97998 Proxy: strengthen syntax checking for some directives. Ruslan Ermilov <ru@nginx.com> parents: 7677 diff changeset	4227 {
3471 d8c56e7851b8 "proxy_redirect default" may not be used if a proxy_pass uses variables Igor Sysoev <igor@sysoev.ru> parents: 3470 diff changeset	4228 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	4229 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	4230 "\"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	4231 "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	4232 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	4233 }
d8c56e7851b8 "proxy_redirect default" may not be used if a proxy_pass uses variables Igor Sysoev <igor@sysoev.ru> parents: 3470 diff changeset	4234
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4235 if (plcf->url.data == NULL) {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4236 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	4237 "\"proxy_redirect default\" should be placed "
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4238 "after the \"proxy_pass\" directive");
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4239 return NGX_CONF_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4240 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4241
4461 103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	4242 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	4243
103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	4244 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	4245
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	4246 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	4247
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4248 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	4249 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	4250 pr->replacement.value = plcf->location;
653 7cbef16c71a1 nginx-0.3.48-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 651 diff changeset	4251
7cbef16c71a1 nginx-0.3.48-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 651 diff changeset	4252 } else {
4461 103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	4253 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	4254
103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	4255 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	4256 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	4257 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	4258 }
f4c49c9e4bb5 always test proxy_redirect with slash, this fixes a case when nginx uses Igor Sysoev <igor@sysoev.ru> parents: 3734 diff changeset	4259
4461 103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	4260 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	4261
f4c49c9e4bb5 always test proxy_redirect with slash, this fixes a case when nginx uses Igor Sysoev <igor@sysoev.ru> parents: 3734 diff changeset	4262 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	4263 *p = '/';
f4c49c9e4bb5 always test proxy_redirect with slash, this fixes a case when nginx uses Igor Sysoev <igor@sysoev.ru> parents: 3734 diff changeset	4264
4336 99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	4265 ngx_str_set(&pr->replacement.value, "/");
653 7cbef16c71a1 nginx-0.3.48-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 651 diff changeset	4266 }
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4267
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4268 return NGX_CONF_OK;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4269 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4270
4336 99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	4271
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	4272 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	4273 value[1].len--;
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	4274 value[1].data++;
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	4275
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	4276 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	4277 value[1].len--;
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	4278 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	4279
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4280 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	4281 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	4282 }
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4283
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4284 } else {
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4285 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	4286 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	4287 }
4336 99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	4288 }
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	4289
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	4290 } else {
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	4291
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	4292 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	4293
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	4294 ccv.cf = cf;
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	4295 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	4296 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	4297
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	4298 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	4299 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	4300 }
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	4301
4461 103587c7ae5f Proxy: renamed some "proxy_redirect" related declarations to a more general and Valentin Bartenev <vbart@nginx.com> parents: 4422 diff changeset	4302 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	4303 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4304
4336 99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	4305
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	4306 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	4307
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	4308 ccv.cf = cf;
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	4309 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	4310 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	4311
99437094e86f Proxy: added variables and regexp support to the first parameter of Valentin Bartenev <vbart@nginx.com> parents: 4276 diff changeset	4312 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	4313 return NGX_CONF_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4314 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4315
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4316 return NGX_CONF_OK;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4317 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4318
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4319
4465 8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4320 static char *
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4321 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	4322 {
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4323 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	4324
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4325 ngx_str_t *value;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4326 ngx_http_proxy_rewrite_t *pr;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4327 ngx_http_compile_complex_value_t ccv;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4328
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4329 if (plcf->cookie_domains == NULL) {
7714 8dbc9ee97998 Proxy: strengthen syntax checking for some directives. Ruslan Ermilov <ru@nginx.com> parents: 7677 diff changeset	4330 return "is duplicate";
4465 8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4331 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4332
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4333 value = cf->args->elts;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4334
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4335 if (cf->args->nelts == 2) {
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4336
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4337 if (ngx_strcmp(value[1].data, "off") == 0) {
7714 8dbc9ee97998 Proxy: strengthen syntax checking for some directives. Ruslan Ermilov <ru@nginx.com> parents: 7677 diff changeset	4338
8dbc9ee97998 Proxy: strengthen syntax checking for some directives. Ruslan Ermilov <ru@nginx.com> parents: 7677 diff changeset	4339 if (plcf->cookie_domains != NGX_CONF_UNSET_PTR) {
8dbc9ee97998 Proxy: strengthen syntax checking for some directives. Ruslan Ermilov <ru@nginx.com> parents: 7677 diff changeset	4340 return "is duplicate";
8dbc9ee97998 Proxy: strengthen syntax checking for some directives. Ruslan Ermilov <ru@nginx.com> parents: 7677 diff changeset	4341 }
8dbc9ee97998 Proxy: strengthen syntax checking for some directives. Ruslan Ermilov <ru@nginx.com> parents: 7677 diff changeset	4342
4465 8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4343 plcf->cookie_domains = NULL;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4344 return NGX_CONF_OK;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4345 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4346
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4347 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	4348 "invalid parameter \"%V\"", &value[1]);
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4349 return NGX_CONF_ERROR;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4350 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4351
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4352 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	4353 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	4354 sizeof(ngx_http_proxy_rewrite_t));
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4355 if (plcf->cookie_domains == NULL) {
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4356 return NGX_CONF_ERROR;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4357 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4358 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4359
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4360 pr = ngx_array_push(plcf->cookie_domains);
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4361 if (pr == NULL) {
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4362 return NGX_CONF_ERROR;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4363 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4364
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4365 if (value[1].data[0] == '~') {
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4366 value[1].len--;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4367 value[1].data++;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4368
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4369 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	4370 return NGX_CONF_ERROR;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4371 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4372
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4373 } else {
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4374
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4375 if (value[1].data[0] == '.') {
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4376 value[1].len--;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4377 value[1].data++;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4378 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4379
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4380 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	4381
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4382 ccv.cf = cf;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4383 ccv.value = &value[1];
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4384 ccv.complex_value = &pr->pattern.complex;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4385
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4386 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	4387 return NGX_CONF_ERROR;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4388 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4389
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4390 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	4391
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4392 if (value[2].data[0] == '.') {
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4393 value[2].len--;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4394 value[2].data++;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4395 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4396 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4397
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4398 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	4399
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4400 ccv.cf = cf;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4401 ccv.value = &value[2];
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4402 ccv.complex_value = &pr->replacement;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4403
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4404 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	4405 return NGX_CONF_ERROR;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4406 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4407
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4408 return NGX_CONF_OK;
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4409 }
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4410
8293fc2d802b Proxy: added the "proxy_cookie_domain" directive. Valentin Bartenev <vbart@nginx.com> parents: 4463 diff changeset	4411
4466 b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4412 static char *
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4413 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	4414 {
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4415 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	4416
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4417 ngx_str_t *value;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4418 ngx_http_proxy_rewrite_t *pr;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4419 ngx_http_compile_complex_value_t ccv;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4420
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4421 if (plcf->cookie_paths == NULL) {
7714 8dbc9ee97998 Proxy: strengthen syntax checking for some directives. Ruslan Ermilov <ru@nginx.com> parents: 7677 diff changeset	4422 return "is duplicate";
4466 b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4423 }
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4424
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4425 value = cf->args->elts;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4426
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4427 if (cf->args->nelts == 2) {
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4428
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4429 if (ngx_strcmp(value[1].data, "off") == 0) {
7714 8dbc9ee97998 Proxy: strengthen syntax checking for some directives. Ruslan Ermilov <ru@nginx.com> parents: 7677 diff changeset	4430
8dbc9ee97998 Proxy: strengthen syntax checking for some directives. Ruslan Ermilov <ru@nginx.com> parents: 7677 diff changeset	4431 if (plcf->cookie_paths != NGX_CONF_UNSET_PTR) {
8dbc9ee97998 Proxy: strengthen syntax checking for some directives. Ruslan Ermilov <ru@nginx.com> parents: 7677 diff changeset	4432 return "is duplicate";
8dbc9ee97998 Proxy: strengthen syntax checking for some directives. Ruslan Ermilov <ru@nginx.com> parents: 7677 diff changeset	4433 }
8dbc9ee97998 Proxy: strengthen syntax checking for some directives. Ruslan Ermilov <ru@nginx.com> parents: 7677 diff changeset	4434
4466 b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4435 plcf->cookie_paths = NULL;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4436 return NGX_CONF_OK;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4437 }
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4438
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4439 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	4440 "invalid parameter \"%V\"", &value[1]);
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4441 return NGX_CONF_ERROR;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4442 }
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4443
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4444 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	4445 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	4446 sizeof(ngx_http_proxy_rewrite_t));
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4447 if (plcf->cookie_paths == NULL) {
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4448 return NGX_CONF_ERROR;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4449 }
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4450 }
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4451
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4452 pr = ngx_array_push(plcf->cookie_paths);
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4453 if (pr == NULL) {
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4454 return NGX_CONF_ERROR;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4455 }
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4456
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4457 if (value[1].data[0] == '~') {
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4458 value[1].len--;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4459 value[1].data++;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4460
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4461 if (value[1].data[0] == '*') {
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4462 value[1].len--;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4463 value[1].data++;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4464
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4465 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	4466 return NGX_CONF_ERROR;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4467 }
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4468
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4469 } else {
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4470 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	4471 return NGX_CONF_ERROR;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4472 }
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4473 }
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4474
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4475 } else {
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4476
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4477 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	4478
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4479 ccv.cf = cf;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4480 ccv.value = &value[1];
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4481 ccv.complex_value = &pr->pattern.complex;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4482
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4483 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	4484 return NGX_CONF_ERROR;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4485 }
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4486
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4487 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	4488 }
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4489
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4490 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	4491
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4492 ccv.cf = cf;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4493 ccv.value = &value[2];
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4494 ccv.complex_value = &pr->replacement;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4495
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4496 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	4497 return NGX_CONF_ERROR;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4498 }
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4499
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4500 return NGX_CONF_OK;
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4501 }
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4502
b404f34b5cb8 Proxy: added the "proxy_cookie_path" directive. Valentin Bartenev <vbart@nginx.com> parents: 4465 diff changeset	4503
7716 d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4504 static char *
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4505 ngx_http_proxy_cookie_flags(ngx_conf_t cf, ngx_command_t cmd, void *conf)
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4506 {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4507 ngx_http_proxy_loc_conf_t *plcf = conf;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4508
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4509 ngx_str_t *value;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4510 ngx_uint_t i, m;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4511 ngx_conf_bitmask_t *mask;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4512 ngx_http_proxy_cookie_flags_t *pcf;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4513 ngx_http_compile_complex_value_t ccv;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4514 #if (NGX_PCRE)
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4515 ngx_regex_compile_t rc;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4516 u_char errstr[NGX_MAX_CONF_ERRSTR];
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4517 #endif
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4518
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4519 if (plcf->cookie_flags == NULL) {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4520 return "is duplicate";
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4521 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4522
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4523 value = cf->args->elts;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4524
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4525 if (cf->args->nelts == 2) {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4526
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4527 if (ngx_strcmp(value[1].data, "off") == 0) {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4528
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4529 if (plcf->cookie_flags != NGX_CONF_UNSET_PTR) {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4530 return "is duplicate";
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4531 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4532
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4533 plcf->cookie_flags = NULL;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4534 return NGX_CONF_OK;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4535 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4536
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4537 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4538 "invalid parameter \"%V\"", &value[1]);
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4539 return NGX_CONF_ERROR;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4540 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4541
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4542 if (plcf->cookie_flags == NGX_CONF_UNSET_PTR) {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4543 plcf->cookie_flags = ngx_array_create(cf->pool, 1,
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4544 sizeof(ngx_http_proxy_cookie_flags_t));
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4545 if (plcf->cookie_flags == NULL) {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4546 return NGX_CONF_ERROR;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4547 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4548 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4549
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4550 pcf = ngx_array_push(plcf->cookie_flags);
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4551 if (pcf == NULL) {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4552 return NGX_CONF_ERROR;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4553 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4554
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4555 pcf->regex = 0;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4556
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4557 if (value[1].data[0] == '~') {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4558 value[1].len--;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4559 value[1].data++;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4560
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4561 #if (NGX_PCRE)
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4562 ngx_memzero(&rc, sizeof(ngx_regex_compile_t));
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4563
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4564 rc.pattern = value[1];
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4565 rc.err.len = NGX_MAX_CONF_ERRSTR;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4566 rc.err.data = errstr;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4567 rc.options = NGX_REGEX_CASELESS;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4568
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4569 pcf->cookie.regex = ngx_http_regex_compile(cf, &rc);
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4570 if (pcf->cookie.regex == NULL) {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4571 return NGX_CONF_ERROR;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4572 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4573
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4574 pcf->regex = 1;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4575 #else
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4576 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4577 "using regex \"%V\" requires PCRE library",
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4578 &value[1]);
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4579 return NGX_CONF_ERROR;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4580 #endif
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4581
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4582 } else {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4583
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4584 ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4585
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4586 ccv.cf = cf;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4587 ccv.value = &value[1];
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4588 ccv.complex_value = &pcf->cookie.complex;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4589
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4590 if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4591 return NGX_CONF_ERROR;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4592 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4593 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4594
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4595 mask = ngx_http_proxy_cookie_flags_masks;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4596 pcf->flags = 0;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4597
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4598 for (i = 2; i < cf->args->nelts; i++) {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4599 for (m = 0; mask[m].name.len != 0; m++) {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4600
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4601 if (mask[m].name.len != value[i].len
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4602 \|\| ngx_strcasecmp(mask[m].name.data, value[i].data) != 0)
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4603 {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4604 continue;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4605 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4606
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4607 if (pcf->flags & mask[m].mask) {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4608 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4609 "duplicate parameter \"%V\"", &value[i]);
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4610 return NGX_CONF_ERROR;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4611 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4612
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4613 pcf->flags \|= mask[m].mask;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4614
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4615 break;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4616 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4617
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4618 if (mask[m].name.len == 0) {
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4619 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4620 "invalid parameter \"%V\"", &value[i]);
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4621 return NGX_CONF_ERROR;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4622 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4623 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4624
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4625 return NGX_CONF_OK;
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4626 }
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4627
d6a5e14aa3e4 Proxy: added the "proxy_cookie_flags" directive. Ruslan Ermilov <ru@nginx.com> parents: 7715 diff changeset	4628
4463 a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4629 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	4630 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	4631 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	4632 {
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4633 #if (NGX_PCRE)
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4634 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	4635 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	4636
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4637 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	4638
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4639 rc.pattern = *regex;
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4640 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	4641 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	4642
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4643 if (caseless) {
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4644 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	4645 }
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4646
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4647 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	4648 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	4649 return NGX_ERROR;
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4650 }
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4651
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4652 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	4653
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4654 return NGX_OK;
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4655
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4656 #else
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4657
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4658 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	4659 "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	4660 return NGX_ERROR;
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4661
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4662 #endif
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4663 }
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4664
a068ec122f17 Proxy: generic regex related code from the "proxy_redirect" directive moved Valentin Bartenev <vbart@nginx.com> parents: 4462 diff changeset	4665
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4666 static char *
1295 5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4667 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	4668 {
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4669 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	4670
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4671 ngx_str_t *value;
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4672 ngx_http_script_compile_t sc;
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4673
5947 d9025ea1f5a5 Upstream: simplified proxy_store and friends configuration code. Valentin Bartenev <vbart@nginx.com> parents: 5940 diff changeset	4674 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	4675 return "is duplicate";
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4676 }
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4677
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4678 value = cf->args->elts;
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4679
2895 d65e58a8d3a4 report about proxy/fastcgi_store and proxy/fastcgi_cache incompatibility Igor Sysoev <igor@sysoev.ru> parents: 2894 diff changeset	4680 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	4681 plcf->upstream.store = 0;
1295 5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4682 return NGX_CONF_OK;
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4683 }
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4684
2895 d65e58a8d3a4 report about proxy/fastcgi_store and proxy/fastcgi_cache incompatibility Igor Sysoev <igor@sysoev.ru> parents: 2894 diff changeset	4685 #if (NGX_HTTP_CACHE)
5949 634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	4686 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	4687 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	4688 }
d65e58a8d3a4 report about proxy/fastcgi_store and proxy/fastcgi_cache incompatibility Igor Sysoev <igor@sysoev.ru> parents: 2894 diff changeset	4689 #endif
d65e58a8d3a4 report about proxy/fastcgi_store and proxy/fastcgi_cache incompatibility Igor Sysoev <igor@sysoev.ru> parents: 2894 diff changeset	4690
5947 d9025ea1f5a5 Upstream: simplified proxy_store and friends configuration code. Valentin Bartenev <vbart@nginx.com> parents: 5940 diff changeset	4691 plcf->upstream.store = 1;
d9025ea1f5a5 Upstream: simplified proxy_store and friends configuration code. Valentin Bartenev <vbart@nginx.com> parents: 5940 diff changeset	4692
2895 d65e58a8d3a4 report about proxy/fastcgi_store and proxy/fastcgi_cache incompatibility Igor Sysoev <igor@sysoev.ru> parents: 2894 diff changeset	4693 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	4694 return NGX_CONF_OK;
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4695 }
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4696
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4697 /* include the terminating '\0' into script */
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4698 value[1].len++;
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4699
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4700 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	4701
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4702 sc.cf = cf;
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4703 sc.source = &value[1];
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4704 sc.lengths = &plcf->upstream.store_lengths;
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4705 sc.values = &plcf->upstream.store_values;
1563 022ec9420f80 style fix: remove double semicolons Igor Sysoev <igor@sysoev.ru> parents: 1488 diff changeset	4706 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	4707 sc.complete_lengths = 1;
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4708 sc.complete_values = 1;
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4709
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4710 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	4711 return NGX_CONF_ERROR;
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4712 }
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4713
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4714 return NGX_CONF_OK;
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4715 }
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4716
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4717
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4718 #if (NGX_HTTP_CACHE)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4719
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4720 static char *
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4721 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	4722 {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4723 ngx_http_proxy_loc_conf_t *plcf = conf;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4724
5951 610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4725 ngx_str_t *value;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4726 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	4727 ngx_http_compile_complex_value_t ccv;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4728
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4729 value = cf->args->elts;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4730
5949 634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	4731 if (plcf->upstream.cache != NGX_CONF_UNSET) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4732 return "is duplicate";
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4733 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4734
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4735 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	4736 plcf->upstream.cache = 0;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4737 return NGX_CONF_OK;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4738 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4739
5947 d9025ea1f5a5 Upstream: simplified proxy_store and friends configuration code. Valentin Bartenev <vbart@nginx.com> parents: 5940 diff changeset	4740 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	4741 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	4742 }
d65e58a8d3a4 report about proxy/fastcgi_store and proxy/fastcgi_cache incompatibility Igor Sysoev <igor@sysoev.ru> parents: 2894 diff changeset	4743
5949 634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	4744 plcf->upstream.cache = 1;
634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	4745
5951 610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4746 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	4747
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4748 ccv.cf = cf;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4749 ccv.value = &value[1];
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4750 ccv.complex_value = &cv;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4751
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4752 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	4753 return NGX_CONF_ERROR;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4754 }
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4755
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4756 if (cv.lengths != NULL) {
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4757
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4758 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	4759 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	4760 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	4761 return NGX_CONF_ERROR;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4762 }
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4763
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4764 *plcf->upstream.cache_value = cv;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4765
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4766 return NGX_CONF_OK;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4767 }
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	4768
5949 634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	4769 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	4770 &ngx_http_proxy_module);
634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	4771 if (plcf->upstream.cache_zone == NULL) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4772 return NGX_CONF_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4773 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4774
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4775 return NGX_CONF_OK;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4776 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4777
2672 b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4778
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4779 static char *
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4780 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	4781 {
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4782 ngx_http_proxy_loc_conf_t *plcf = conf;
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4783
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4784 ngx_str_t *value;
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4785 ngx_http_compile_complex_value_t ccv;
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4786
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4787 value = cf->args->elts;
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4788
4947 4251e72b8bb4 Allow the complex value to be defined as an empty string. Ruslan Ermilov <ru@nginx.com> parents: 4927 diff changeset	4789 if (plcf->cache_key.value.data) {
2672 b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4790 return "is duplicate";
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4791 }
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4792
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4793 ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4794
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4795 ccv.cf = cf;
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4796 ccv.value = &value[1];
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4797 ccv.complex_value = &plcf->cache_key;
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4798
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4799 if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4800 return NGX_CONF_ERROR;
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4801 }
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4802
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4803 return NGX_CONF_OK;
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4804 }
b212066acf50 proxy_cache_key Igor Sysoev <igor@sysoev.ru> parents: 2601 diff changeset	4805
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4806 #endif
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4807
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4808
5900 20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4809 #if (NGX_HTTP_SSL)
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4810
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4811 static char *
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4812 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	4813 {
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4814 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	4815
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4816 ngx_str_t *value;
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4817
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4818 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	4819 return "is duplicate";
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4820 }
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4821
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4822 value = cf->args->elts;
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4823
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4824 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	4825
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4826 if (plcf->ssl_passwords == NULL) {
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4827 return NGX_CONF_ERROR;
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4828 }
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4829
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4830 return NGX_CONF_OK;
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4831 }
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4832
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4833 #endif
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4834
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4835
1295 5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4836 static char *
507 cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4837 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	4838 {
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4839 #if (NGX_FREEBSD)
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4840 ssize_t *np = data;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4841
673 b80f94fa2197 nginx-0.3.58-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 667 diff changeset	4842 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	4843 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4844 "\"proxy_send_lowat\" must be less than %d "
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4845 "(sysctl net.inet.tcp.sendspace)",
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4846 ngx_freebsd_net_inet_tcp_sendspace);
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4847
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4848 return NGX_CONF_ERROR;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4849 }
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4850
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4851 #elif !(NGX_HAVE_SO_SNDLOWAT)
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4852 ssize_t *np = data;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4853
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4854 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4855 "\"proxy_send_lowat\" is not supported, ignored");
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4856
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4857 *np = 0;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4858
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4859 #endif
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4860
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4861 return NGX_CONF_OK;
cd3117ad9aab nginx-0.1.28-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4862 }
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 843 diff changeset	4863
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 843 diff changeset	4864
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4865 #if (NGX_HTTP_SSL)
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4866
7730 1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7728 diff changeset	4867 static char *
1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7728 diff changeset	4868 ngx_http_proxy_ssl_conf_command_check(ngx_conf_t cf, void post, void *data)
1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7728 diff changeset	4869 {
1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7728 diff changeset	4870 #ifndef SSL_CONF_FLAG_FILE
1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7728 diff changeset	4871 return "is not supported on this platform";
1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7728 diff changeset	4872 #endif
1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7728 diff changeset	4873
1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7728 diff changeset	4874 return NGX_CONF_OK;
1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7728 diff changeset	4875 }
1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7728 diff changeset	4876
1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7728 diff changeset	4877
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4878 static ngx_int_t
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4879 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	4880 {
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4881 ngx_pool_cleanup_t *cln;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4882
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4883 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	4884 if (plcf->upstream.ssl == NULL) {
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4885 return NGX_ERROR;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4886 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4887
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4888 plcf->upstream.ssl->log = cf->log;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4889
5385 7c1f4977d8a0 Proxy: added the "proxy_ssl_protocols" directive. Andrei Belov <defan@nginx.com> parents: 5359 diff changeset	4890 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	4891 != NGX_OK)
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4892 {
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4893 return NGX_ERROR;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4894 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4895
5659 3fb6615bb87f Upstream: plugged potential memory leak on reload. Maxim Dounin <mdounin@mdounin.ru> parents: 5575 diff changeset	4896 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	4897 if (cln == NULL) {
7473 8981dbb12254 SSL: fixed potential leak on memory allocation errors. Maxim Dounin <mdounin@mdounin.ru> parents: 7371 diff changeset	4898 ngx_ssl_cleanup_ctx(plcf->upstream.ssl);
5659 3fb6615bb87f Upstream: plugged potential memory leak on reload. Maxim Dounin <mdounin@mdounin.ru> parents: 5575 diff changeset	4899 return NGX_ERROR;
3fb6615bb87f Upstream: plugged potential memory leak on reload. Maxim Dounin <mdounin@mdounin.ru> parents: 5575 diff changeset	4900 }
3fb6615bb87f Upstream: plugged potential memory leak on reload. Maxim Dounin <mdounin@mdounin.ru> parents: 5575 diff changeset	4901
3fb6615bb87f Upstream: plugged potential memory leak on reload. Maxim Dounin <mdounin@mdounin.ru> parents: 5575 diff changeset	4902 cln->handler = ngx_ssl_cleanup_ctx;
3fb6615bb87f Upstream: plugged potential memory leak on reload. Maxim Dounin <mdounin@mdounin.ru> parents: 5575 diff changeset	4903 cln->data = plcf->upstream.ssl;
3fb6615bb87f Upstream: plugged potential memory leak on reload. Maxim Dounin <mdounin@mdounin.ru> parents: 5575 diff changeset	4904
5900 20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4905 if (plcf->ssl_certificate.len) {
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4906
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4907 if (plcf->ssl_certificate_key.len == 0) {
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4908 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	4909 "no \"proxy_ssl_certificate_key\" is defined "
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4910 "for certificate \"%V\"", &plcf->ssl_certificate);
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4911 return NGX_ERROR;
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4912 }
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4913
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4914 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	4915 &plcf->ssl_certificate_key, plcf->ssl_passwords)
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4916 != NGX_OK)
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4917 {
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4918 return NGX_ERROR;
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4919 }
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4920 }
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	4921
6591 04d8d1f85649 SSL: ngx_ssl_ciphers() to set list of ciphers. Tim Taubert <tim@timtaubert.de> parents: 6530 diff changeset	4922 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	4923 != NGX_OK)
5390 919d230ecdbe Proxy: added the "proxy_ssl_ciphers" directive. Piotr Sikora <piotr@cloudflare.com> parents: 5385 diff changeset	4924 {
919d230ecdbe Proxy: added the "proxy_ssl_ciphers" directive. Piotr Sikora <piotr@cloudflare.com> parents: 5385 diff changeset	4925 return NGX_ERROR;
919d230ecdbe Proxy: added the "proxy_ssl_ciphers" directive. Piotr Sikora <piotr@cloudflare.com> parents: 5385 diff changeset	4926 }
919d230ecdbe Proxy: added the "proxy_ssl_ciphers" directive. Piotr Sikora <piotr@cloudflare.com> parents: 5385 diff changeset	4927
5661 060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	4928 if (plcf->upstream.ssl_verify) {
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	4929 if (plcf->ssl_trusted_certificate.len == 0) {
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	4930 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	4931 "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	4932 return NGX_ERROR;
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	4933 }
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	4934
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	4935 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	4936 &plcf->ssl_trusted_certificate,
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	4937 plcf->ssl_verify_depth)
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	4938 != NGX_OK)
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	4939 {
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	4940 return NGX_ERROR;
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	4941 }
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	4942
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	4943 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	4944 return NGX_ERROR;
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	4945 }
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	4946 }
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	4947
7320 696df3ac27ac SSL: save sessions for upstream peers using a callback function. Sergey Kandaurov <pluknet@nginx.com> parents: 7271 diff changeset	4948 if (ngx_ssl_client_session_cache(cf, plcf->upstream.ssl,
696df3ac27ac SSL: save sessions for upstream peers using a callback function. Sergey Kandaurov <pluknet@nginx.com> parents: 7271 diff changeset	4949 plcf->upstream.ssl_session_reuse)
696df3ac27ac SSL: save sessions for upstream peers using a callback function. Sergey Kandaurov <pluknet@nginx.com> parents: 7271 diff changeset	4950 != NGX_OK)
696df3ac27ac SSL: save sessions for upstream peers using a callback function. Sergey Kandaurov <pluknet@nginx.com> parents: 7271 diff changeset	4951 {
696df3ac27ac SSL: save sessions for upstream peers using a callback function. Sergey Kandaurov <pluknet@nginx.com> parents: 7271 diff changeset	4952 return NGX_ERROR;
696df3ac27ac SSL: save sessions for upstream peers using a callback function. Sergey Kandaurov <pluknet@nginx.com> parents: 7271 diff changeset	4953 }
696df3ac27ac SSL: save sessions for upstream peers using a callback function. Sergey Kandaurov <pluknet@nginx.com> parents: 7271 diff changeset	4954
7730 1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7728 diff changeset	4955 if (ngx_ssl_conf_commands(cf, plcf->upstream.ssl, plcf->ssl_conf_commands)
1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7728 diff changeset	4956 != NGX_OK)
1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7728 diff changeset	4957 {
1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7728 diff changeset	4958 return NGX_ERROR;
1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7728 diff changeset	4959 }
1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7728 diff changeset	4960
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4961 return NGX_OK;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4962 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4963
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4964 #endif
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4965
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4966
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4967 static void
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4968 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	4969 {
2203 8e5bf1bc87e2 ) refactor ngx_parse_inet_url() Igor Sysoev <igor@sysoev.ru>* parents: 2184 diff changeset	4970 if (u->family != AF_UNIX) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4971
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4972 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	4973
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4974 v->host_header = u->host;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4975
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4976 if (u->default_port == 80) {
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3477 diff changeset	4977 ngx_str_set(&v->port, "80");
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4978
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4979 } else {
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3477 diff changeset	4980 ngx_str_set(&v->port, "443");
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4981 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4982
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4983 } 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	4984 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	4985 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	4986 v->port = u->port_text;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4987 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4988
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4989 v->key_start.len += v->host_header.len;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4990
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4991 } else {
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3477 diff changeset	4992 ngx_str_set(&v->host_header, "localhost");
dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3477 diff changeset	4993 ngx_str_null(&v->port);
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2430 diff changeset	4994 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	4995 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4996
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4997 v->uri = u->uri;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1616 diff changeset	4998 }

Mercurial > hg > nginx

annotate src/http/modules/ngx_http_proxy_module.c @ 7730:1a719ee45526