Mercurial > hg > nginx
annotate src/http/modules/ngx_http_proxy_module.c @ 4462:a73c63bdce32
Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a
separate function with trivial optimization.
No functional changes.
| author | Valentin Bartenev <vbart@nginx.com> |
|---|---|
| date | Mon, 13 Feb 2012 10:56:09 +0000 |
| parents | 103587c7ae5f |
| children | a068ec122f17 |
| rev | line source |
|---|---|
| 507 | 1 |
| 577 | 2 /* |
| 507 | 3 * Copyright (C) Igor Sysoev |
| 4412 | 4 * Copyright (C) Nginx, Inc. |
| 507 | 5 */ |
| 6 | |
| 7 | |
| 8 #include <ngx_config.h> | |
| 9 #include <ngx_core.h> | |
| 10 #include <ngx_http.h> | |
| 11 | |
| 12 | |
|
4461
103587c7ae5f
Proxy: renamed some "proxy_redirect" related declarations to a more general and
Valentin Bartenev <vbart@nginx.com>
parents:
4422
diff
changeset
|
13 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
|
14 |
|
103587c7ae5f
Proxy: renamed some "proxy_redirect" related declarations to a more general and
Valentin Bartenev <vbart@nginx.com>
parents:
4422
diff
changeset
|
15 typedef ngx_int_t (*ngx_http_proxy_rewrite_pt)(ngx_http_request_t *r, |
|
4462
a73c63bdce32
Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a
Valentin Bartenev <vbart@nginx.com>
parents:
4461
diff
changeset
|
16 ngx_table_elt_t *h, size_t prefix, size_t len, |
|
a73c63bdce32
Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a
Valentin Bartenev <vbart@nginx.com>
parents:
4461
diff
changeset
|
17 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
|
18 |
|
103587c7ae5f
Proxy: renamed some "proxy_redirect" related declarations to a more general and
Valentin Bartenev <vbart@nginx.com>
parents:
4422
diff
changeset
|
19 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
|
20 ngx_http_proxy_rewrite_pt handler; |
| 507 | 21 |
| 509 | 22 union { |
|
4336
99437094e86f
Proxy: added variables and regexp support to the first parameter of
Valentin Bartenev <vbart@nginx.com>
parents:
4276
diff
changeset
|
23 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
|
24 #if (NGX_PCRE) |
|
99437094e86f
Proxy: added variables and regexp support to the first parameter of
Valentin Bartenev <vbart@nginx.com>
parents:
4276
diff
changeset
|
25 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
|
26 #endif |
|
4461
103587c7ae5f
Proxy: renamed some "proxy_redirect" related declarations to a more general and
Valentin Bartenev <vbart@nginx.com>
parents:
4422
diff
changeset
|
27 } pattern; |
|
4336
99437094e86f
Proxy: added variables and regexp support to the first parameter of
Valentin Bartenev <vbart@nginx.com>
parents:
4276
diff
changeset
|
28 |
|
99437094e86f
Proxy: added variables and regexp support to the first parameter of
Valentin Bartenev <vbart@nginx.com>
parents:
4276
diff
changeset
|
29 ngx_http_complex_value_t replacement; |
| 509 | 30 }; |
| 31 | |
| 32 | |
| 33 typedef struct { | |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
34 ngx_str_t key_start; |
|
2391
d88e757cc7d8
delete surplus upstream.schema field
Igor Sysoev <igor@sysoev.ru>
parents:
2285
diff
changeset
|
35 ngx_str_t schema; |
| 1658 | 36 ngx_str_t host_header; |
| 37 ngx_str_t port; | |
| 38 ngx_str_t uri; | |
| 39 } ngx_http_proxy_vars_t; | |
| 40 | |
| 41 | |
| 42 typedef struct { | |
| 651 | 43 ngx_http_upstream_conf_t upstream; |
| 44 | |
| 45 ngx_array_t *flushes; | |
| 46 ngx_array_t *body_set_len; | |
| 47 ngx_array_t *body_set; | |
| 48 ngx_array_t *headers_set_len; | |
| 49 ngx_array_t *headers_set; | |
| 50 ngx_hash_t headers_set_hash; | |
| 51 | |
| 52 ngx_array_t *headers_source; | |
| 53 | |
| 1658 | 54 ngx_array_t *proxy_lengths; |
| 55 ngx_array_t *proxy_values; | |
| 56 | |
| 651 | 57 ngx_array_t *redirects; |
| 58 | |
| 59 ngx_str_t body_source; | |
| 60 | |
| 61 ngx_str_t method; | |
| 1658 | 62 ngx_str_t location; |
| 63 ngx_str_t url; | |
| 64 | |
| 2672 | 65 #if (NGX_HTTP_CACHE) |
| 66 ngx_http_complex_value_t cache_key; | |
| 67 #endif | |
| 68 | |
| 1658 | 69 ngx_http_proxy_vars_t vars; |
| 651 | 70 |
| 71 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
|
72 |
|
4126
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
73 ngx_uint_t http_version; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
74 |
|
1180
1666b7b0bafc
proxy_headers_hash_max_size and proxy_headers_hash_bucket_size
Igor Sysoev <igor@sysoev.ru>
parents:
1125
diff
changeset
|
75 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
|
76 ngx_uint_t headers_hash_bucket_size; |
| 507 | 77 } ngx_http_proxy_loc_conf_t; |
| 78 | |
| 79 | |
| 80 typedef struct { | |
|
3627
9061fdb2ed8c
use ngx_http_parse_status_line()
Igor Sysoev <igor@sysoev.ru>
parents:
3615
diff
changeset
|
81 ngx_http_status_t status; |
| 1658 | 82 ngx_http_proxy_vars_t vars; |
| 651 | 83 size_t internal_body_length; |
|
4126
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
84 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
85 ngx_uint_t state; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
86 off_t size; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
87 off_t length; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
88 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
89 ngx_uint_t head; /* unsigned head:1 */ |
| 509 | 90 } ngx_http_proxy_ctx_t; |
| 507 | 91 |
| 92 | |
| 1658 | 93 static ngx_int_t ngx_http_proxy_eval(ngx_http_request_t *r, |
| 94 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
|
95 #if (NGX_HTTP_CACHE) |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
96 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
|
97 #endif |
| 507 | 98 static ngx_int_t ngx_http_proxy_create_request(ngx_http_request_t *r); |
| 99 static ngx_int_t ngx_http_proxy_reinit_request(ngx_http_request_t *r); | |
| 509 | 100 static ngx_int_t ngx_http_proxy_process_status_line(ngx_http_request_t *r); |
| 507 | 101 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
|
102 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
|
103 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
|
104 ngx_buf_t *buf); |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
105 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
|
106 ngx_buf_t *buf); |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
107 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
|
108 ssize_t bytes); |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
109 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
|
110 ssize_t bytes); |
| 507 | 111 static void ngx_http_proxy_abort_request(ngx_http_request_t *r); |
| 112 static void ngx_http_proxy_finalize_request(ngx_http_request_t *r, | |
| 113 ngx_int_t rc); | |
| 114 | |
| 573 | 115 static ngx_int_t ngx_http_proxy_host_variable(ngx_http_request_t *r, |
| 116 ngx_http_variable_value_t *v, uintptr_t data); | |
| 117 static ngx_int_t ngx_http_proxy_port_variable(ngx_http_request_t *r, | |
| 118 ngx_http_variable_value_t *v, uintptr_t data); | |
| 119 static ngx_int_t | |
| 509 | 120 ngx_http_proxy_add_x_forwarded_for_variable(ngx_http_request_t *r, |
| 573 | 121 ngx_http_variable_value_t *v, uintptr_t data); |
| 577 | 122 static ngx_int_t |
| 123 ngx_http_proxy_internal_body_length_variable(ngx_http_request_t *r, | |
| 124 ngx_http_variable_value_t *v, uintptr_t data); | |
| 509 | 125 static ngx_int_t ngx_http_proxy_rewrite_redirect(ngx_http_request_t *r, |
| 126 ngx_table_elt_t *h, 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
|
127 static ngx_int_t ngx_http_proxy_rewrite(ngx_http_request_t *r, |
|
a73c63bdce32
Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a
Valentin Bartenev <vbart@nginx.com>
parents:
4461
diff
changeset
|
128 ngx_table_elt_t *h, size_t prefix, size_t len, ngx_str_t *replacement); |
| 507 | 129 |
| 509 | 130 static ngx_int_t ngx_http_proxy_add_variables(ngx_conf_t *cf); |
| 507 | 131 static void *ngx_http_proxy_create_loc_conf(ngx_conf_t *cf); |
| 132 static char *ngx_http_proxy_merge_loc_conf(ngx_conf_t *cf, | |
| 133 void *parent, void *child); | |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
134 static ngx_int_t ngx_http_proxy_merge_headers(ngx_conf_t *cf, |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
135 ngx_http_proxy_loc_conf_t *conf, ngx_http_proxy_loc_conf_t *prev); |
| 507 | 136 |
| 137 static char *ngx_http_proxy_pass(ngx_conf_t *cf, ngx_command_t *cmd, | |
| 138 void *conf); | |
| 509 | 139 static char *ngx_http_proxy_redirect(ngx_conf_t *cf, ngx_command_t *cmd, |
| 140 void *conf); | |
|
1295
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
141 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
|
142 void *conf); |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
143 #if (NGX_HTTP_CACHE) |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
144 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
|
145 void *conf); |
| 2672 | 146 static char *ngx_http_proxy_cache_key(ngx_conf_t *cf, ngx_command_t *cmd, |
| 147 void *conf); | |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
148 #endif |
| 507 | 149 |
| 150 static char *ngx_http_proxy_lowat_check(ngx_conf_t *cf, void *post, void *data); | |
| 151 | |
| 1658 | 152 #if (NGX_HTTP_SSL) |
| 153 static ngx_int_t ngx_http_proxy_set_ssl(ngx_conf_t *cf, | |
| 154 ngx_http_proxy_loc_conf_t *plcf); | |
| 155 #endif | |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
156 static void ngx_http_proxy_set_vars(ngx_url_t *u, ngx_http_proxy_vars_t *v); |
| 1658 | 157 |
| 509 | 158 |
| 507 | 159 static ngx_conf_post_t ngx_http_proxy_lowat_post = |
| 509 | 160 { ngx_http_proxy_lowat_check }; |
| 161 | |
| 507 | 162 |
| 163 static ngx_conf_bitmask_t ngx_http_proxy_next_upstream_masks[] = { | |
| 164 { ngx_string("error"), NGX_HTTP_UPSTREAM_FT_ERROR }, | |
| 165 { ngx_string("timeout"), NGX_HTTP_UPSTREAM_FT_TIMEOUT }, | |
| 166 { ngx_string("invalid_header"), NGX_HTTP_UPSTREAM_FT_INVALID_HEADER }, | |
| 167 { 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
|
168 { ngx_string("http_502"), NGX_HTTP_UPSTREAM_FT_HTTP_502 }, |
| 623 | 169 { 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
|
170 { ngx_string("http_504"), NGX_HTTP_UPSTREAM_FT_HTTP_504 }, |
| 507 | 171 { ngx_string("http_404"), NGX_HTTP_UPSTREAM_FT_HTTP_404 }, |
|
2927
55ceaef03d34
proxy_cache_use_stale/fastcgi_cache_use_stale updating
Igor Sysoev <igor@sysoev.ru>
parents:
2912
diff
changeset
|
172 { ngx_string("updating"), NGX_HTTP_UPSTREAM_FT_UPDATING }, |
| 665 | 173 { ngx_string("off"), NGX_HTTP_UPSTREAM_FT_OFF }, |
| 507 | 174 { ngx_null_string, 0 } |
| 175 }; | |
| 176 | |
| 177 | |
|
4126
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
178 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
|
179 { 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
|
180 { 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
|
181 { ngx_null_string, 0 } |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
182 }; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
183 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
184 |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
185 ngx_module_t ngx_http_proxy_module; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
186 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
187 |
| 507 | 188 static ngx_command_t ngx_http_proxy_commands[] = { |
| 189 | |
| 190 { ngx_string("proxy_pass"), | |
|
843
ebab9490204c
allow proxy_pass inside limit_except
Igor Sysoev <igor@sysoev.ru>
parents:
812
diff
changeset
|
191 NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_HTTP_LMT_CONF|NGX_CONF_TAKE1, |
| 507 | 192 ngx_http_proxy_pass, |
| 193 NGX_HTTP_LOC_CONF_OFFSET, | |
| 194 0, | |
| 195 NULL }, | |
| 196 | |
| 509 | 197 { ngx_string("proxy_redirect"), |
| 198 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE12, | |
| 199 ngx_http_proxy_redirect, | |
| 200 NGX_HTTP_LOC_CONF_OFFSET, | |
| 201 0, | |
| 202 NULL }, | |
| 203 | |
|
1291
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1244
diff
changeset
|
204 { ngx_string("proxy_store"), |
|
1295
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
205 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
|
206 ngx_http_proxy_store, |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
207 NGX_HTTP_LOC_CONF_OFFSET, |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
208 0, |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
209 NULL }, |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
210 |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
211 { ngx_string("proxy_store_access"), |
|
1291
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1244
diff
changeset
|
212 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
|
213 ngx_conf_set_access_slot, |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1244
diff
changeset
|
214 NGX_HTTP_LOC_CONF_OFFSET, |
|
1295
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
215 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
|
216 NULL }, |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1244
diff
changeset
|
217 |
| 581 | 218 { ngx_string("proxy_buffering"), |
| 219 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, | |
| 220 ngx_conf_set_flag_slot, | |
| 221 NGX_HTTP_LOC_CONF_OFFSET, | |
| 222 offsetof(ngx_http_proxy_loc_conf_t, upstream.buffering), | |
| 223 NULL }, | |
| 224 | |
| 629 | 225 { ngx_string("proxy_ignore_client_abort"), |
| 226 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, | |
| 227 ngx_conf_set_flag_slot, | |
| 228 NGX_HTTP_LOC_CONF_OFFSET, | |
| 229 offsetof(ngx_http_proxy_loc_conf_t, upstream.ignore_client_abort), | |
| 230 NULL }, | |
| 231 | |
|
3271
fcd98af88df3
proxy_bind, fastcgi_bind, and memcached_bind
Igor Sysoev <igor@sysoev.ru>
parents:
3006
diff
changeset
|
232 { ngx_string("proxy_bind"), |
|
fcd98af88df3
proxy_bind, fastcgi_bind, and memcached_bind
Igor Sysoev <igor@sysoev.ru>
parents:
3006
diff
changeset
|
233 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, |
| 3399 | 234 ngx_http_upstream_bind_set_slot, |
|
3271
fcd98af88df3
proxy_bind, fastcgi_bind, and memcached_bind
Igor Sysoev <igor@sysoev.ru>
parents:
3006
diff
changeset
|
235 NGX_HTTP_LOC_CONF_OFFSET, |
|
fcd98af88df3
proxy_bind, fastcgi_bind, and memcached_bind
Igor Sysoev <igor@sysoev.ru>
parents:
3006
diff
changeset
|
236 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
|
237 NULL }, |
|
fcd98af88df3
proxy_bind, fastcgi_bind, and memcached_bind
Igor Sysoev <igor@sysoev.ru>
parents:
3006
diff
changeset
|
238 |
| 507 | 239 { ngx_string("proxy_connect_timeout"), |
| 240 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, | |
| 241 ngx_conf_set_msec_slot, | |
| 242 NGX_HTTP_LOC_CONF_OFFSET, | |
| 243 offsetof(ngx_http_proxy_loc_conf_t, upstream.connect_timeout), | |
| 244 NULL }, | |
| 245 | |
| 246 { ngx_string("proxy_send_timeout"), | |
| 247 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, | |
| 248 ngx_conf_set_msec_slot, | |
| 249 NGX_HTTP_LOC_CONF_OFFSET, | |
| 250 offsetof(ngx_http_proxy_loc_conf_t, upstream.send_timeout), | |
| 251 NULL }, | |
| 252 | |
| 253 { ngx_string("proxy_send_lowat"), | |
| 254 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, | |
| 255 ngx_conf_set_size_slot, | |
| 256 NGX_HTTP_LOC_CONF_OFFSET, | |
| 257 offsetof(ngx_http_proxy_loc_conf_t, upstream.send_lowat), | |
| 258 &ngx_http_proxy_lowat_post }, | |
| 259 | |
| 657 | 260 { ngx_string("proxy_intercept_errors"), |
| 261 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, | |
| 262 ngx_conf_set_flag_slot, | |
| 263 NGX_HTTP_LOC_CONF_OFFSET, | |
| 264 offsetof(ngx_http_proxy_loc_conf_t, upstream.intercept_errors), | |
| 265 NULL }, | |
| 266 | |
| 509 | 267 { ngx_string("proxy_set_header"), |
| 268 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE2, | |
| 649 | 269 ngx_conf_set_keyval_slot, |
| 507 | 270 NGX_HTTP_LOC_CONF_OFFSET, |
| 509 | 271 offsetof(ngx_http_proxy_loc_conf_t, headers_source), |
| 507 | 272 NULL }, |
| 273 | |
|
1180
1666b7b0bafc
proxy_headers_hash_max_size and proxy_headers_hash_bucket_size
Igor Sysoev <igor@sysoev.ru>
parents:
1125
diff
changeset
|
274 { 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
|
275 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
|
276 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
|
277 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
|
278 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
|
279 NULL }, |
|
1666b7b0bafc
proxy_headers_hash_max_size and proxy_headers_hash_bucket_size
Igor Sysoev <igor@sysoev.ru>
parents:
1125
diff
changeset
|
280 |
|
1666b7b0bafc
proxy_headers_hash_max_size and proxy_headers_hash_bucket_size
Igor Sysoev <igor@sysoev.ru>
parents:
1125
diff
changeset
|
281 { 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
|
282 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
|
283 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
|
284 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
|
285 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
|
286 NULL }, |
|
1666b7b0bafc
proxy_headers_hash_max_size and proxy_headers_hash_bucket_size
Igor Sysoev <igor@sysoev.ru>
parents:
1125
diff
changeset
|
287 |
| 577 | 288 { ngx_string("proxy_set_body"), |
| 289 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, | |
| 290 ngx_conf_set_str_slot, | |
| 291 NGX_HTTP_LOC_CONF_OFFSET, | |
| 292 offsetof(ngx_http_proxy_loc_conf_t, body_source), | |
| 293 NULL }, | |
| 294 | |
| 509 | 295 { ngx_string("proxy_method"), |
| 296 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, | |
| 561 | 297 ngx_conf_set_str_slot, |
| 509 | 298 NGX_HTTP_LOC_CONF_OFFSET, |
| 561 | 299 offsetof(ngx_http_proxy_loc_conf_t, method), |
| 300 NULL }, | |
| 509 | 301 |
| 302 { ngx_string("proxy_pass_request_headers"), | |
| 507 | 303 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, |
| 304 ngx_conf_set_flag_slot, | |
| 305 NGX_HTTP_LOC_CONF_OFFSET, | |
| 509 | 306 offsetof(ngx_http_proxy_loc_conf_t, upstream.pass_request_headers), |
| 507 | 307 NULL }, |
| 308 | |
| 509 | 309 { ngx_string("proxy_pass_request_body"), |
| 507 | 310 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, |
| 311 ngx_conf_set_flag_slot, | |
| 312 NGX_HTTP_LOC_CONF_OFFSET, | |
| 509 | 313 offsetof(ngx_http_proxy_loc_conf_t, upstream.pass_request_body), |
| 507 | 314 NULL }, |
| 315 | |
| 581 | 316 { ngx_string("proxy_buffer_size"), |
| 317 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, | |
| 318 ngx_conf_set_size_slot, | |
| 319 NGX_HTTP_LOC_CONF_OFFSET, | |
| 320 offsetof(ngx_http_proxy_loc_conf_t, upstream.buffer_size), | |
| 321 NULL }, | |
| 322 | |
| 507 | 323 { ngx_string("proxy_read_timeout"), |
| 324 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, | |
| 325 ngx_conf_set_msec_slot, | |
| 326 NGX_HTTP_LOC_CONF_OFFSET, | |
| 327 offsetof(ngx_http_proxy_loc_conf_t, upstream.read_timeout), | |
| 328 NULL }, | |
| 329 | |
| 330 { ngx_string("proxy_buffers"), | |
| 331 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE2, | |
| 332 ngx_conf_set_bufs_slot, | |
| 333 NGX_HTTP_LOC_CONF_OFFSET, | |
| 334 offsetof(ngx_http_proxy_loc_conf_t, upstream.bufs), | |
| 335 NULL }, | |
| 336 | |
| 337 { ngx_string("proxy_busy_buffers_size"), | |
| 338 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, | |
| 339 ngx_conf_set_size_slot, | |
| 340 NGX_HTTP_LOC_CONF_OFFSET, | |
| 529 | 341 offsetof(ngx_http_proxy_loc_conf_t, upstream.busy_buffers_size_conf), |
| 507 | 342 NULL }, |
| 343 | |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
344 #if (NGX_HTTP_CACHE) |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
345 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
346 { ngx_string("proxy_cache"), |
| 3729 | 347 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
|
348 ngx_http_proxy_cache, |
| 2597 | 349 NGX_HTTP_LOC_CONF_OFFSET, |
| 2596 | 350 0, |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
351 NULL }, |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
352 |
| 2672 | 353 { ngx_string("proxy_cache_key"), |
| 3729 | 354 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, |
| 2672 | 355 ngx_http_proxy_cache_key, |
| 356 NGX_HTTP_LOC_CONF_OFFSET, | |
| 357 0, | |
| 358 NULL }, | |
| 359 | |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
360 { ngx_string("proxy_cache_path"), |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
361 NGX_HTTP_MAIN_CONF|NGX_CONF_2MORE, |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
362 ngx_http_file_cache_set_slot, |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
363 0, |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
364 0, |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
365 &ngx_http_proxy_module }, |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
366 |
|
3699
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3692
diff
changeset
|
367 { 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
|
368 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
|
369 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
|
370 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
|
371 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
|
372 NULL }, |
|
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3692
diff
changeset
|
373 |
|
3526
62a4fd1e6e2c
proxy_no_cache and fastcgi_no_cache
Igor Sysoev <igor@sysoev.ru>
parents:
3523
diff
changeset
|
374 { ngx_string("proxy_no_cache"), |
|
62a4fd1e6e2c
proxy_no_cache and fastcgi_no_cache
Igor Sysoev <igor@sysoev.ru>
parents:
3523
diff
changeset
|
375 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
|
376 ngx_http_set_predicate_slot, |
|
3526
62a4fd1e6e2c
proxy_no_cache and fastcgi_no_cache
Igor Sysoev <igor@sysoev.ru>
parents:
3523
diff
changeset
|
377 NGX_HTTP_LOC_CONF_OFFSET, |
|
62a4fd1e6e2c
proxy_no_cache and fastcgi_no_cache
Igor Sysoev <igor@sysoev.ru>
parents:
3523
diff
changeset
|
378 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
|
379 NULL }, |
|
62a4fd1e6e2c
proxy_no_cache and fastcgi_no_cache
Igor Sysoev <igor@sysoev.ru>
parents:
3523
diff
changeset
|
380 |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
381 { ngx_string("proxy_cache_valid"), |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
382 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
|
383 ngx_http_file_cache_valid_set_slot, |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
384 NGX_HTTP_LOC_CONF_OFFSET, |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
385 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
|
386 NULL }, |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
387 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
388 { ngx_string("proxy_cache_min_uses"), |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
389 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
|
390 ngx_conf_set_num_slot, |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
391 NGX_HTTP_LOC_CONF_OFFSET, |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
392 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
|
393 NULL }, |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
394 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
395 { ngx_string("proxy_cache_use_stale"), |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
396 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
|
397 ngx_conf_set_bitmask_slot, |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
398 NGX_HTTP_LOC_CONF_OFFSET, |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
399 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
|
400 &ngx_http_proxy_next_upstream_masks }, |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
401 |
|
2875
6e1941b321b7
proxy_cache_methods and fastcgi_cache_methods
Igor Sysoev <igor@sysoev.ru>
parents:
2786
diff
changeset
|
402 { ngx_string("proxy_cache_methods"), |
|
6e1941b321b7
proxy_cache_methods and fastcgi_cache_methods
Igor Sysoev <igor@sysoev.ru>
parents:
2786
diff
changeset
|
403 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
|
404 ngx_conf_set_bitmask_slot, |
|
6e1941b321b7
proxy_cache_methods and fastcgi_cache_methods
Igor Sysoev <igor@sysoev.ru>
parents:
2786
diff
changeset
|
405 NGX_HTTP_LOC_CONF_OFFSET, |
|
6e1941b321b7
proxy_cache_methods and fastcgi_cache_methods
Igor Sysoev <igor@sysoev.ru>
parents:
2786
diff
changeset
|
406 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
|
407 &ngx_http_upstream_cache_method_mask }, |
|
6e1941b321b7
proxy_cache_methods and fastcgi_cache_methods
Igor Sysoev <igor@sysoev.ru>
parents:
2786
diff
changeset
|
408 |
|
4385
70ba81827472
Cache locks initial implementation.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4377
diff
changeset
|
409 { ngx_string("proxy_cache_lock"), |
|
70ba81827472
Cache locks initial implementation.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4377
diff
changeset
|
410 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
|
411 ngx_conf_set_flag_slot, |
|
70ba81827472
Cache locks initial implementation.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4377
diff
changeset
|
412 NGX_HTTP_LOC_CONF_OFFSET, |
|
70ba81827472
Cache locks initial implementation.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4377
diff
changeset
|
413 offsetof(ngx_http_proxy_loc_conf_t, upstream.cache_lock), |
|
70ba81827472
Cache locks initial implementation.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4377
diff
changeset
|
414 NULL }, |
|
70ba81827472
Cache locks initial implementation.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4377
diff
changeset
|
415 |
|
70ba81827472
Cache locks initial implementation.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4377
diff
changeset
|
416 { ngx_string("proxy_cache_lock_timeout"), |
|
70ba81827472
Cache locks initial implementation.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4377
diff
changeset
|
417 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
|
418 ngx_conf_set_msec_slot, |
|
70ba81827472
Cache locks initial implementation.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4377
diff
changeset
|
419 NGX_HTTP_LOC_CONF_OFFSET, |
|
70ba81827472
Cache locks initial implementation.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4377
diff
changeset
|
420 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
|
421 NULL }, |
|
70ba81827472
Cache locks initial implementation.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4377
diff
changeset
|
422 |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
423 #endif |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
424 |
| 507 | 425 { ngx_string("proxy_temp_path"), |
| 426 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1234, | |
| 427 ngx_conf_set_path_slot, | |
| 428 NGX_HTTP_LOC_CONF_OFFSET, | |
| 429 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
|
430 NULL }, |
| 507 | 431 |
| 432 { ngx_string("proxy_max_temp_file_size"), | |
| 433 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, | |
| 434 ngx_conf_set_size_slot, | |
| 435 NGX_HTTP_LOC_CONF_OFFSET, | |
| 529 | 436 offsetof(ngx_http_proxy_loc_conf_t, upstream.max_temp_file_size_conf), |
| 507 | 437 NULL }, |
| 438 | |
| 439 { ngx_string("proxy_temp_file_write_size"), | |
| 440 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, | |
| 441 ngx_conf_set_size_slot, | |
| 442 NGX_HTTP_LOC_CONF_OFFSET, | |
| 529 | 443 offsetof(ngx_http_proxy_loc_conf_t, upstream.temp_file_write_size_conf), |
| 507 | 444 NULL }, |
| 445 | |
| 446 { ngx_string("proxy_next_upstream"), | |
| 547 | 447 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE, |
| 507 | 448 ngx_conf_set_bitmask_slot, |
| 449 NGX_HTTP_LOC_CONF_OFFSET, | |
| 450 offsetof(ngx_http_proxy_loc_conf_t, upstream.next_upstream), | |
| 451 &ngx_http_proxy_next_upstream_masks }, | |
| 452 | |
| 649 | 453 { ngx_string("proxy_pass_header"), |
| 3729 | 454 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, |
| 649 | 455 ngx_conf_set_str_array_slot, |
| 507 | 456 NGX_HTTP_LOC_CONF_OFFSET, |
| 649 | 457 offsetof(ngx_http_proxy_loc_conf_t, upstream.pass_headers), |
| 507 | 458 NULL }, |
| 459 | |
| 649 | 460 { ngx_string("proxy_hide_header"), |
| 3729 | 461 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, |
| 649 | 462 ngx_conf_set_str_array_slot, |
| 507 | 463 NGX_HTTP_LOC_CONF_OFFSET, |
| 649 | 464 offsetof(ngx_http_proxy_loc_conf_t, upstream.hide_headers), |
| 507 | 465 NULL }, |
| 466 | |
|
2786
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2784
diff
changeset
|
467 { ngx_string("proxy_ignore_headers"), |
|
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2784
diff
changeset
|
468 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
|
469 ngx_conf_set_bitmask_slot, |
|
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2784
diff
changeset
|
470 NGX_HTTP_LOC_CONF_OFFSET, |
|
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2784
diff
changeset
|
471 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
|
472 &ngx_http_upstream_ignore_headers_masks }, |
|
2786
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2784
diff
changeset
|
473 |
|
4126
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
474 { ngx_string("proxy_http_version"), |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
475 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
|
476 ngx_conf_set_enum_slot, |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
477 NGX_HTTP_LOC_CONF_OFFSET, |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
478 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
|
479 &ngx_http_proxy_http_version }, |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
480 |
| 2184 | 481 #if (NGX_HTTP_SSL) |
| 482 | |
| 483 { ngx_string("proxy_ssl_session_reuse"), | |
| 484 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, | |
| 485 ngx_conf_set_flag_slot, | |
| 486 NGX_HTTP_LOC_CONF_OFFSET, | |
| 487 offsetof(ngx_http_proxy_loc_conf_t, upstream.ssl_session_reuse), | |
| 488 NULL }, | |
| 489 | |
| 490 #endif | |
| 491 | |
| 507 | 492 ngx_null_command |
| 493 }; | |
| 494 | |
| 495 | |
| 667 | 496 static ngx_http_module_t ngx_http_proxy_module_ctx = { |
| 509 | 497 ngx_http_proxy_add_variables, /* preconfiguration */ |
| 498 NULL, /* postconfiguration */ | |
| 507 | 499 |
| 500 NULL, /* create main configuration */ | |
| 501 NULL, /* init main configuration */ | |
| 502 | |
| 503 NULL, /* create server configuration */ | |
| 504 NULL, /* merge server configuration */ | |
| 505 | |
| 506 ngx_http_proxy_create_loc_conf, /* create location configration */ | |
| 507 ngx_http_proxy_merge_loc_conf /* merge location configration */ | |
| 508 }; | |
| 509 | |
| 510 | |
| 511 ngx_module_t ngx_http_proxy_module = { | |
| 509 | 512 NGX_MODULE_V1, |
| 507 | 513 &ngx_http_proxy_module_ctx, /* module context */ |
| 514 ngx_http_proxy_commands, /* module directives */ | |
| 515 NGX_HTTP_MODULE, /* module type */ | |
| 541 | 516 NULL, /* init master */ |
| 509 | 517 NULL, /* init module */ |
| 541 | 518 NULL, /* init process */ |
| 519 NULL, /* init thread */ | |
| 520 NULL, /* exit thread */ | |
| 521 NULL, /* exit process */ | |
| 522 NULL, /* exit master */ | |
| 523 NGX_MODULE_V1_PADDING | |
| 507 | 524 }; |
| 525 | |
| 526 | |
| 527 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
|
528 static char ngx_http_proxy_version_11[] = " HTTP/1.1" CRLF; |
| 507 | 529 |
| 509 | 530 |
| 649 | 531 static ngx_keyval_t ngx_http_proxy_headers[] = { |
| 532 { ngx_string("Host"), ngx_string("$proxy_host") }, | |
| 533 { ngx_string("Connection"), ngx_string("close") }, | |
| 534 { ngx_string("Keep-Alive"), ngx_string("") }, | |
| 2067 | 535 { ngx_string("Expect"), ngx_string("") }, |
|
4126
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
536 { ngx_string("Upgrade"), ngx_string("") }, |
| 649 | 537 { ngx_null_string, ngx_null_string } |
| 538 }; | |
| 539 | |
| 540 | |
|
2706
f905a6ab0ca8
hide cacheable Set-Cookie and P3P response headers
Igor Sysoev <igor@sysoev.ru>
parents:
2705
diff
changeset
|
541 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
|
542 ngx_string("Date"), |
|
f905a6ab0ca8
hide cacheable Set-Cookie and P3P response headers
Igor Sysoev <igor@sysoev.ru>
parents:
2705
diff
changeset
|
543 ngx_string("Server"), |
|
f905a6ab0ca8
hide cacheable Set-Cookie and P3P response headers
Igor Sysoev <igor@sysoev.ru>
parents:
2705
diff
changeset
|
544 ngx_string("X-Pad"), |
|
f905a6ab0ca8
hide cacheable Set-Cookie and P3P response headers
Igor Sysoev <igor@sysoev.ru>
parents:
2705
diff
changeset
|
545 ngx_string("X-Accel-Expires"), |
|
f905a6ab0ca8
hide cacheable Set-Cookie and P3P response headers
Igor Sysoev <igor@sysoev.ru>
parents:
2705
diff
changeset
|
546 ngx_string("X-Accel-Redirect"), |
|
f905a6ab0ca8
hide cacheable Set-Cookie and P3P response headers
Igor Sysoev <igor@sysoev.ru>
parents:
2705
diff
changeset
|
547 ngx_string("X-Accel-Limit-Rate"), |
|
f905a6ab0ca8
hide cacheable Set-Cookie and P3P response headers
Igor Sysoev <igor@sysoev.ru>
parents:
2705
diff
changeset
|
548 ngx_string("X-Accel-Buffering"), |
|
f905a6ab0ca8
hide cacheable Set-Cookie and P3P response headers
Igor Sysoev <igor@sysoev.ru>
parents:
2705
diff
changeset
|
549 ngx_string("X-Accel-Charset"), |
|
f905a6ab0ca8
hide cacheable Set-Cookie and P3P response headers
Igor Sysoev <igor@sysoev.ru>
parents:
2705
diff
changeset
|
550 ngx_null_string |
|
f905a6ab0ca8
hide cacheable Set-Cookie and P3P response headers
Igor Sysoev <igor@sysoev.ru>
parents:
2705
diff
changeset
|
551 }; |
|
f905a6ab0ca8
hide cacheable Set-Cookie and P3P response headers
Igor Sysoev <igor@sysoev.ru>
parents:
2705
diff
changeset
|
552 |
|
f905a6ab0ca8
hide cacheable Set-Cookie and P3P response headers
Igor Sysoev <igor@sysoev.ru>
parents:
2705
diff
changeset
|
553 |
|
2705
d040c3786239
do not pass if-... headers for cacheable responses
Igor Sysoev <igor@sysoev.ru>
parents:
2672
diff
changeset
|
554 #if (NGX_HTTP_CACHE) |
|
d040c3786239
do not pass if-... headers for cacheable responses
Igor Sysoev <igor@sysoev.ru>
parents:
2672
diff
changeset
|
555 |
|
d040c3786239
do not pass if-... headers for cacheable responses
Igor Sysoev <igor@sysoev.ru>
parents:
2672
diff
changeset
|
556 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
|
557 { 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
|
558 { ngx_string("Connection"), ngx_string("close") }, |
|
d040c3786239
do not pass if-... headers for cacheable responses
Igor Sysoev <igor@sysoev.ru>
parents:
2672
diff
changeset
|
559 { ngx_string("Keep-Alive"), ngx_string("") }, |
|
d040c3786239
do not pass if-... headers for cacheable responses
Igor Sysoev <igor@sysoev.ru>
parents:
2672
diff
changeset
|
560 { ngx_string("Expect"), ngx_string("") }, |
|
4276
a0f18c78db3b
Fixed Upgrade header clearing with proxy_cache.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4275
diff
changeset
|
561 { ngx_string("Upgrade"), ngx_string("") }, |
|
2705
d040c3786239
do not pass if-... headers for cacheable responses
Igor Sysoev <igor@sysoev.ru>
parents:
2672
diff
changeset
|
562 { ngx_string("If-Modified-Since"), ngx_string("") }, |
|
d040c3786239
do not pass if-... headers for cacheable responses
Igor Sysoev <igor@sysoev.ru>
parents:
2672
diff
changeset
|
563 { ngx_string("If-Unmodified-Since"), ngx_string("") }, |
|
3397
3b2a8a0dca8e
fix the "If-None-Match" header name
Igor Sysoev <igor@sysoev.ru>
parents:
3370
diff
changeset
|
564 { ngx_string("If-None-Match"), ngx_string("") }, |
|
2705
d040c3786239
do not pass if-... headers for cacheable responses
Igor Sysoev <igor@sysoev.ru>
parents:
2672
diff
changeset
|
565 { ngx_string("If-Match"), ngx_string("") }, |
|
d040c3786239
do not pass if-... headers for cacheable responses
Igor Sysoev <igor@sysoev.ru>
parents:
2672
diff
changeset
|
566 { ngx_string("Range"), ngx_string("") }, |
|
d040c3786239
do not pass if-... headers for cacheable responses
Igor Sysoev <igor@sysoev.ru>
parents:
2672
diff
changeset
|
567 { ngx_string("If-Range"), ngx_string("") }, |
|
d040c3786239
do not pass if-... headers for cacheable responses
Igor Sysoev <igor@sysoev.ru>
parents:
2672
diff
changeset
|
568 { ngx_null_string, ngx_null_string } |
|
d040c3786239
do not pass if-... headers for cacheable responses
Igor Sysoev <igor@sysoev.ru>
parents:
2672
diff
changeset
|
569 }; |
|
d040c3786239
do not pass if-... headers for cacheable responses
Igor Sysoev <igor@sysoev.ru>
parents:
2672
diff
changeset
|
570 |
|
2706
f905a6ab0ca8
hide cacheable Set-Cookie and P3P response headers
Igor Sysoev <igor@sysoev.ru>
parents:
2705
diff
changeset
|
571 #endif |
|
f905a6ab0ca8
hide cacheable Set-Cookie and P3P response headers
Igor Sysoev <igor@sysoev.ru>
parents:
2705
diff
changeset
|
572 |
| 509 | 573 |
| 574 static ngx_http_variable_t ngx_http_proxy_vars[] = { | |
| 575 | |
| 637 | 576 { 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
|
577 NGX_HTTP_VAR_CHANGEABLE|NGX_HTTP_VAR_NOCACHEABLE|NGX_HTTP_VAR_NOHASH, 0 }, |
| 509 | 578 |
| 637 | 579 { 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
|
580 NGX_HTTP_VAR_CHANGEABLE|NGX_HTTP_VAR_NOCACHEABLE|NGX_HTTP_VAR_NOHASH, 0 }, |
| 509 | 581 |
| 637 | 582 { ngx_string("proxy_add_x_forwarded_for"), NULL, |
| 583 | 583 ngx_http_proxy_add_x_forwarded_for_variable, 0, NGX_HTTP_VAR_NOHASH, 0 }, |
| 509 | 584 |
| 585 #if 0 | |
| 637 | 586 { ngx_string("proxy_add_via"), NULL, NULL, 0, NGX_HTTP_VAR_NOHASH, 0 }, |
| 509 | 587 #endif |
| 588 | |
| 637 | 589 { ngx_string("proxy_internal_body_length"), NULL, |
| 583 | 590 ngx_http_proxy_internal_body_length_variable, 0, NGX_HTTP_VAR_NOHASH, 0 }, |
| 577 | 591 |
| 637 | 592 { ngx_null_string, NULL, NULL, 0, 0, 0 } |
| 509 | 593 }; |
| 507 | 594 |
| 595 | |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
596 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
|
597 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
|
598 }; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
599 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
600 |
| 507 | 601 static ngx_int_t |
| 602 ngx_http_proxy_handler(ngx_http_request_t *r) | |
| 577 | 603 { |
| 507 | 604 ngx_int_t rc; |
| 605 ngx_http_upstream_t *u; | |
| 1658 | 606 ngx_http_proxy_ctx_t *ctx; |
| 507 | 607 ngx_http_proxy_loc_conf_t *plcf; |
| 577 | 608 |
|
3006
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
2989
diff
changeset
|
609 if (ngx_http_upstream_create(r) != NGX_OK) { |
| 507 | 610 return NGX_HTTP_INTERNAL_SERVER_ERROR; |
| 611 } | |
| 577 | 612 |
| 1658 | 613 ctx = ngx_pcalloc(r->pool, sizeof(ngx_http_proxy_ctx_t)); |
| 614 if (ctx == NULL) { | |
| 615 return NGX_ERROR; | |
| 616 } | |
| 617 | |
| 618 ngx_http_set_ctx(r, ctx, ngx_http_proxy_module); | |
| 619 | |
| 620 plcf = ngx_http_get_module_loc_conf(r, ngx_http_proxy_module); | |
| 621 | |
|
3006
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
2989
diff
changeset
|
622 u = r->upstream; |
|
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
2989
diff
changeset
|
623 |
| 3733 | 624 if (plcf->proxy_lengths == NULL) { |
| 1658 | 625 ctx->vars = plcf->vars; |
|
2391
d88e757cc7d8
delete surplus upstream.schema field
Igor Sysoev <igor@sysoev.ru>
parents:
2285
diff
changeset
|
626 u->schema = plcf->vars.schema; |
| 1658 | 627 #if (NGX_HTTP_SSL) |
| 628 u->ssl = (plcf->upstream.ssl != NULL); | |
| 629 #endif | |
| 630 | |
| 631 } else { | |
| 632 if (ngx_http_proxy_eval(r, ctx, plcf) != NGX_OK) { | |
| 633 return NGX_HTTP_INTERNAL_SERVER_ERROR; | |
| 634 } | |
| 635 } | |
| 636 | |
| 507 | 637 u->output.tag = (ngx_buf_tag_t) &ngx_http_proxy_module; |
| 638 | |
| 639 u->conf = &plcf->upstream; | |
| 640 | |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
641 #if (NGX_HTTP_CACHE) |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
642 u->create_key = ngx_http_proxy_create_key; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
643 #endif |
| 507 | 644 u->create_request = ngx_http_proxy_create_request; |
| 645 u->reinit_request = ngx_http_proxy_reinit_request; | |
| 509 | 646 u->process_header = ngx_http_proxy_process_status_line; |
| 507 | 647 u->abort_request = ngx_http_proxy_abort_request; |
| 648 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
|
649 r->state = 0; |
| 507 | 650 |
| 509 | 651 if (plcf->redirects) { |
| 652 u->rewrite_redirect = ngx_http_proxy_rewrite_redirect; | |
| 653 } | |
| 654 | |
| 649 | 655 u->buffering = plcf->upstream.buffering; |
| 656 | |
| 657 u->pipe = ngx_pcalloc(r->pool, sizeof(ngx_event_pipe_t)); | |
| 658 if (u->pipe == NULL) { | |
| 659 return NGX_HTTP_INTERNAL_SERVER_ERROR; | |
| 581 | 660 } |
| 507 | 661 |
|
4126
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
662 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
|
663 u->pipe->input_ctx = r; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
664 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
665 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
|
666 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
|
667 u->input_filter_ctx = r; |
| 649 | 668 |
| 509 | 669 u->accel = 1; |
| 577 | 670 |
| 507 | 671 rc = ngx_http_read_client_request_body(r, ngx_http_upstream_init); |
| 672 | |
| 673 if (rc >= NGX_HTTP_SPECIAL_RESPONSE) { | |
| 674 return rc; | |
| 675 } | |
| 676 | |
| 677 return NGX_DONE; | |
| 678 } | |
| 679 | |
| 680 | |
| 681 static ngx_int_t | |
| 1658 | 682 ngx_http_proxy_eval(ngx_http_request_t *r, ngx_http_proxy_ctx_t *ctx, |
| 683 ngx_http_proxy_loc_conf_t *plcf) | |
| 684 { | |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
685 u_char *p; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
686 size_t add; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
687 u_short port; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
688 ngx_str_t proxy; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
689 ngx_url_t url; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
690 ngx_http_upstream_t *u; |
| 1658 | 691 |
| 692 if (ngx_http_script_run(r, &proxy, plcf->proxy_lengths->elts, 0, | |
| 693 plcf->proxy_values->elts) | |
| 694 == NULL) | |
| 695 { | |
| 696 return NGX_ERROR; | |
| 697 } | |
| 698 | |
|
3977
2527cdb8d31f
test length of proxy_pass with variables
Igor Sysoev <igor@sysoev.ru>
parents:
3976
diff
changeset
|
699 if (proxy.len > 7 |
|
2527cdb8d31f
test length of proxy_pass with variables
Igor Sysoev <igor@sysoev.ru>
parents:
3976
diff
changeset
|
700 && 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
|
701 { |
| 1658 | 702 add = 7; |
| 703 port = 80; | |
| 704 | |
| 705 #if (NGX_HTTP_SSL) | |
| 706 | |
|
3977
2527cdb8d31f
test length of proxy_pass with variables
Igor Sysoev <igor@sysoev.ru>
parents:
3976
diff
changeset
|
707 } else if (proxy.len > 8 |
|
2527cdb8d31f
test length of proxy_pass with variables
Igor Sysoev <igor@sysoev.ru>
parents:
3976
diff
changeset
|
708 && 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
|
709 { |
| 1658 | 710 add = 8; |
| 711 port = 443; | |
| 712 r->upstream->ssl = 1; | |
| 713 | |
| 714 #endif | |
| 715 | |
| 716 } else { | |
| 717 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, | |
| 718 "invalid URL prefix in \"%V\"", &proxy); | |
| 719 return NGX_ERROR; | |
| 720 } | |
| 721 | |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
722 u = r->upstream; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
723 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
724 u->schema.len = add; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
725 u->schema.data = proxy.data; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
726 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
727 ngx_memzero(&url, sizeof(ngx_url_t)); |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
728 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
729 url.url.len = proxy.len - add; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
730 url.url.data = proxy.data + add; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
731 url.default_port = port; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
732 url.uri_part = 1; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
733 url.no_resolve = 1; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
734 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
735 if (ngx_parse_url(r->pool, &url) != NGX_OK) { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
736 if (url.err) { |
| 1658 | 737 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
|
738 "%s in upstream \"%V\"", url.err, &url.url); |
| 1658 | 739 } |
| 740 | |
| 741 return NGX_ERROR; | |
| 742 } | |
| 743 | |
|
3323
9421e997c2c4
allow "proxy_pass http://$backend" without URI part
Igor Sysoev <igor@sysoev.ru>
parents:
3271
diff
changeset
|
744 if (url.uri.len) { |
|
9421e997c2c4
allow "proxy_pass http://$backend" without URI part
Igor Sysoev <igor@sysoev.ru>
parents:
3271
diff
changeset
|
745 if (url.uri.data[0] == '?') { |
|
9421e997c2c4
allow "proxy_pass http://$backend" without URI part
Igor Sysoev <igor@sysoev.ru>
parents:
3271
diff
changeset
|
746 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
|
747 if (p == NULL) { |
|
9421e997c2c4
allow "proxy_pass http://$backend" without URI part
Igor Sysoev <igor@sysoev.ru>
parents:
3271
diff
changeset
|
748 return NGX_ERROR; |
|
9421e997c2c4
allow "proxy_pass http://$backend" without URI part
Igor Sysoev <igor@sysoev.ru>
parents:
3271
diff
changeset
|
749 } |
|
9421e997c2c4
allow "proxy_pass http://$backend" without URI part
Igor Sysoev <igor@sysoev.ru>
parents:
3271
diff
changeset
|
750 |
|
9421e997c2c4
allow "proxy_pass http://$backend" without URI part
Igor Sysoev <igor@sysoev.ru>
parents:
3271
diff
changeset
|
751 *p++ = '/'; |
|
9421e997c2c4
allow "proxy_pass http://$backend" without URI part
Igor Sysoev <igor@sysoev.ru>
parents:
3271
diff
changeset
|
752 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
|
753 |
|
9421e997c2c4
allow "proxy_pass http://$backend" without URI part
Igor Sysoev <igor@sysoev.ru>
parents:
3271
diff
changeset
|
754 url.uri.len++; |
|
9421e997c2c4
allow "proxy_pass http://$backend" without URI part
Igor Sysoev <igor@sysoev.ru>
parents:
3271
diff
changeset
|
755 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
|
756 } |
|
c3035feb6638
fix case proxy_pass URL is evaluted to http://host?args
Igor Sysoev <igor@sysoev.ru>
parents:
2268
diff
changeset
|
757 } |
|
c3035feb6638
fix case proxy_pass URL is evaluted to http://host?args
Igor Sysoev <igor@sysoev.ru>
parents:
2268
diff
changeset
|
758 |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
759 ctx->vars.key_start = u->schema; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
760 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
761 ngx_http_proxy_set_vars(&url, &ctx->vars); |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
762 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
763 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
|
764 if (u->resolved == NULL) { |
| 1658 | 765 return NGX_ERROR; |
| 766 } | |
| 767 | |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
768 if (url.addrs && url.addrs[0].sockaddr) { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
769 u->resolved->sockaddr = url.addrs[0].sockaddr; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
770 u->resolved->socklen = url.addrs[0].socklen; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
771 u->resolved->naddrs = 1; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
772 u->resolved->host = url.addrs[0].name; |
|
2422
7af1e5fe102c
variable support for unix sockets in fastcgi_pass and proxy_pass
Igor Sysoev <igor@sysoev.ru>
parents:
2391
diff
changeset
|
773 |
|
7af1e5fe102c
variable support for unix sockets in fastcgi_pass and proxy_pass
Igor Sysoev <igor@sysoev.ru>
parents:
2391
diff
changeset
|
774 } else { |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
775 u->resolved->host = url.host; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
776 u->resolved->port = (in_port_t) (url.no_port ? port : url.port); |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
777 u->resolved->no_port = url.no_port; |
|
2422
7af1e5fe102c
variable support for unix sockets in fastcgi_pass and proxy_pass
Igor Sysoev <igor@sysoev.ru>
parents:
2391
diff
changeset
|
778 } |
| 1658 | 779 |
| 780 return NGX_OK; | |
| 781 } | |
| 782 | |
| 783 | |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
784 #if (NGX_HTTP_CACHE) |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
785 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
786 static ngx_int_t |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
787 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
|
788 { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
789 size_t len, loc_len; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
790 u_char *p; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
791 uintptr_t escape; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
792 ngx_str_t *key; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
793 ngx_http_upstream_t *u; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
794 ngx_http_proxy_ctx_t *ctx; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
795 ngx_http_proxy_loc_conf_t *plcf; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
796 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
797 u = r->upstream; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
798 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
799 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
|
800 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
801 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
|
802 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
803 key = ngx_array_push(&r->cache->keys); |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
804 if (key == NULL) { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
805 return NGX_ERROR; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
806 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
807 |
| 2672 | 808 if (plcf->cache_key.value.len) { |
| 809 | |
| 810 if (ngx_http_complex_value(r, &plcf->cache_key, key) != NGX_OK) { | |
| 811 return NGX_ERROR; | |
| 812 } | |
| 813 | |
| 814 return NGX_OK; | |
| 815 } | |
| 816 | |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
817 *key = ctx->vars.key_start; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
818 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
819 key = ngx_array_push(&r->cache->keys); |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
820 if (key == NULL) { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
821 return NGX_ERROR; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
822 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
823 |
|
4377
726a1ca9b52b
Proxy: made proxy_pass with variables more consistent.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4336
diff
changeset
|
824 if (plcf->proxy_lengths && ctx->vars.uri.len) { |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
825 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
826 *key = ctx->vars.uri; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
827 u->uri = ctx->vars.uri; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
828 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
829 return NGX_OK; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
830 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
831 } else if (ctx->vars.uri.len == 0 && r->valid_unparsed_uri && r == r->main) |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
832 { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
833 *key = r->unparsed_uri; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
834 u->uri = r->unparsed_uri; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
835 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
836 return NGX_OK; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
837 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
838 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
839 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
|
840 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
841 if (r->quoted_uri || r->internal) { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
842 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
|
843 r->uri.len - loc_len, NGX_ESCAPE_URI); |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
844 } else { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
845 escape = 0; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
846 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
847 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
848 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
|
849 + sizeof("?") - 1 + r->args.len; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
850 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
851 p = ngx_pnalloc(r->pool, len); |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
852 if (p == NULL) { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
853 return NGX_ERROR; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
854 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
855 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
856 key->data = p; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
857 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
858 if (r->valid_location) { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
859 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
|
860 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
861 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
862 if (escape) { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
863 ngx_escape_uri(p, r->uri.data + loc_len, |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
864 r->uri.len - loc_len, NGX_ESCAPE_URI); |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
865 p += r->uri.len - loc_len + escape; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
866 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
867 } else { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
868 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
|
869 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
870 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
871 if (r->args.len > 0) { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
872 *p++ = '?'; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
873 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
|
874 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
875 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
876 key->len = p - key->data; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
877 u->uri = *key; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
878 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
879 return NGX_OK; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
880 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
881 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
882 #endif |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
883 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
884 |
| 1658 | 885 static ngx_int_t |
| 507 | 886 ngx_http_proxy_create_request(ngx_http_request_t *r) |
| 887 { | |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
888 size_t len, uri_len, loc_len, body_len; |
| 509 | 889 uintptr_t escape; |
| 890 ngx_buf_t *b; | |
| 649 | 891 ngx_str_t method; |
| 892 ngx_uint_t i, unparsed_uri; | |
| 509 | 893 ngx_chain_t *cl, *body; |
| 894 ngx_list_part_t *part; | |
| 895 ngx_table_elt_t *header; | |
| 896 ngx_http_upstream_t *u; | |
| 1658 | 897 ngx_http_proxy_ctx_t *ctx; |
| 509 | 898 ngx_http_script_code_pt code; |
| 899 ngx_http_script_engine_t e, le; | |
| 900 ngx_http_proxy_loc_conf_t *plcf; | |
| 901 ngx_http_script_len_code_pt lcode; | |
| 507 | 902 |
| 903 u = r->upstream; | |
| 904 | |
| 905 plcf = ngx_http_get_module_loc_conf(r, ngx_http_proxy_module); | |
| 906 | |
| 561 | 907 if (u->method.len) { |
| 908 /* HEAD was changed to GET to cache response */ | |
| 909 method = u->method; | |
| 910 method.len++; | |
| 911 | |
| 912 } else if (plcf->method.len) { | |
| 913 method = plcf->method; | |
| 914 | |
| 507 | 915 } else { |
| 561 | 916 method = r->method_name; |
| 917 method.len++; | |
| 507 | 918 } |
| 919 | |
|
4126
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
920 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
|
921 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
922 if (method.len == 5 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
923 && ngx_strncasecmp(method.data, (u_char *) "HEAD ", 5) == 0) |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
924 { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
925 ctx->head = 1; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
926 } |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
927 |
| 1667 | 928 len = method.len + sizeof(ngx_http_proxy_version) - 1 + sizeof(CRLF) - 1; |
| 929 | |
| 507 | 930 escape = 0; |
| 1658 | 931 loc_len = 0; |
| 932 unparsed_uri = 0; | |
| 933 | |
|
4377
726a1ca9b52b
Proxy: made proxy_pass with variables more consistent.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4336
diff
changeset
|
934 if (plcf->proxy_lengths && ctx->vars.uri.len) { |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
935 uri_len = ctx->vars.uri.len; |
| 1658 | 936 |
| 937 } else if (ctx->vars.uri.len == 0 && r->valid_unparsed_uri && r == r->main) | |
| 938 { | |
| 609 | 939 unparsed_uri = 1; |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
940 uri_len = r->unparsed_uri.len; |
| 507 | 941 |
| 942 } else { | |
| 1658 | 943 loc_len = (r->valid_location && ctx->vars.uri.len) ? |
| 944 plcf->location.len : 0; | |
| 945 | |
| 3615 | 946 if (r->quoted_uri || r->space_in_uri || r->internal) { |
| 509 | 947 escape = 2 * ngx_escape_uri(NULL, r->uri.data + loc_len, |
| 948 r->uri.len - loc_len, NGX_ESCAPE_URI); | |
| 507 | 949 } |
| 950 | |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
951 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
|
952 + sizeof("?") - 1 + r->args.len; |
| 507 | 953 } |
| 954 | |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
955 if (uri_len == 0) { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
956 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
|
957 "zero length URI to proxy"); |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
958 return NGX_ERROR; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
959 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
960 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
961 len += uri_len; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
962 |
| 1565 | 963 ngx_http_script_flush_no_cacheable_variables(r, plcf->flushes); |
| 573 | 964 |
| 577 | 965 if (plcf->body_set_len) { |
| 966 le.ip = plcf->body_set_len->elts; | |
| 967 le.request = r; | |
| 968 le.flushed = 1; | |
| 969 body_len = 0; | |
| 970 | |
| 971 while (*(uintptr_t *) le.ip) { | |
| 972 lcode = *(ngx_http_script_len_code_pt *) le.ip; | |
| 973 body_len += lcode(&le); | |
| 974 } | |
| 975 | |
| 1658 | 976 ctx->internal_body_length = body_len; |
| 577 | 977 len += body_len; |
| 978 } | |
| 979 | |
| 509 | 980 le.ip = plcf->headers_set_len->elts; |
| 981 le.request = r; | |
| 573 | 982 le.flushed = 1; |
| 507 | 983 |
| 509 | 984 while (*(uintptr_t *) le.ip) { |
| 985 while (*(uintptr_t *) le.ip) { | |
| 986 lcode = *(ngx_http_script_len_code_pt *) le.ip; | |
| 987 len += lcode(&le); | |
| 988 } | |
| 989 le.ip += sizeof(uintptr_t); | |
| 507 | 990 } |
| 991 | |
| 992 | |
| 509 | 993 if (plcf->upstream.pass_request_headers) { |
| 994 part = &r->headers_in.headers.part; | |
| 995 header = part->elts; | |
| 996 | |
| 997 for (i = 0; /* void */; i++) { | |
| 507 | 998 |
| 509 | 999 if (i >= part->nelts) { |
| 1000 if (part->next == NULL) { | |
| 1001 break; | |
| 1002 } | |
| 1003 | |
| 1004 part = part->next; | |
| 1005 header = part->elts; | |
| 577 | 1006 i = 0; |
| 507 | 1007 } |
| 1008 | |
| 649 | 1009 if (ngx_hash_find(&plcf->headers_set_hash, header[i].hash, |
| 1010 header[i].lowcase_key, header[i].key.len)) | |
| 509 | 1011 { |
| 1012 continue; | |
| 1013 } | |
| 1014 | |
| 1015 len += header[i].key.len + sizeof(": ") - 1 | |
| 1016 + header[i].value.len + sizeof(CRLF) - 1; | |
| 507 | 1017 } |
| 509 | 1018 } |
| 507 | 1019 |
| 1020 | |
| 1021 b = ngx_create_temp_buf(r->pool, len); | |
| 1022 if (b == NULL) { | |
| 1023 return NGX_ERROR; | |
| 1024 } | |
| 1025 | |
| 1026 cl = ngx_alloc_chain_link(r->pool); | |
| 1027 if (cl == NULL) { | |
| 1028 return NGX_ERROR; | |
| 1029 } | |
| 1030 | |
| 1031 cl->buf = b; | |
| 1032 | |
| 1033 | |
| 1034 /* the request line */ | |
| 1035 | |
| 573 | 1036 b->last = ngx_copy(b->last, method.data, method.len); |
| 507 | 1037 |
| 555 | 1038 u->uri.data = b->last; |
| 1039 | |
|
4377
726a1ca9b52b
Proxy: made proxy_pass with variables more consistent.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4336
diff
changeset
|
1040 if (plcf->proxy_lengths && ctx->vars.uri.len) { |
| 1658 | 1041 b->last = ngx_copy(b->last, ctx->vars.uri.data, ctx->vars.uri.len); |
| 1042 | |
| 1043 } else if (unparsed_uri) { | |
| 573 | 1044 b->last = ngx_copy(b->last, r->unparsed_uri.data, r->unparsed_uri.len); |
| 1045 | |
| 507 | 1046 } else { |
| 555 | 1047 if (r->valid_location) { |
| 1658 | 1048 b->last = ngx_copy(b->last, ctx->vars.uri.data, ctx->vars.uri.len); |
| 555 | 1049 } |
| 551 | 1050 |
| 507 | 1051 if (escape) { |
| 509 | 1052 ngx_escape_uri(b->last, r->uri.data + loc_len, |
| 1053 r->uri.len - loc_len, NGX_ESCAPE_URI); | |
| 1054 b->last += r->uri.len - loc_len + escape; | |
| 507 | 1055 |
| 577 | 1056 } else { |
| 573 | 1057 b->last = ngx_copy(b->last, r->uri.data + loc_len, |
| 1058 r->uri.len - loc_len); | |
| 507 | 1059 } |
| 1060 | |
| 1061 if (r->args.len > 0) { | |
| 1062 *b->last++ = '?'; | |
| 573 | 1063 b->last = ngx_copy(b->last, r->args.data, r->args.len); |
| 507 | 1064 } |
| 1065 } | |
| 1066 | |
| 555 | 1067 u->uri.len = b->last - u->uri.data; |
| 1068 | |
|
4126
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1069 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
|
1070 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
|
1071 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
|
1072 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1073 } else { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1074 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
|
1075 sizeof(ngx_http_proxy_version) - 1); |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1076 } |
| 507 | 1077 |
| 577 | 1078 ngx_memzero(&e, sizeof(ngx_http_script_engine_t)); |
| 507 | 1079 |
| 1080 e.ip = plcf->headers_set->elts; | |
| 1081 e.pos = b->last; | |
| 509 | 1082 e.request = r; |
| 573 | 1083 e.flushed = 1; |
| 507 | 1084 |
| 509 | 1085 le.ip = plcf->headers_set_len->elts; |
| 1086 | |
| 1087 while (*(uintptr_t *) le.ip) { | |
| 1088 lcode = *(ngx_http_script_len_code_pt *) le.ip; | |
| 515 | 1089 |
| 1090 /* skip the header line name length */ | |
| 1091 (void) lcode(&le); | |
| 509 | 1092 |
| 1093 if (*(ngx_http_script_len_code_pt *) le.ip) { | |
| 1094 | |
| 1095 for (len = 0; *(uintptr_t *) le.ip; len += lcode(&le)) { | |
| 1096 lcode = *(ngx_http_script_len_code_pt *) le.ip; | |
| 1097 } | |
| 1098 | |
| 1099 e.skip = (len == sizeof(CRLF) - 1) ? 1 : 0; | |
| 1100 | |
| 1101 } else { | |
| 1102 e.skip = 0; | |
| 1103 } | |
| 1104 | |
| 1105 le.ip += sizeof(uintptr_t); | |
| 1106 | |
| 1107 while (*(uintptr_t *) e.ip) { | |
| 1108 code = *(ngx_http_script_code_pt *) e.ip; | |
| 1109 code((ngx_http_script_engine_t *) &e); | |
| 577 | 1110 } |
| 509 | 1111 e.ip += sizeof(uintptr_t); |
| 507 | 1112 } |
| 1113 | |
| 1114 b->last = e.pos; | |
| 1115 | |
| 1116 | |
| 509 | 1117 if (plcf->upstream.pass_request_headers) { |
| 1118 part = &r->headers_in.headers.part; | |
| 1119 header = part->elts; | |
| 577 | 1120 |
| 509 | 1121 for (i = 0; /* void */; i++) { |
| 507 | 1122 |
| 509 | 1123 if (i >= part->nelts) { |
| 1124 if (part->next == NULL) { | |
| 1125 break; | |
| 1126 } | |
| 1127 | |
| 1128 part = part->next; | |
| 1129 header = part->elts; | |
| 577 | 1130 i = 0; |
| 507 | 1131 } |
| 1132 | |
| 649 | 1133 if (ngx_hash_find(&plcf->headers_set_hash, header[i].hash, |
| 1134 header[i].lowcase_key, header[i].key.len)) | |
| 509 | 1135 { |
| 1136 continue; | |
| 1137 } | |
| 507 | 1138 |
| 573 | 1139 b->last = ngx_copy(b->last, header[i].key.data, header[i].key.len); |
| 507 | 1140 |
| 509 | 1141 *b->last++ = ':'; *b->last++ = ' '; |
| 507 | 1142 |
| 573 | 1143 b->last = ngx_copy(b->last, header[i].value.data, |
| 1144 header[i].value.len); | |
| 507 | 1145 |
| 509 | 1146 *b->last++ = CR; *b->last++ = LF; |
| 507 | 1147 |
| 509 | 1148 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
| 1149 "http proxy header: \"%V: %V\"", | |
| 1150 &header[i].key, &header[i].value); | |
| 1151 } | |
| 507 | 1152 } |
| 1153 | |
| 577 | 1154 |
| 507 | 1155 /* add "\r\n" at the header end */ |
| 1156 *b->last++ = CR; *b->last++ = LF; | |
| 1157 | |
| 577 | 1158 if (plcf->body_set) { |
| 1159 e.ip = plcf->body_set->elts; | |
| 1160 e.pos = b->last; | |
| 1161 | |
| 1162 while (*(uintptr_t *) e.ip) { | |
| 1163 code = *(ngx_http_script_code_pt *) e.ip; | |
| 1164 code((ngx_http_script_engine_t *) &e); | |
| 1165 } | |
| 579 | 1166 |
| 1167 b->last = e.pos; | |
| 577 | 1168 } |
| 1169 | |
| 1774 | 1170 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
| 1171 "http proxy header:\n\"%*s\"", | |
| 1172 (size_t) (b->last - b->pos), b->pos); | |
| 507 | 1173 |
| 577 | 1174 if (plcf->body_set == NULL && plcf->upstream.pass_request_body) { |
| 509 | 1175 |
| 1176 body = u->request_bufs; | |
| 1177 u->request_bufs = cl; | |
| 1178 | |
| 1179 while (body) { | |
| 1180 b = ngx_alloc_buf(r->pool); | |
| 1181 if (b == NULL) { | |
| 1182 return NGX_ERROR; | |
| 1183 } | |
| 1184 | |
| 1185 ngx_memcpy(b, body->buf, sizeof(ngx_buf_t)); | |
| 1186 | |
| 1187 cl->next = ngx_alloc_chain_link(r->pool); | |
| 1188 if (cl->next == NULL) { | |
| 1189 return NGX_ERROR; | |
| 1190 } | |
| 1191 | |
| 1192 cl = cl->next; | |
| 1193 cl->buf = b; | |
| 1194 | |
| 1195 body = body->next; | |
| 1196 } | |
| 1197 | |
| 1198 } else { | |
| 1199 u->request_bufs = cl; | |
| 1200 } | |
| 1201 | |
|
4009
3183165283cc
Fixing proxy_set_body and proxy_pass_request_body with SSL.
Maxim Dounin <mdounin@mdounin.ru>
parents:
3977
diff
changeset
|
1202 b->flush = 1; |
| 509 | 1203 cl->next = NULL; |
| 1204 | |
| 507 | 1205 return NGX_OK; |
| 1206 } | |
| 1207 | |
| 1208 | |
| 1209 static ngx_int_t | |
| 1210 ngx_http_proxy_reinit_request(ngx_http_request_t *r) | |
| 1211 { | |
| 1658 | 1212 ngx_http_proxy_ctx_t *ctx; |
| 1213 | |
| 1214 ctx = ngx_http_get_module_ctx(r, ngx_http_proxy_module); | |
| 1215 | |
| 1216 if (ctx == NULL) { | |
| 509 | 1217 return NGX_OK; |
| 1218 } | |
| 1219 | |
|
3627
9061fdb2ed8c
use ngx_http_parse_status_line()
Igor Sysoev <igor@sysoev.ru>
parents:
3615
diff
changeset
|
1220 ctx->status.code = 0; |
|
9061fdb2ed8c
use ngx_http_parse_status_line()
Igor Sysoev <igor@sysoev.ru>
parents:
3615
diff
changeset
|
1221 ctx->status.count = 0; |
|
9061fdb2ed8c
use ngx_http_parse_status_line()
Igor Sysoev <igor@sysoev.ru>
parents:
3615
diff
changeset
|
1222 ctx->status.start = NULL; |
|
9061fdb2ed8c
use ngx_http_parse_status_line()
Igor Sysoev <igor@sysoev.ru>
parents:
3615
diff
changeset
|
1223 ctx->status.end = NULL; |
|
4126
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1224 ctx->state = 0; |
| 509 | 1225 |
| 1226 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
|
1227 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
|
1228 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
|
1229 r->state = 0; |
| 509 | 1230 |
| 1231 return NGX_OK; | |
| 1232 } | |
| 1233 | |
| 1234 | |
| 1235 static ngx_int_t | |
| 1236 ngx_http_proxy_process_status_line(ngx_http_request_t *r) | |
| 1237 { | |
| 3628 | 1238 size_t len; |
| 509 | 1239 ngx_int_t rc; |
| 1240 ngx_http_upstream_t *u; | |
| 1658 | 1241 ngx_http_proxy_ctx_t *ctx; |
| 1242 | |
| 1243 ctx = ngx_http_get_module_ctx(r, ngx_http_proxy_module); | |
| 1244 | |
| 1245 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
|
1246 return NGX_ERROR; |
| 509 | 1247 } |
| 1248 | |
|
3627
9061fdb2ed8c
use ngx_http_parse_status_line()
Igor Sysoev <igor@sysoev.ru>
parents:
3615
diff
changeset
|
1249 u = r->upstream; |
|
9061fdb2ed8c
use ngx_http_parse_status_line()
Igor Sysoev <igor@sysoev.ru>
parents:
3615
diff
changeset
|
1250 |
|
9061fdb2ed8c
use ngx_http_parse_status_line()
Igor Sysoev <igor@sysoev.ru>
parents:
3615
diff
changeset
|
1251 rc = ngx_http_parse_status_line(r, &u->buffer, &ctx->status); |
| 509 | 1252 |
| 1253 if (rc == NGX_AGAIN) { | |
| 1254 return rc; | |
| 1255 } | |
| 1256 | |
|
3627
9061fdb2ed8c
use ngx_http_parse_status_line()
Igor Sysoev <igor@sysoev.ru>
parents:
3615
diff
changeset
|
1257 if (rc == NGX_ERROR) { |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
1258 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
1259 #if (NGX_HTTP_CACHE) |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
1260 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
1261 if (r->cache) { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
1262 r->http_version = NGX_HTTP_VERSION_9; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
1263 return NGX_OK; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
1264 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
1265 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
1266 #endif |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
1267 |
| 509 | 1268 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, |
| 577 | 1269 "upstream sent no valid HTTP/1.0 header"); |
| 509 | 1270 |
| 619 | 1271 #if 0 |
| 509 | 1272 if (u->accel) { |
| 1273 return NGX_HTTP_UPSTREAM_INVALID_HEADER; | |
| 1274 } | |
| 619 | 1275 #endif |
| 509 | 1276 |
| 1277 r->http_version = NGX_HTTP_VERSION_9; | |
| 1616 | 1278 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
|
1279 u->headers_in.connection_close = 1; |
| 577 | 1280 |
| 509 | 1281 return NGX_OK; |
| 1282 } | |
| 1283 | |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
1284 if (u->state) { |
|
3627
9061fdb2ed8c
use ngx_http_parse_status_line()
Igor Sysoev <igor@sysoev.ru>
parents:
3615
diff
changeset
|
1285 u->state->status = ctx->status.code; |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
1286 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
1287 |
|
3627
9061fdb2ed8c
use ngx_http_parse_status_line()
Igor Sysoev <igor@sysoev.ru>
parents:
3615
diff
changeset
|
1288 u->headers_in.status_n = ctx->status.code; |
|
9061fdb2ed8c
use ngx_http_parse_status_line()
Igor Sysoev <igor@sysoev.ru>
parents:
3615
diff
changeset
|
1289 |
| 3628 | 1290 len = ctx->status.end - ctx->status.start; |
| 1291 u->headers_in.status_line.len = len; | |
| 1292 | |
| 1293 u->headers_in.status_line.data = ngx_pnalloc(r->pool, len); | |
| 529 | 1294 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
|
1295 return NGX_ERROR; |
| 509 | 1296 } |
| 573 | 1297 |
| 3628 | 1298 ngx_memcpy(u->headers_in.status_line.data, ctx->status.start, len); |
| 509 | 1299 |
| 1300 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
| 1301 "http proxy status %ui \"%V\"", | |
| 936 | 1302 u->headers_in.status_n, &u->headers_in.status_line); |
| 509 | 1303 |
|
4125
e5df04b05e75
Protocol version parsing in ngx_http_parse_status_line().
Maxim Dounin <mdounin@mdounin.ru>
parents:
4009
diff
changeset
|
1304 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
|
1305 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
|
1306 } |
|
e5df04b05e75
Protocol version parsing in ngx_http_parse_status_line().
Maxim Dounin <mdounin@mdounin.ru>
parents:
4009
diff
changeset
|
1307 |
| 509 | 1308 u->process_header = ngx_http_proxy_process_header; |
| 1309 | |
| 1310 return ngx_http_proxy_process_header(r); | |
| 1311 } | |
| 1312 | |
| 1313 | |
| 1314 static ngx_int_t | |
| 507 | 1315 ngx_http_proxy_process_header(ngx_http_request_t *r) |
| 1316 { | |
| 509 | 1317 ngx_int_t rc; |
| 1318 ngx_table_elt_t *h; | |
|
4126
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1319 ngx_http_upstream_t *u; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1320 ngx_http_proxy_ctx_t *ctx; |
| 509 | 1321 ngx_http_upstream_header_t *hh; |
| 1322 ngx_http_upstream_main_conf_t *umcf; | |
| 1323 | |
| 1324 umcf = ngx_http_get_module_main_conf(r, ngx_http_upstream_module); | |
| 1325 | |
| 2024 | 1326 for ( ;; ) { |
| 509 | 1327 |
| 2256 | 1328 rc = ngx_http_parse_header_line(r, &r->upstream->buffer, 1); |
| 509 | 1329 |
| 1330 if (rc == NGX_OK) { | |
| 1331 | |
| 1332 /* a header line has been parsed successfully */ | |
| 507 | 1333 |
| 509 | 1334 h = ngx_list_push(&r->upstream->headers_in.headers); |
| 1335 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
|
1336 return NGX_ERROR; |
| 509 | 1337 } |
| 1338 | |
| 1339 h->hash = r->header_hash; | |
| 1340 | |
| 1341 h->key.len = r->header_name_end - r->header_name_start; | |
| 1342 h->value.len = r->header_end - r->header_start; | |
| 1343 | |
| 2049 | 1344 h->key.data = ngx_pnalloc(r->pool, |
| 649 | 1345 h->key.len + 1 + h->value.len + 1 + h->key.len); |
| 509 | 1346 if (h->key.data == NULL) { |
|
1699
976db8c6fb64
return NGX_ERROR instead of NGX_HTTP_INTERNAL_SERVER_ERROR in u->parse_header()
Igor Sysoev <igor@sysoev.ru>
parents:
1688
diff
changeset
|
1347 return NGX_ERROR; |
| 509 | 1348 } |
| 1349 | |
| 1350 h->value.data = h->key.data + h->key.len + 1; | |
| 649 | 1351 h->lowcase_key = h->key.data + h->key.len + 1 + h->value.len + 1; |
| 507 | 1352 |
| 509 | 1353 ngx_cpystrn(h->key.data, r->header_name_start, h->key.len + 1); |
| 1354 ngx_cpystrn(h->value.data, r->header_start, h->value.len + 1); | |
| 1355 | |
| 649 | 1356 if (h->key.len == r->lowcase_index) { |
| 1357 ngx_memcpy(h->lowcase_key, r->lowcase_header, h->key.len); | |
| 1358 | |
| 1359 } else { | |
| 2135 | 1360 ngx_strlow(h->lowcase_key, h->key.data, h->key.len); |
| 509 | 1361 } |
| 1362 | |
| 649 | 1363 hh = ngx_hash_find(&umcf->headers_in_hash, h->hash, |
| 1364 h->lowcase_key, h->key.len); | |
| 1365 | |
| 1366 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
|
1367 return NGX_ERROR; |
| 649 | 1368 } |
| 1369 | |
| 509 | 1370 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
| 1371 "http proxy header: \"%V: %V\"", | |
| 1372 &h->key, &h->value); | |
| 1373 | |
| 1374 continue; | |
| 1375 } | |
| 1376 | |
| 1377 if (rc == NGX_HTTP_PARSE_HEADER_DONE) { | |
| 1378 | |
| 1379 /* a whole header has been parsed successfully */ | |
| 1380 | |
| 1381 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
| 1382 "http proxy header done"); | |
| 1383 | |
| 649 | 1384 /* |
| 1385 * if no "Server" and "Date" in header line, | |
| 1386 * then add the special empty headers | |
| 1387 */ | |
| 1388 | |
| 1389 if (r->upstream->headers_in.server == NULL) { | |
| 1390 h = ngx_list_push(&r->upstream->headers_in.headers); | |
| 1391 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
|
1392 return NGX_ERROR; |
| 649 | 1393 } |
| 1394 | |
| 1395 h->hash = ngx_hash(ngx_hash(ngx_hash(ngx_hash( | |
| 1396 ngx_hash('s', 'e'), 'r'), 'v'), 'e'), 'r'); | |
| 1397 | |
|
3516
dd1570b6f237
ngx_str_set() and ngx_str_null()
Igor Sysoev <igor@sysoev.ru>
parents:
3477
diff
changeset
|
1398 ngx_str_set(&h->key, "Server"); |
|
dd1570b6f237
ngx_str_set() and ngx_str_null()
Igor Sysoev <igor@sysoev.ru>
parents:
3477
diff
changeset
|
1399 ngx_str_null(&h->value); |
| 649 | 1400 h->lowcase_key = (u_char *) "server"; |
| 1401 } | |
| 1402 | |
| 1403 if (r->upstream->headers_in.date == NULL) { | |
| 1404 h = ngx_list_push(&r->upstream->headers_in.headers); | |
| 1405 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
|
1406 return NGX_ERROR; |
| 649 | 1407 } |
| 1408 | |
| 1409 h->hash = ngx_hash(ngx_hash(ngx_hash('d', 'a'), 't'), 'e'); | |
| 1410 | |
|
3516
dd1570b6f237
ngx_str_set() and ngx_str_null()
Igor Sysoev <igor@sysoev.ru>
parents:
3477
diff
changeset
|
1411 ngx_str_set(&h->key, "Date"); |
|
dd1570b6f237
ngx_str_set() and ngx_str_null()
Igor Sysoev <igor@sysoev.ru>
parents:
3477
diff
changeset
|
1412 ngx_str_null(&h->value); |
| 649 | 1413 h->lowcase_key = (u_char *) "date"; |
| 1414 } | |
| 1415 | |
|
4126
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1416 /* 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
|
1417 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1418 u = r->upstream; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1419 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1420 if (u->headers_in.chunked) { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1421 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
|
1422 } |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1423 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1424 /* |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1425 * 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
|
1426 * 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
|
1427 */ |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1428 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1429 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
|
1430 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1431 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
|
1432 || 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
|
1433 || ctx->head |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1434 || (!u->headers_in.chunked |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1435 && 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
|
1436 { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1437 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
|
1438 } |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1439 |
| 509 | 1440 return NGX_OK; |
| 1441 } | |
| 1442 | |
| 521 | 1443 if (rc == NGX_AGAIN) { |
| 1444 return NGX_AGAIN; | |
| 1445 } | |
| 1446 | |
| 509 | 1447 /* there was error while a header line parsing */ |
| 1448 | |
| 1449 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, | |
| 619 | 1450 "upstream sent invalid header"); |
| 509 | 1451 |
| 1452 return NGX_HTTP_UPSTREAM_INVALID_HEADER; | |
| 1453 } | |
| 507 | 1454 } |
| 1455 | |
| 1456 | |
|
4126
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1457 static ngx_int_t |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1458 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
|
1459 { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1460 ngx_http_request_t *r = data; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1461 ngx_http_upstream_t *u; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1462 ngx_http_proxy_ctx_t *ctx; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1463 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1464 u = r->upstream; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1465 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
|
1466 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1467 ngx_log_debug4(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
|
1468 "http proxy filter init s:%d h:%d c:%d l:%O", |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1469 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
|
1470 u->headers_in.content_length_n); |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1471 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1472 /* 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
|
1473 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1474 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
|
1475 || 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
|
1476 || ctx->head) |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1477 { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1478 /* 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
|
1479 /* 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
|
1480 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1481 u->pipe->length = 0; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1482 u->length = 0; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1483 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
|
1484 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1485 } else if (u->headers_in.chunked) { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1486 /* chunked */ |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1487 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1488 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
|
1489 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
|
1490 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1491 u->input_filter = ngx_http_proxy_non_buffered_chunked_filter; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1492 u->length = -1; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1493 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1494 } 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
|
1495 /* 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
|
1496 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1497 u->pipe->length = 0; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1498 u->length = 0; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1499 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
|
1500 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1501 } else { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1502 /* content length or connection close */ |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1503 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1504 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
|
1505 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
|
1506 } |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1507 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1508 return NGX_OK; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1509 } |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1510 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1511 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1512 static ngx_int_t |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1513 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
|
1514 { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1515 ngx_buf_t *b; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1516 ngx_chain_t *cl; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1517 ngx_http_request_t *r; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1518 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1519 if (buf->pos == buf->last) { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1520 return NGX_OK; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1521 } |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1522 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1523 if (p->free) { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1524 cl = p->free; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1525 b = cl->buf; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1526 p->free = cl->next; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1527 ngx_free_chain(p->pool, cl); |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1528 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1529 } else { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1530 b = ngx_alloc_buf(p->pool); |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1531 if (b == NULL) { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1532 return NGX_ERROR; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1533 } |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1534 } |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1535 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1536 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
|
1537 b->shadow = buf; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1538 b->tag = p->tag; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1539 b->last_shadow = 1; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1540 b->recycled = 1; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1541 buf->shadow = b; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1542 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1543 cl = ngx_alloc_chain_link(p->pool); |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1544 if (cl == NULL) { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1545 return NGX_ERROR; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1546 } |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1547 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1548 cl->buf = b; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1549 cl->next = NULL; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1550 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1551 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
|
1552 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1553 if (p->in) { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1554 *p->last_in = cl; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1555 } else { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1556 p->in = cl; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1557 } |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1558 p->last_in = &cl->next; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1559 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1560 if (p->length == -1) { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1561 return NGX_OK; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1562 } |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1563 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1564 p->length -= b->last - b->pos; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1565 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1566 if (p->length == 0) { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1567 r = p->input_ctx; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1568 p->upstream_done = 1; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1569 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
|
1570 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1571 } else if (p->length < 0) { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1572 r = p->input_ctx; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1573 p->upstream_done = 1; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1574 |
|
4145
f321e9750c8c
Proxy: logging levels tuned, double logging fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4144
diff
changeset
|
1575 ngx_log_error(NGX_LOG_WARN, r->connection->log, 0, |
|
4205
26c307b8dc3c
Wording fix, "many data" is incorrect.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4145
diff
changeset
|
1576 "upstream sent too much data"); |
|
4126
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1577 } |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1578 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1579 return NGX_OK; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1580 } |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1581 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1582 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1583 static ngx_inline ngx_int_t |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1584 ngx_http_proxy_parse_chunked(ngx_http_request_t *r, ngx_buf_t *buf) |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1585 { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1586 u_char *pos, ch, c; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1587 ngx_int_t rc; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1588 ngx_http_proxy_ctx_t *ctx; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1589 enum { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1590 sw_chunk_start = 0, |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1591 sw_chunk_size, |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1592 sw_chunk_extension, |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1593 sw_chunk_extension_almost_done, |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1594 sw_chunk_data, |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1595 sw_after_data, |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1596 sw_after_data_almost_done, |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1597 sw_last_chunk_extension, |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1598 sw_last_chunk_extension_almost_done, |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1599 sw_trailer, |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1600 sw_trailer_almost_done, |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1601 sw_trailer_header, |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1602 sw_trailer_header_almost_done |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1603 } state; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1604 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1605 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
|
1606 state = ctx->state; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1607 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1608 if (state == sw_chunk_data && ctx->size == 0) { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1609 state = sw_after_data; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1610 } |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1611 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1612 rc = NGX_AGAIN; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1613 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1614 for (pos = buf->pos; pos < buf->last; pos++) { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1615 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1616 ch = *pos; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1617 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1618 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
|
1619 "http proxy chunked byte: %02Xd s:%d", ch, state); |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1620 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1621 switch (state) { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1622 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1623 case sw_chunk_start: |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1624 if (ch >= '0' && ch <= '9') { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1625 state = sw_chunk_size; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1626 ctx->size = ch - '0'; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1627 break; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1628 } |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1629 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1630 c = (u_char) (ch | 0x20); |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1631 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1632 if (c >= 'a' && c <= 'f') { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1633 state = sw_chunk_size; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1634 ctx->size = c - 'a' + 10; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1635 break; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1636 } |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1637 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1638 goto invalid; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1639 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1640 case sw_chunk_size: |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1641 if (ch >= '0' && ch <= '9') { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1642 ctx->size = ctx->size * 16 + (ch - '0'); |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1643 break; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1644 } |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1645 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1646 c = (u_char) (ch | 0x20); |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1647 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1648 if (c >= 'a' && c <= 'f') { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1649 ctx->size = ctx->size * 16 + (c - 'a' + 10); |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1650 break; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1651 } |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1652 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1653 if (ctx->size == 0) { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1654 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1655 switch (ch) { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1656 case CR: |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1657 state = sw_last_chunk_extension_almost_done; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1658 break; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1659 case LF: |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1660 state = sw_trailer; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1661 break; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1662 case ';': |
|
4144
7b77428909ed
Proxy: whitespaces after chunk size allowed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4126
diff
changeset
|
1663 case ' ': |
|
7b77428909ed
Proxy: whitespaces after chunk size allowed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4126
diff
changeset
|
1664 case '\t': |
|
4126
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1665 state = sw_last_chunk_extension; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1666 break; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1667 default: |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1668 goto invalid; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1669 } |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1670 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1671 break; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1672 } |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1673 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1674 switch (ch) { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1675 case CR: |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1676 state = sw_chunk_extension_almost_done; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1677 break; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1678 case LF: |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1679 state = sw_chunk_data; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1680 break; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1681 case ';': |
|
4144
7b77428909ed
Proxy: whitespaces after chunk size allowed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4126
diff
changeset
|
1682 case ' ': |
|
7b77428909ed
Proxy: whitespaces after chunk size allowed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4126
diff
changeset
|
1683 case '\t': |
|
4126
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1684 state = sw_chunk_extension; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1685 break; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1686 default: |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1687 goto invalid; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1688 } |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1689 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1690 break; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1691 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1692 case sw_chunk_extension: |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1693 switch (ch) { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1694 case CR: |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1695 state = sw_chunk_extension_almost_done; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1696 break; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1697 case LF: |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1698 state = sw_chunk_data; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1699 } |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1700 break; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1701 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1702 case sw_chunk_extension_almost_done: |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1703 if (ch == LF) { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1704 state = sw_chunk_data; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1705 break; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1706 } |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1707 goto invalid; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1708 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1709 case sw_chunk_data: |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1710 rc = NGX_OK; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1711 goto data; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1712 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1713 case sw_after_data: |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1714 switch (ch) { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1715 case CR: |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1716 state = sw_after_data_almost_done; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1717 break; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1718 case LF: |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1719 state = sw_chunk_start; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1720 } |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1721 break; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1722 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1723 case sw_after_data_almost_done: |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1724 if (ch == LF) { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1725 state = sw_chunk_start; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1726 break; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1727 } |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1728 goto invalid; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1729 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1730 case sw_last_chunk_extension: |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1731 switch (ch) { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1732 case CR: |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1733 state = sw_last_chunk_extension_almost_done; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1734 break; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1735 case LF: |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1736 state = sw_trailer; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1737 } |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1738 break; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1739 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1740 case sw_last_chunk_extension_almost_done: |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1741 if (ch == LF) { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1742 state = sw_trailer; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1743 break; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1744 } |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1745 goto invalid; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1746 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1747 case sw_trailer: |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1748 switch (ch) { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1749 case CR: |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1750 state = sw_trailer_almost_done; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1751 break; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1752 case LF: |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1753 goto done; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1754 default: |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1755 state = sw_trailer_header; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1756 } |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1757 break; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1758 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1759 case sw_trailer_almost_done: |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1760 if (ch == LF) { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1761 goto done; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1762 } |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1763 goto invalid; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1764 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1765 case sw_trailer_header: |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1766 switch (ch) { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1767 case CR: |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1768 state = sw_trailer_header_almost_done; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1769 break; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1770 case LF: |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1771 state = sw_trailer; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1772 } |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1773 break; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1774 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1775 case sw_trailer_header_almost_done: |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1776 if (ch == LF) { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1777 state = sw_trailer; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1778 break; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1779 } |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1780 goto invalid; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1781 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1782 } |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1783 } |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1784 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1785 data: |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1786 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1787 ctx->state = state; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1788 buf->pos = pos; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1789 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1790 switch (state) { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1791 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1792 case sw_chunk_start: |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1793 ctx->length = 3 /* "0" LF LF */; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1794 break; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1795 case sw_chunk_size: |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1796 ctx->length = 2 /* LF LF */ |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1797 + (ctx->size ? ctx->size + 4 /* LF "0" LF LF */ : 0); |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1798 break; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1799 case sw_chunk_extension: |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1800 case sw_chunk_extension_almost_done: |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1801 ctx->length = 1 /* LF */ + ctx->size + 4 /* LF "0" LF LF */; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1802 break; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1803 case sw_chunk_data: |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1804 ctx->length = ctx->size + 4 /* LF "0" LF LF */; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1805 break; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1806 case sw_after_data: |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1807 case sw_after_data_almost_done: |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1808 ctx->length = 4 /* LF "0" LF LF */; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1809 break; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1810 case sw_last_chunk_extension: |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1811 case sw_last_chunk_extension_almost_done: |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1812 ctx->length = 2 /* LF LF */; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1813 break; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1814 case sw_trailer: |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1815 case sw_trailer_almost_done: |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1816 ctx->length = 1 /* LF */; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1817 break; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1818 case sw_trailer_header: |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1819 case sw_trailer_header_almost_done: |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1820 ctx->length = 2 /* LF LF */; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1821 break; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1822 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1823 } |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1824 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1825 return rc; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1826 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1827 done: |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1828 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1829 return NGX_DONE; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1830 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1831 invalid: |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1832 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1833 return NGX_ERROR; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1834 } |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1835 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1836 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1837 static ngx_int_t |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1838 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
|
1839 { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1840 ngx_int_t rc; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1841 ngx_buf_t *b, **prev; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1842 ngx_chain_t *cl; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1843 ngx_http_request_t *r; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1844 ngx_http_proxy_ctx_t *ctx; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1845 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1846 if (buf->pos == buf->last) { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1847 return NGX_OK; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1848 } |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1849 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1850 r = p->input_ctx; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1851 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
|
1852 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1853 b = NULL; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1854 prev = &buf->shadow; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1855 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1856 for ( ;; ) { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1857 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1858 rc = ngx_http_proxy_parse_chunked(r, buf); |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1859 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1860 if (rc == NGX_OK) { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1861 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1862 /* a chunk has been parsed successfully */ |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1863 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1864 if (p->free) { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1865 cl = p->free; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1866 b = cl->buf; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1867 p->free = cl->next; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1868 ngx_free_chain(p->pool, cl); |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1869 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1870 } else { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1871 b = ngx_alloc_buf(p->pool); |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1872 if (b == NULL) { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1873 return NGX_ERROR; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1874 } |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1875 } |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1876 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1877 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
|
1878 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1879 b->pos = buf->pos; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1880 b->start = buf->start; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1881 b->end = buf->end; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1882 b->tag = p->tag; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1883 b->temporary = 1; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1884 b->recycled = 1; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1885 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1886 *prev = b; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1887 prev = &b->shadow; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1888 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1889 cl = ngx_alloc_chain_link(p->pool); |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1890 if (cl == NULL) { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1891 return NGX_ERROR; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1892 } |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1893 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1894 cl->buf = b; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1895 cl->next = NULL; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1896 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1897 if (p->in) { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1898 *p->last_in = cl; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1899 } else { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1900 p->in = cl; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1901 } |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1902 p->last_in = &cl->next; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1903 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1904 /* STUB */ b->num = buf->num; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1905 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1906 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
|
1907 "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
|
1908 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1909 if (buf->last - buf->pos >= ctx->size) { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1910 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1911 buf->pos += ctx->size; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1912 b->last = buf->pos; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1913 ctx->size = 0; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1914 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1915 continue; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1916 } |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1917 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1918 ctx->size -= buf->last - buf->pos; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1919 buf->pos = buf->last; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1920 b->last = buf->last; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1921 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1922 continue; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1923 } |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1924 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1925 if (rc == NGX_DONE) { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1926 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1927 /* 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
|
1928 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1929 p->upstream_done = 1; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1930 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
|
1931 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1932 break; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1933 } |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1934 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1935 if (rc == NGX_AGAIN) { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1936 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1937 /* 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
|
1938 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1939 p->length = ctx->length; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1940 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1941 break; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1942 } |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1943 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1944 /* invalid response */ |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1945 |
|
4145
f321e9750c8c
Proxy: logging levels tuned, double logging fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4144
diff
changeset
|
1946 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
|
1947 "upstream sent invalid chunked response"); |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1948 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1949 return NGX_ERROR; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1950 } |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1951 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1952 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
|
1953 "http proxy chunked state %d, length %d", |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1954 ctx->state, p->length); |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1955 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1956 if (b) { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1957 b->shadow = buf; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1958 b->last_shadow = 1; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1959 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1960 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
|
1961 "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
|
1962 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1963 return NGX_OK; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1964 } |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1965 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1966 /* 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
|
1967 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1968 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
|
1969 return NGX_ERROR; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1970 } |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1971 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1972 return NGX_OK; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1973 } |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1974 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1975 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1976 static ngx_int_t |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1977 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
|
1978 { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1979 ngx_http_request_t *r = data; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1980 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1981 ngx_buf_t *b; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1982 ngx_chain_t *cl, **ll; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1983 ngx_http_upstream_t *u; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1984 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1985 u = r->upstream; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1986 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1987 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
|
1988 ll = &cl->next; |
|
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 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1991 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
|
1992 if (cl == NULL) { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1993 return NGX_ERROR; |
|
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 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1996 *ll = cl; |
|
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 cl->buf->flush = 1; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
1999 cl->buf->memory = 1; |
|
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 b = &u->buffer; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2002 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2003 cl->buf->pos = b->last; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2004 b->last += bytes; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2005 cl->buf->last = b->last; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2006 cl->buf->tag = u->output.tag; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2007 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2008 if (u->length == -1) { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2009 return NGX_OK; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2010 } |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2011 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2012 u->length -= bytes; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2013 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2014 if (u->length == 0) { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2015 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
|
2016 } |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2017 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2018 return NGX_OK; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2019 } |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2020 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2021 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2022 static ngx_int_t |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2023 ngx_http_proxy_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
|
2024 { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2025 ngx_http_request_t *r = data; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2026 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2027 ngx_int_t rc; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2028 ngx_buf_t *b, *buf; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2029 ngx_chain_t *cl, **ll; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2030 ngx_http_upstream_t *u; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2031 ngx_http_proxy_ctx_t *ctx; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2032 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2033 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
|
2034 u = r->upstream; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2035 buf = &u->buffer; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2036 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2037 buf->pos = buf->last; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2038 buf->last += bytes; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2039 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2040 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
|
2041 ll = &cl->next; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2042 } |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2043 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2044 for ( ;; ) { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2045 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2046 rc = ngx_http_proxy_parse_chunked(r, buf); |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2047 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2048 if (rc == NGX_OK) { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2049 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2050 /* a chunk has been parsed successfully */ |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2051 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2052 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
|
2053 if (cl == NULL) { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2054 return NGX_ERROR; |
|
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 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2057 *ll = cl; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2058 ll = &cl->next; |
|
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 b = cl->buf; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2061 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2062 b->flush = 1; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2063 b->memory = 1; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2064 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2065 b->pos = buf->pos; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2066 b->tag = u->output.tag; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2067 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2068 if (buf->last - buf->pos >= ctx->size) { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2069 buf->pos += ctx->size; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2070 b->last = buf->pos; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2071 ctx->size = 0; |
|
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 } else { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2074 ctx->size -= buf->last - buf->pos; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2075 buf->pos = buf->last; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2076 b->last = buf->last; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2077 } |
|
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 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
|
2080 "http proxy out buf %p %z", |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2081 b->pos, b->last - b->pos); |
|
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 continue; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2084 } |
|
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 if (rc == NGX_DONE) { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2087 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2088 /* 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
|
2089 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2090 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
|
2091 u->length = 0; |
|
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 break; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2094 } |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2095 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2096 if (rc == NGX_AGAIN) { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2097 break; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2098 } |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2099 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2100 /* invalid response */ |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2101 |
|
4145
f321e9750c8c
Proxy: logging levels tuned, double logging fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4144
diff
changeset
|
2102 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
|
2103 "upstream sent invalid chunked response"); |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2104 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2105 return NGX_ERROR; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2106 } |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2107 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2108 /* provide continuous buffer for subrequests in memory */ |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2109 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2110 if (r->subrequest_in_memory) { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2111 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2112 cl = u->out_bufs; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2113 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2114 if (cl) { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2115 buf->pos = cl->buf->pos; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2116 } |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2117 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2118 buf->last = buf->pos; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2119 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2120 for (cl = u->out_bufs; cl; cl = cl->next) { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2121 ngx_log_debug3(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
|
2122 "http proxy in memory %p-%p %uz", |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2123 cl->buf->pos, cl->buf->last, ngx_buf_size(cl->buf)); |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2124 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2125 if (buf->last == cl->buf->pos) { |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2126 buf->last = cl->buf->last; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2127 continue; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2128 } |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2129 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2130 buf->last = ngx_movemem(buf->last, cl->buf->pos, |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2131 cl->buf->last - cl->buf->pos); |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2132 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2133 cl->buf->pos = buf->last - (cl->buf->last - cl->buf->pos); |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2134 cl->buf->last = buf->last; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2135 } |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2136 } |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2137 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2138 return NGX_OK; |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2139 } |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2140 |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2141 |
| 507 | 2142 static void |
| 2143 ngx_http_proxy_abort_request(ngx_http_request_t *r) | |
| 2144 { | |
| 2145 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
| 2146 "abort http proxy request"); | |
| 577 | 2147 |
| 507 | 2148 return; |
| 2149 } | |
| 2150 | |
| 2151 | |
| 2152 static void | |
| 2153 ngx_http_proxy_finalize_request(ngx_http_request_t *r, ngx_int_t rc) | |
| 577 | 2154 { |
| 507 | 2155 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
| 2156 "finalize http proxy request"); | |
| 2157 | |
| 2158 return; | |
| 2159 } | |
| 2160 | |
| 2161 | |
| 573 | 2162 static ngx_int_t |
| 2163 ngx_http_proxy_host_variable(ngx_http_request_t *r, | |
| 2164 ngx_http_variable_value_t *v, uintptr_t data) | |
| 507 | 2165 { |
| 1658 | 2166 ngx_http_proxy_ctx_t *ctx; |
| 2167 | |
| 2168 ctx = ngx_http_get_module_ctx(r, ngx_http_proxy_module); | |
| 2169 | |
| 2170 if (ctx == NULL) { | |
| 2171 v->not_found = 1; | |
| 2172 return NGX_OK; | |
| 2173 } | |
| 2174 | |
| 2175 v->len = ctx->vars.host_header.len; | |
| 577 | 2176 v->valid = 1; |
| 1565 | 2177 v->no_cacheable = 0; |
| 573 | 2178 v->not_found = 0; |
| 1658 | 2179 v->data = ctx->vars.host_header.data; |
| 507 | 2180 |
| 573 | 2181 return NGX_OK; |
| 507 | 2182 } |
| 2183 | |
| 2184 | |
| 573 | 2185 static ngx_int_t |
| 2186 ngx_http_proxy_port_variable(ngx_http_request_t *r, | |
| 2187 ngx_http_variable_value_t *v, uintptr_t data) | |
| 507 | 2188 { |
| 1658 | 2189 ngx_http_proxy_ctx_t *ctx; |
| 2190 | |
| 2191 ctx = ngx_http_get_module_ctx(r, ngx_http_proxy_module); | |
| 2192 | |
| 2193 if (ctx == NULL) { | |
| 2194 v->not_found = 1; | |
| 2195 return NGX_OK; | |
| 2196 } | |
| 2197 | |
| 2198 v->len = ctx->vars.port.len; | |
| 577 | 2199 v->valid = 1; |
| 1565 | 2200 v->no_cacheable = 0; |
| 573 | 2201 v->not_found = 0; |
| 1658 | 2202 v->data = ctx->vars.port.data; |
| 509 | 2203 |
| 573 | 2204 return NGX_OK; |
| 509 | 2205 } |
| 2206 | |
| 2207 | |
| 573 | 2208 static ngx_int_t |
| 509 | 2209 ngx_http_proxy_add_x_forwarded_for_variable(ngx_http_request_t *r, |
| 573 | 2210 ngx_http_variable_value_t *v, uintptr_t data) |
| 509 | 2211 { |
| 573 | 2212 u_char *p; |
| 509 | 2213 |
| 577 | 2214 v->valid = 1; |
| 1565 | 2215 v->no_cacheable = 0; |
| 573 | 2216 v->not_found = 0; |
| 509 | 2217 |
| 2218 if (r->headers_in.x_forwarded_for == NULL) { | |
| 573 | 2219 v->len = r->connection->addr_text.len; |
| 2220 v->data = r->connection->addr_text.data; | |
| 2221 return NGX_OK; | |
| 509 | 2222 } |
| 2223 | |
| 573 | 2224 v->len = r->headers_in.x_forwarded_for->value.len |
| 2225 + sizeof(", ") - 1 + r->connection->addr_text.len; | |
| 509 | 2226 |
| 2049 | 2227 p = ngx_pnalloc(r->pool, v->len); |
| 509 | 2228 if (p == NULL) { |
| 573 | 2229 return NGX_ERROR; |
| 509 | 2230 } |
| 2231 | |
| 573 | 2232 v->data = p; |
| 509 | 2233 |
| 573 | 2234 p = ngx_copy(p, r->headers_in.x_forwarded_for->value.data, |
| 2235 r->headers_in.x_forwarded_for->value.len); | |
| 509 | 2236 |
| 2237 *p++ = ','; *p++ = ' '; | |
| 2238 | |
| 2239 ngx_memcpy(p, r->connection->addr_text.data, r->connection->addr_text.len); | |
| 2240 | |
| 573 | 2241 return NGX_OK; |
| 509 | 2242 } |
| 2243 | |
| 2244 | |
| 2245 static ngx_int_t | |
| 577 | 2246 ngx_http_proxy_internal_body_length_variable(ngx_http_request_t *r, |
| 2247 ngx_http_variable_value_t *v, uintptr_t data) | |
| 2248 { | |
| 1658 | 2249 ngx_http_proxy_ctx_t *ctx; |
| 2250 | |
| 2251 ctx = ngx_http_get_module_ctx(r, ngx_http_proxy_module); | |
| 2252 | |
| 2253 if (ctx == NULL) { | |
| 577 | 2254 v->not_found = 1; |
| 2255 return NGX_OK; | |
| 2256 } | |
| 2257 | |
| 2258 v->valid = 1; | |
| 1565 | 2259 v->no_cacheable = 0; |
| 577 | 2260 v->not_found = 0; |
| 2261 | |
| 2049 | 2262 v->data = ngx_pnalloc(r->connection->pool, NGX_SIZE_T_LEN); |
| 577 | 2263 |
| 2264 if (v->data == NULL) { | |
| 2265 return NGX_ERROR; | |
| 2266 } | |
| 2267 | |
| 1658 | 2268 v->len = ngx_sprintf(v->data, "%uz", ctx->internal_body_length) - v->data; |
| 577 | 2269 |
| 2270 return NGX_OK; | |
| 2271 } | |
| 2272 | |
| 2273 | |
| 2274 static ngx_int_t | |
| 509 | 2275 ngx_http_proxy_rewrite_redirect(ngx_http_request_t *r, ngx_table_elt_t *h, |
| 2276 size_t prefix) | |
| 2277 { | |
|
4462
a73c63bdce32
Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a
Valentin Bartenev <vbart@nginx.com>
parents:
4461
diff
changeset
|
2278 size_t len; |
| 509 | 2279 ngx_int_t rc; |
| 2280 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
|
2281 ngx_http_proxy_rewrite_t *pr; |
| 509 | 2282 ngx_http_proxy_loc_conf_t *plcf; |
| 2283 | |
| 2284 plcf = ngx_http_get_module_loc_conf(r, ngx_http_proxy_module); | |
| 2285 | |
| 2286 pr = plcf->redirects->elts; | |
| 2287 | |
| 2288 if (pr == NULL) { | |
| 2289 return NGX_DECLINED; | |
| 2290 } | |
| 2291 | |
|
4462
a73c63bdce32
Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a
Valentin Bartenev <vbart@nginx.com>
parents:
4461
diff
changeset
|
2292 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
|
2293 |
| 509 | 2294 for (i = 0; i < plcf->redirects->nelts; i++) { |
|
4462
a73c63bdce32
Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a
Valentin Bartenev <vbart@nginx.com>
parents:
4461
diff
changeset
|
2295 rc = pr[i].handler(r, h, prefix, len, &pr[i]); |
| 509 | 2296 |
| 2297 if (rc != NGX_DECLINED) { | |
| 2298 return rc; | |
| 2299 } | |
| 2300 } | |
| 2301 | |
| 2302 return NGX_DECLINED; | |
| 2303 } | |
| 2304 | |
| 2305 | |
| 2306 static ngx_int_t | |
|
4461
103587c7ae5f
Proxy: renamed some "proxy_redirect" related declarations to a more general and
Valentin Bartenev <vbart@nginx.com>
parents:
4422
diff
changeset
|
2307 ngx_http_proxy_rewrite_complex_handler(ngx_http_request_t *r, |
|
4462
a73c63bdce32
Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a
Valentin Bartenev <vbart@nginx.com>
parents:
4461
diff
changeset
|
2308 ngx_table_elt_t *h, size_t prefix, size_t len, ngx_http_proxy_rewrite_t *pr) |
| 509 | 2309 { |
|
4462
a73c63bdce32
Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a
Valentin Bartenev <vbart@nginx.com>
parents:
4461
diff
changeset
|
2310 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
|
2311 |
|
103587c7ae5f
Proxy: renamed some "proxy_redirect" related declarations to a more general and
Valentin Bartenev <vbart@nginx.com>
parents:
4422
diff
changeset
|
2312 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
|
2313 return NGX_ERROR; |
|
99437094e86f
Proxy: added variables and regexp support to the first parameter of
Valentin Bartenev <vbart@nginx.com>
parents:
4276
diff
changeset
|
2314 } |
|
99437094e86f
Proxy: added variables and regexp support to the first parameter of
Valentin Bartenev <vbart@nginx.com>
parents:
4276
diff
changeset
|
2315 |
|
4462
a73c63bdce32
Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a
Valentin Bartenev <vbart@nginx.com>
parents:
4461
diff
changeset
|
2316 if (pattern.len > len |
|
4461
103587c7ae5f
Proxy: renamed some "proxy_redirect" related declarations to a more general and
Valentin Bartenev <vbart@nginx.com>
parents:
4422
diff
changeset
|
2317 || ngx_rstrncmp(h->value.data + prefix, pattern.data, |
|
103587c7ae5f
Proxy: renamed some "proxy_redirect" related declarations to a more general and
Valentin Bartenev <vbart@nginx.com>
parents:
4422
diff
changeset
|
2318 pattern.len) != 0) |
| 509 | 2319 { |
| 2320 return NGX_DECLINED; | |
| 2321 } | |
| 2322 | |
|
4336
99437094e86f
Proxy: added variables and regexp support to the first parameter of
Valentin Bartenev <vbart@nginx.com>
parents:
4276
diff
changeset
|
2323 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
|
2324 return NGX_ERROR; |
|
99437094e86f
Proxy: added variables and regexp support to the first parameter of
Valentin Bartenev <vbart@nginx.com>
parents:
4276
diff
changeset
|
2325 } |
|
99437094e86f
Proxy: added variables and regexp support to the first parameter of
Valentin Bartenev <vbart@nginx.com>
parents:
4276
diff
changeset
|
2326 |
|
4462
a73c63bdce32
Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a
Valentin Bartenev <vbart@nginx.com>
parents:
4461
diff
changeset
|
2327 return ngx_http_proxy_rewrite(r, h, prefix, pattern.len, &replacement); |
| 509 | 2328 } |
| 2329 | |
| 2330 | |
|
4336
99437094e86f
Proxy: added variables and regexp support to the first parameter of
Valentin Bartenev <vbart@nginx.com>
parents:
4276
diff
changeset
|
2331 #if (NGX_PCRE) |
|
99437094e86f
Proxy: added variables and regexp support to the first parameter of
Valentin Bartenev <vbart@nginx.com>
parents:
4276
diff
changeset
|
2332 |
| 509 | 2333 static ngx_int_t |
|
4461
103587c7ae5f
Proxy: renamed some "proxy_redirect" related declarations to a more general and
Valentin Bartenev <vbart@nginx.com>
parents:
4422
diff
changeset
|
2334 ngx_http_proxy_rewrite_regex_handler(ngx_http_request_t *r, ngx_table_elt_t *h, |
|
4462
a73c63bdce32
Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a
Valentin Bartenev <vbart@nginx.com>
parents:
4461
diff
changeset
|
2335 size_t prefix, size_t len, ngx_http_proxy_rewrite_t *pr) |
| 509 | 2336 { |
|
4462
a73c63bdce32
Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a
Valentin Bartenev <vbart@nginx.com>
parents:
4461
diff
changeset
|
2337 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
|
2338 |
|
a73c63bdce32
Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a
Valentin Bartenev <vbart@nginx.com>
parents:
4461
diff
changeset
|
2339 pattern.len = len; |
|
4461
103587c7ae5f
Proxy: renamed some "proxy_redirect" related declarations to a more general and
Valentin Bartenev <vbart@nginx.com>
parents:
4422
diff
changeset
|
2340 pattern.data = h->value.data + prefix; |
|
103587c7ae5f
Proxy: renamed some "proxy_redirect" related declarations to a more general and
Valentin Bartenev <vbart@nginx.com>
parents:
4422
diff
changeset
|
2341 |
|
103587c7ae5f
Proxy: renamed some "proxy_redirect" related declarations to a more general and
Valentin Bartenev <vbart@nginx.com>
parents:
4422
diff
changeset
|
2342 if (ngx_http_regex_exec(r, pr->pattern.regex, &pattern) != NGX_OK) { |
| 509 | 2343 return NGX_DECLINED; |
| 2344 } | |
| 2345 | |
|
4336
99437094e86f
Proxy: added variables and regexp support to the first parameter of
Valentin Bartenev <vbart@nginx.com>
parents:
4276
diff
changeset
|
2346 if (ngx_http_complex_value(r, &pr->replacement, &replacement) != NGX_OK) { |
| 509 | 2347 return NGX_ERROR; |
| 2348 } | |
| 2349 | |
|
4462
a73c63bdce32
Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a
Valentin Bartenev <vbart@nginx.com>
parents:
4461
diff
changeset
|
2350 if (prefix == 0 && h->value.len == len) { |
|
4398
3d51ba7f347b
Fixed: proxy_redirect with regex might broke Refresh header.
Valentin Bartenev <vbart@nginx.com>
parents:
4385
diff
changeset
|
2351 h->value = replacement; |
|
3d51ba7f347b
Fixed: proxy_redirect with regex might broke Refresh header.
Valentin Bartenev <vbart@nginx.com>
parents:
4385
diff
changeset
|
2352 return NGX_OK; |
|
3d51ba7f347b
Fixed: proxy_redirect with regex might broke Refresh header.
Valentin Bartenev <vbart@nginx.com>
parents:
4385
diff
changeset
|
2353 } |
|
3d51ba7f347b
Fixed: proxy_redirect with regex might broke Refresh header.
Valentin Bartenev <vbart@nginx.com>
parents:
4385
diff
changeset
|
2354 |
|
4462
a73c63bdce32
Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a
Valentin Bartenev <vbart@nginx.com>
parents:
4461
diff
changeset
|
2355 return ngx_http_proxy_rewrite(r, h, prefix, len, &replacement); |
|
a73c63bdce32
Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a
Valentin Bartenev <vbart@nginx.com>
parents:
4461
diff
changeset
|
2356 } |
|
a73c63bdce32
Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a
Valentin Bartenev <vbart@nginx.com>
parents:
4461
diff
changeset
|
2357 |
|
a73c63bdce32
Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a
Valentin Bartenev <vbart@nginx.com>
parents:
4461
diff
changeset
|
2358 #endif |
|
a73c63bdce32
Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a
Valentin Bartenev <vbart@nginx.com>
parents:
4461
diff
changeset
|
2359 |
|
a73c63bdce32
Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a
Valentin Bartenev <vbart@nginx.com>
parents:
4461
diff
changeset
|
2360 |
|
a73c63bdce32
Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a
Valentin Bartenev <vbart@nginx.com>
parents:
4461
diff
changeset
|
2361 static ngx_int_t |
|
a73c63bdce32
Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a
Valentin Bartenev <vbart@nginx.com>
parents:
4461
diff
changeset
|
2362 ngx_http_proxy_rewrite(ngx_http_request_t *r, ngx_table_elt_t *h, size_t prefix, |
|
a73c63bdce32
Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a
Valentin Bartenev <vbart@nginx.com>
parents:
4461
diff
changeset
|
2363 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
|
2364 { |
|
a73c63bdce32
Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a
Valentin Bartenev <vbart@nginx.com>
parents:
4461
diff
changeset
|
2365 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
|
2366 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
|
2367 |
|
a73c63bdce32
Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a
Valentin Bartenev <vbart@nginx.com>
parents:
4461
diff
changeset
|
2368 new_len = replacement->len + h->value.len - len; |
|
a73c63bdce32
Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a
Valentin Bartenev <vbart@nginx.com>
parents:
4461
diff
changeset
|
2369 |
|
a73c63bdce32
Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a
Valentin Bartenev <vbart@nginx.com>
parents:
4461
diff
changeset
|
2370 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
|
2371 |
|
a73c63bdce32
Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a
Valentin Bartenev <vbart@nginx.com>
parents:
4461
diff
changeset
|
2372 data = ngx_pnalloc(r->pool, new_len); |
|
a73c63bdce32
Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a
Valentin Bartenev <vbart@nginx.com>
parents:
4461
diff
changeset
|
2373 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
|
2374 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
|
2375 } |
|
a73c63bdce32
Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a
Valentin Bartenev <vbart@nginx.com>
parents:
4461
diff
changeset
|
2376 |
|
a73c63bdce32
Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a
Valentin Bartenev <vbart@nginx.com>
parents:
4461
diff
changeset
|
2377 p = ngx_copy(data, h->value.data, prefix); |
|
a73c63bdce32
Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a
Valentin Bartenev <vbart@nginx.com>
parents:
4461
diff
changeset
|
2378 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
|
2379 |
|
a73c63bdce32
Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a
Valentin Bartenev <vbart@nginx.com>
parents:
4461
diff
changeset
|
2380 ngx_memcpy(p, h->value.data + prefix + len, |
|
a73c63bdce32
Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a
Valentin Bartenev <vbart@nginx.com>
parents:
4461
diff
changeset
|
2381 h->value.len - len - prefix); |
|
a73c63bdce32
Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a
Valentin Bartenev <vbart@nginx.com>
parents:
4461
diff
changeset
|
2382 |
|
a73c63bdce32
Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a
Valentin Bartenev <vbart@nginx.com>
parents:
4461
diff
changeset
|
2383 h->value.data = data; |
|
a73c63bdce32
Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a
Valentin Bartenev <vbart@nginx.com>
parents:
4461
diff
changeset
|
2384 |
|
a73c63bdce32
Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a
Valentin Bartenev <vbart@nginx.com>
parents:
4461
diff
changeset
|
2385 } else { |
|
a73c63bdce32
Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a
Valentin Bartenev <vbart@nginx.com>
parents:
4461
diff
changeset
|
2386 p = ngx_copy(h->value.data + prefix, replacement->data, |
|
a73c63bdce32
Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a
Valentin Bartenev <vbart@nginx.com>
parents:
4461
diff
changeset
|
2387 replacement->len); |
|
a73c63bdce32
Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a
Valentin Bartenev <vbart@nginx.com>
parents:
4461
diff
changeset
|
2388 |
|
a73c63bdce32
Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a
Valentin Bartenev <vbart@nginx.com>
parents:
4461
diff
changeset
|
2389 ngx_memmove(p, h->value.data + prefix + len, |
|
a73c63bdce32
Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a
Valentin Bartenev <vbart@nginx.com>
parents:
4461
diff
changeset
|
2390 h->value.len - len - prefix); |
|
4398
3d51ba7f347b
Fixed: proxy_redirect with regex might broke Refresh header.
Valentin Bartenev <vbart@nginx.com>
parents:
4385
diff
changeset
|
2391 } |
|
3d51ba7f347b
Fixed: proxy_redirect with regex might broke Refresh header.
Valentin Bartenev <vbart@nginx.com>
parents:
4385
diff
changeset
|
2392 |
|
4462
a73c63bdce32
Proxy: generic rewrite code from the "proxy_redirect" handlers moved to a
Valentin Bartenev <vbart@nginx.com>
parents:
4461
diff
changeset
|
2393 h->value.len = new_len; |
| 509 | 2394 |
| 2395 return NGX_OK; | |
| 2396 } | |
| 2397 | |
| 2398 | |
| 2399 static ngx_int_t | |
| 2400 ngx_http_proxy_add_variables(ngx_conf_t *cf) | |
| 2401 { | |
| 2402 ngx_http_variable_t *var, *v; | |
| 2403 | |
| 2404 for (v = ngx_http_proxy_vars; v->name.len; v++) { | |
| 2405 var = ngx_http_add_variable(cf, &v->name, v->flags); | |
| 2406 if (var == NULL) { | |
| 2407 return NGX_ERROR; | |
| 2408 } | |
| 2409 | |
| 637 | 2410 var->get_handler = v->get_handler; |
| 509 | 2411 var->data = v->data; |
| 2412 } | |
| 2413 | |
| 2414 return NGX_OK; | |
| 507 | 2415 } |
| 2416 | |
| 2417 | |
| 2418 static void * | |
| 2419 ngx_http_proxy_create_loc_conf(ngx_conf_t *cf) | |
| 2420 { | |
| 2421 ngx_http_proxy_loc_conf_t *conf; | |
| 2422 | |
| 2423 conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_proxy_loc_conf_t)); | |
| 2424 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
|
2425 return NULL; |
| 507 | 2426 } |
| 2427 | |
| 2428 /* | |
| 2429 * set by ngx_pcalloc(): | |
| 2430 * | |
| 2431 * conf->upstream.bufs.num = 0; | |
|
2786
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2784
diff
changeset
|
2432 * conf->upstream.ignore_headers = 0; |
| 507 | 2433 * conf->upstream.next_upstream = 0; |
|
2875
6e1941b321b7
proxy_cache_methods and fastcgi_cache_methods
Igor Sysoev <igor@sysoev.ru>
parents:
2786
diff
changeset
|
2434 * conf->upstream.cache_use_stale = 0; |
|
6e1941b321b7
proxy_cache_methods and fastcgi_cache_methods
Igor Sysoev <igor@sysoev.ru>
parents:
2786
diff
changeset
|
2435 * conf->upstream.cache_methods = 0; |
| 507 | 2436 * conf->upstream.temp_path = NULL; |
| 649 | 2437 * conf->upstream.hide_headers_hash = { NULL, 0 }; |
| 509 | 2438 * conf->upstream.uri = { 0, NULL }; |
| 2439 * conf->upstream.location = NULL; | |
|
1295
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
2440 * conf->upstream.store_lengths = NULL; |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
2441 * conf->upstream.store_values = NULL; |
| 509 | 2442 * |
| 561 | 2443 * conf->method = NULL; |
| 509 | 2444 * conf->headers_source = NULL; |
| 2445 * conf->headers_set_len = NULL; | |
| 2446 * conf->headers_set = NULL; | |
| 2447 * conf->headers_set_hash = NULL; | |
| 577 | 2448 * conf->body_set_len = NULL; |
| 2449 * conf->body_set = NULL; | |
| 2450 * conf->body_source = { 0, NULL }; | |
|
3470
b982f2dee8cf
fix proxy_redirect name in error message
Igor Sysoev <igor@sysoev.ru>
parents:
3399
diff
changeset
|
2451 * conf->redirects = NULL; |
| 507 | 2452 */ |
| 577 | 2453 |
|
1295
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
2454 conf->upstream.store = NGX_CONF_UNSET; |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
2455 conf->upstream.store_access = NGX_CONF_UNSET_UINT; |
| 581 | 2456 conf->upstream.buffering = NGX_CONF_UNSET; |
| 629 | 2457 conf->upstream.ignore_client_abort = NGX_CONF_UNSET; |
| 581 | 2458 |
| 507 | 2459 conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC; |
| 2460 conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC; | |
| 2461 conf->upstream.read_timeout = NGX_CONF_UNSET_MSEC; | |
| 2462 | |
| 2463 conf->upstream.send_lowat = NGX_CONF_UNSET_SIZE; | |
| 581 | 2464 conf->upstream.buffer_size = NGX_CONF_UNSET_SIZE; |
| 529 | 2465 |
| 2466 conf->upstream.busy_buffers_size_conf = NGX_CONF_UNSET_SIZE; | |
| 577 | 2467 conf->upstream.max_temp_file_size_conf = NGX_CONF_UNSET_SIZE; |
| 529 | 2468 conf->upstream.temp_file_write_size_conf = NGX_CONF_UNSET_SIZE; |
| 509 | 2469 |
| 2470 conf->upstream.pass_request_headers = NGX_CONF_UNSET; | |
| 2471 conf->upstream.pass_request_body = NGX_CONF_UNSET; | |
| 561 | 2472 |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2473 #if (NGX_HTTP_CACHE) |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2474 conf->upstream.cache = NGX_CONF_UNSET_PTR; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2475 conf->upstream.cache_min_uses = NGX_CONF_UNSET_UINT; |
|
3699
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3692
diff
changeset
|
2476 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
|
2477 conf->upstream.no_cache = NGX_CONF_UNSET_PTR; |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2478 conf->upstream.cache_valid = NGX_CONF_UNSET_PTR; |
|
4385
70ba81827472
Cache locks initial implementation.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4377
diff
changeset
|
2479 conf->upstream.cache_lock = NGX_CONF_UNSET; |
|
70ba81827472
Cache locks initial implementation.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4377
diff
changeset
|
2480 conf->upstream.cache_lock_timeout = NGX_CONF_UNSET_MSEC; |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2481 #endif |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2482 |
|
1701
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
2483 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
|
2484 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
|
2485 |
| 657 | 2486 conf->upstream.intercept_errors = NGX_CONF_UNSET; |
| 2184 | 2487 #if (NGX_HTTP_SSL) |
| 2488 conf->upstream.ssl_session_reuse = NGX_CONF_UNSET; | |
| 2489 #endif | |
| 507 | 2490 |
| 2491 /* "proxy_cyclic_temp_file" is disabled */ | |
| 2492 conf->upstream.cyclic_temp_file = 0; | |
| 2493 | |
| 509 | 2494 conf->redirect = NGX_CONF_UNSET; |
| 649 | 2495 conf->upstream.change_buffering = 1; |
| 507 | 2496 |
|
4126
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2497 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
|
2498 |
|
1180
1666b7b0bafc
proxy_headers_hash_max_size and proxy_headers_hash_bucket_size
Igor Sysoev <igor@sysoev.ru>
parents:
1125
diff
changeset
|
2499 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
|
2500 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
|
2501 |
|
3976
215fe9223419
update r3945 with more descriptive error message
Igor Sysoev <igor@sysoev.ru>
parents:
3862
diff
changeset
|
2502 ngx_str_set(&conf->upstream.module, "proxy"); |
|
215fe9223419
update r3945 with more descriptive error message
Igor Sysoev <igor@sysoev.ru>
parents:
3862
diff
changeset
|
2503 |
| 507 | 2504 return conf; |
| 2505 } | |
| 2506 | |
| 2507 | |
| 2508 static char * | |
| 2509 ngx_http_proxy_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) | |
| 2510 { | |
| 2511 ngx_http_proxy_loc_conf_t *prev = parent; | |
| 2512 ngx_http_proxy_loc_conf_t *conf = child; | |
| 2513 | |
|
3862
f4c49c9e4bb5
always test proxy_redirect with slash, this fixes a case when nginx uses
Igor Sysoev <igor@sysoev.ru>
parents:
3734
diff
changeset
|
2514 u_char *p; |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2515 size_t size; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2516 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
|
2517 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
|
2518 ngx_http_proxy_rewrite_t *pr; |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2519 ngx_http_script_compile_t sc; |
| 509 | 2520 |
|
1295
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
2521 if (conf->upstream.store != 0) { |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
2522 ngx_conf_merge_value(conf->upstream.store, |
| 2894 | 2523 prev->upstream.store, 0); |
|
1295
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
2524 |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
2525 if (conf->upstream.store_lengths == NULL) { |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
2526 conf->upstream.store_lengths = prev->upstream.store_lengths; |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
2527 conf->upstream.store_values = prev->upstream.store_values; |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
2528 } |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
2529 } |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
2530 |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
2531 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
|
2532 prev->upstream.store_access, 0600); |
|
1291
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1244
diff
changeset
|
2533 |
| 581 | 2534 ngx_conf_merge_value(conf->upstream.buffering, |
| 2535 prev->upstream.buffering, 1); | |
| 2536 | |
| 629 | 2537 ngx_conf_merge_value(conf->upstream.ignore_client_abort, |
| 2538 prev->upstream.ignore_client_abort, 0); | |
| 2539 | |
| 507 | 2540 ngx_conf_merge_msec_value(conf->upstream.connect_timeout, |
| 2541 prev->upstream.connect_timeout, 60000); | |
| 2542 | |
| 2543 ngx_conf_merge_msec_value(conf->upstream.send_timeout, | |
| 2544 prev->upstream.send_timeout, 60000); | |
| 2545 | |
| 2546 ngx_conf_merge_msec_value(conf->upstream.read_timeout, | |
| 2547 prev->upstream.read_timeout, 60000); | |
| 2548 | |
| 2549 ngx_conf_merge_size_value(conf->upstream.send_lowat, | |
| 2550 prev->upstream.send_lowat, 0); | |
| 2551 | |
| 581 | 2552 ngx_conf_merge_size_value(conf->upstream.buffer_size, |
| 2553 prev->upstream.buffer_size, | |
| 507 | 2554 (size_t) ngx_pagesize); |
| 2555 | |
| 2556 ngx_conf_merge_bufs_value(conf->upstream.bufs, prev->upstream.bufs, | |
| 2557 8, ngx_pagesize); | |
| 2558 | |
| 2559 if (conf->upstream.bufs.num < 2) { | |
| 577 | 2560 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
| 507 | 2561 "there must be at least 2 \"proxy_buffers\""); |
| 2562 return NGX_CONF_ERROR; | |
| 2563 } | |
| 577 | 2564 |
| 507 | 2565 |
| 581 | 2566 size = conf->upstream.buffer_size; |
| 577 | 2567 if (size < conf->upstream.bufs.size) { |
| 507 | 2568 size = conf->upstream.bufs.size; |
| 2569 } | |
| 2570 | |
| 2571 | |
| 529 | 2572 ngx_conf_merge_size_value(conf->upstream.busy_buffers_size_conf, |
| 2573 prev->upstream.busy_buffers_size_conf, | |
| 507 | 2574 NGX_CONF_UNSET_SIZE); |
| 2575 | |
| 529 | 2576 if (conf->upstream.busy_buffers_size_conf == NGX_CONF_UNSET_SIZE) { |
| 507 | 2577 conf->upstream.busy_buffers_size = 2 * size; |
| 529 | 2578 } else { |
| 2579 conf->upstream.busy_buffers_size = | |
| 2580 conf->upstream.busy_buffers_size_conf; | |
| 2581 } | |
| 577 | 2582 |
| 529 | 2583 if (conf->upstream.busy_buffers_size < size) { |
| 507 | 2584 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
| 2585 "\"proxy_busy_buffers_size\" must be equal or bigger than " | |
|
1125
2d978e1443ed
use the contemporary directives
Igor Sysoev <igor@sysoev.ru>
parents:
1107
diff
changeset
|
2586 "maximum of the value of \"proxy_buffer_size\" and " |
| 507 | 2587 "one of the \"proxy_buffers\""); |
| 2588 | |
| 2589 return NGX_CONF_ERROR; | |
| 529 | 2590 } |
| 507 | 2591 |
| 529 | 2592 if (conf->upstream.busy_buffers_size |
| 2593 > (conf->upstream.bufs.num - 1) * conf->upstream.bufs.size) | |
| 507 | 2594 { |
| 2595 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
| 2596 "\"proxy_busy_buffers_size\" must be less than " | |
| 2597 "the size of all \"proxy_buffers\" minus one buffer"); | |
| 2598 | |
| 2599 return NGX_CONF_ERROR; | |
| 2600 } | |
| 529 | 2601 |
| 507 | 2602 |
| 529 | 2603 ngx_conf_merge_size_value(conf->upstream.temp_file_write_size_conf, |
| 2604 prev->upstream.temp_file_write_size_conf, | |
| 507 | 2605 NGX_CONF_UNSET_SIZE); |
| 2606 | |
| 529 | 2607 if (conf->upstream.temp_file_write_size_conf == NGX_CONF_UNSET_SIZE) { |
| 507 | 2608 conf->upstream.temp_file_write_size = 2 * size; |
| 529 | 2609 } else { |
| 2610 conf->upstream.temp_file_write_size = | |
| 2611 conf->upstream.temp_file_write_size_conf; | |
| 2612 } | |
| 577 | 2613 |
| 529 | 2614 if (conf->upstream.temp_file_write_size < size) { |
| 507 | 2615 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
| 2616 "\"proxy_temp_file_write_size\" must be equal or bigger than " | |
|
1125
2d978e1443ed
use the contemporary directives
Igor Sysoev <igor@sysoev.ru>
parents:
1107
diff
changeset
|
2617 "maximum of the value of \"proxy_buffer_size\" and " |
| 507 | 2618 "one of the \"proxy_buffers\""); |
| 2619 | |
| 2620 return NGX_CONF_ERROR; | |
| 2621 } | |
| 2622 | |
| 529 | 2623 ngx_conf_merge_size_value(conf->upstream.max_temp_file_size_conf, |
| 2624 prev->upstream.max_temp_file_size_conf, | |
| 507 | 2625 NGX_CONF_UNSET_SIZE); |
| 2626 | |
| 529 | 2627 if (conf->upstream.max_temp_file_size_conf == NGX_CONF_UNSET_SIZE) { |
| 507 | 2628 conf->upstream.max_temp_file_size = 1024 * 1024 * 1024; |
| 529 | 2629 } else { |
| 2630 conf->upstream.max_temp_file_size = | |
| 2631 conf->upstream.max_temp_file_size_conf; | |
| 2632 } | |
| 507 | 2633 |
| 529 | 2634 if (conf->upstream.max_temp_file_size != 0 |
| 2635 && conf->upstream.max_temp_file_size < size) | |
| 507 | 2636 { |
| 2637 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
| 561 | 2638 "\"proxy_max_temp_file_size\" must be equal to zero to disable " |
| 507 | 2639 "the temporary files usage or must be equal or bigger than " |
|
1125
2d978e1443ed
use the contemporary directives
Igor Sysoev <igor@sysoev.ru>
parents:
1107
diff
changeset
|
2640 "maximum of the value of \"proxy_buffer_size\" and " |
| 561 | 2641 "one of the \"proxy_buffers\""); |
| 507 | 2642 |
| 2643 return NGX_CONF_ERROR; | |
| 2644 } | |
| 2645 | |
| 529 | 2646 |
|
2786
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2784
diff
changeset
|
2647 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
|
2648 prev->upstream.ignore_headers, |
|
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2784
diff
changeset
|
2649 NGX_CONF_BITMASK_SET); |
|
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2784
diff
changeset
|
2650 |
|
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2784
diff
changeset
|
2651 |
| 507 | 2652 ngx_conf_merge_bitmask_value(conf->upstream.next_upstream, |
| 2653 prev->upstream.next_upstream, | |
| 2654 (NGX_CONF_BITMASK_SET | |
| 2655 |NGX_HTTP_UPSTREAM_FT_ERROR | |
| 2656 |NGX_HTTP_UPSTREAM_FT_TIMEOUT)); | |
| 2657 | |
| 665 | 2658 if (conf->upstream.next_upstream & NGX_HTTP_UPSTREAM_FT_OFF) { |
| 2659 conf->upstream.next_upstream = NGX_CONF_BITMASK_SET | |
| 2660 |NGX_HTTP_UPSTREAM_FT_OFF; | |
| 2661 } | |
| 2662 | |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2663 if (ngx_conf_merge_path_value(cf, &conf->upstream.temp_path, |
| 509 | 2664 prev->upstream.temp_path, |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2665 &ngx_http_proxy_temp_path) |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2666 != NGX_OK) |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2667 { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2668 return NGX_CONF_ERROR; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2669 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2670 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2671 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2672 #if (NGX_HTTP_CACHE) |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2673 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2674 ngx_conf_merge_ptr_value(conf->upstream.cache, |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2675 prev->upstream.cache, NULL); |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2676 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2677 if (conf->upstream.cache && conf->upstream.cache->data == NULL) { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2678 ngx_shm_zone_t *shm_zone; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2679 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2680 shm_zone = conf->upstream.cache; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2681 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2682 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2683 "\"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
|
2684 &shm_zone->shm.name); |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2685 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2686 return NGX_CONF_ERROR; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2687 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2688 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2689 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
|
2690 prev->upstream.cache_min_uses, 1); |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2691 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2692 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
|
2693 prev->upstream.cache_use_stale, |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2694 (NGX_CONF_BITMASK_SET |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2695 |NGX_HTTP_UPSTREAM_FT_OFF)); |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2696 |
|
4401
d45742815c90
Fixed proxy_cache_use_stale in "no live upstreams" case.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4400
diff
changeset
|
2697 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
|
2698 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
|
2699 |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
|
2700 } |
|
d45742815c90
Fixed proxy_cache_use_stale in "no live upstreams" case.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4400
diff
changeset
|
2701 |
|
d45742815c90
Fixed proxy_cache_use_stale in "no live upstreams" case.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4400
diff
changeset
|
2702 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
|
2703 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
|
2704 } |
|
d45742815c90
Fixed proxy_cache_use_stale in "no live upstreams" case.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4400
diff
changeset
|
2705 |
|
2875
6e1941b321b7
proxy_cache_methods and fastcgi_cache_methods
Igor Sysoev <igor@sysoev.ru>
parents:
2786
diff
changeset
|
2706 if (conf->upstream.cache_methods == 0) { |
|
6e1941b321b7
proxy_cache_methods and fastcgi_cache_methods
Igor Sysoev <igor@sysoev.ru>
parents:
2786
diff
changeset
|
2707 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
|
2708 } |
|
6e1941b321b7
proxy_cache_methods and fastcgi_cache_methods
Igor Sysoev <igor@sysoev.ru>
parents:
2786
diff
changeset
|
2709 |
|
6e1941b321b7
proxy_cache_methods and fastcgi_cache_methods
Igor Sysoev <igor@sysoev.ru>
parents:
2786
diff
changeset
|
2710 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
|
2711 |
|
3699
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3692
diff
changeset
|
2712 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
|
2713 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
|
2714 |
|
3526
62a4fd1e6e2c
proxy_no_cache and fastcgi_no_cache
Igor Sysoev <igor@sysoev.ru>
parents:
3523
diff
changeset
|
2715 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
|
2716 prev->upstream.no_cache, NULL); |
|
62a4fd1e6e2c
proxy_no_cache and fastcgi_no_cache
Igor Sysoev <igor@sysoev.ru>
parents:
3523
diff
changeset
|
2717 |
|
3700
e40453e6931b
add warnings for proxy_no_cache and fastcgi_no_cache
Igor Sysoev <igor@sysoev.ru>
parents:
3699
diff
changeset
|
2718 if (conf->upstream.no_cache && conf->upstream.cache_bypass == NULL) { |
|
e40453e6931b
add warnings for proxy_no_cache and fastcgi_no_cache
Igor Sysoev <igor@sysoev.ru>
parents:
3699
diff
changeset
|
2719 ngx_log_error(NGX_LOG_WARN, cf->log, 0, |
|
e40453e6931b
add warnings for proxy_no_cache and fastcgi_no_cache
Igor Sysoev <igor@sysoev.ru>
parents:
3699
diff
changeset
|
2720 "\"proxy_no_cache\" functionality has been changed in 0.8.46, " |
|
e40453e6931b
add warnings for proxy_no_cache and fastcgi_no_cache
Igor Sysoev <igor@sysoev.ru>
parents:
3699
diff
changeset
|
2721 "now it should be used together with \"proxy_cache_bypass\""); |
|
e40453e6931b
add warnings for proxy_no_cache and fastcgi_no_cache
Igor Sysoev <igor@sysoev.ru>
parents:
3699
diff
changeset
|
2722 } |
|
e40453e6931b
add warnings for proxy_no_cache and fastcgi_no_cache
Igor Sysoev <igor@sysoev.ru>
parents:
3699
diff
changeset
|
2723 |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2724 ngx_conf_merge_ptr_value(conf->upstream.cache_valid, |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2725 prev->upstream.cache_valid, NULL); |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2726 |
| 2672 | 2727 if (conf->cache_key.value.data == NULL) { |
| 2728 conf->cache_key = prev->cache_key; | |
| 2729 } | |
| 2730 | |
|
4385
70ba81827472
Cache locks initial implementation.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4377
diff
changeset
|
2731 ngx_conf_merge_value(conf->upstream.cache_lock, |
|
70ba81827472
Cache locks initial implementation.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4377
diff
changeset
|
2732 prev->upstream.cache_lock, 0); |
|
70ba81827472
Cache locks initial implementation.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4377
diff
changeset
|
2733 |
|
70ba81827472
Cache locks initial implementation.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4377
diff
changeset
|
2734 ngx_conf_merge_msec_value(conf->upstream.cache_lock_timeout, |
|
70ba81827472
Cache locks initial implementation.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4377
diff
changeset
|
2735 prev->upstream.cache_lock_timeout, 5000); |
|
70ba81827472
Cache locks initial implementation.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4377
diff
changeset
|
2736 |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2737 #endif |
| 507 | 2738 |
| 561 | 2739 if (conf->method.len == 0) { |
| 2740 conf->method = prev->method; | |
| 2741 | |
| 2742 } else { | |
| 2743 conf->method.data[conf->method.len] = ' '; | |
| 2744 conf->method.len++; | |
| 509 | 2745 } |
| 2746 | |
| 2747 ngx_conf_merge_value(conf->upstream.pass_request_headers, | |
| 2748 prev->upstream.pass_request_headers, 1); | |
| 2749 ngx_conf_merge_value(conf->upstream.pass_request_body, | |
| 2750 prev->upstream.pass_request_body, 1); | |
| 2751 | |
| 657 | 2752 ngx_conf_merge_value(conf->upstream.intercept_errors, |
| 2753 prev->upstream.intercept_errors, 0); | |
| 509 | 2754 |
| 2184 | 2755 #if (NGX_HTTP_SSL) |
| 2756 ngx_conf_merge_value(conf->upstream.ssl_session_reuse, | |
| 2757 prev->upstream.ssl_session_reuse, 1); | |
| 2758 #endif | |
| 2759 | |
| 509 | 2760 ngx_conf_merge_value(conf->redirect, prev->redirect, 1); |
| 2761 | |
| 2762 if (conf->redirect) { | |
| 507 | 2763 |
| 509 | 2764 if (conf->redirects == NULL) { |
| 2765 conf->redirects = prev->redirects; | |
| 2766 } | |
| 2767 | |
| 1658 | 2768 if (conf->redirects == NULL && conf->url.data) { |
| 509 | 2769 |
| 2770 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
|
2771 sizeof(ngx_http_proxy_rewrite_t)); |
| 509 | 2772 if (conf->redirects == NULL) { |
| 2773 return NGX_CONF_ERROR; | |
| 2774 } | |
| 2775 | |
| 2776 pr = ngx_array_push(conf->redirects); | |
| 2777 if (pr == NULL) { | |
| 2778 return NGX_CONF_ERROR; | |
| 2779 } | |
| 2780 | |
|
4461
103587c7ae5f
Proxy: renamed some "proxy_redirect" related declarations to a more general and
Valentin Bartenev <vbart@nginx.com>
parents:
4422
diff
changeset
|
2781 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
|
2782 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
|
2783 |
|
99437094e86f
Proxy: added variables and regexp support to the first parameter of
Valentin Bartenev <vbart@nginx.com>
parents:
4276
diff
changeset
|
2784 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
|
2785 |
|
4461
103587c7ae5f
Proxy: renamed some "proxy_redirect" related declarations to a more general and
Valentin Bartenev <vbart@nginx.com>
parents:
4422
diff
changeset
|
2786 pr->handler = ngx_http_proxy_rewrite_complex_handler; |
| 1658 | 2787 |
| 2788 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
|
2789 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
|
2790 pr->replacement.value = conf->location; |
| 653 | 2791 |
| 2792 } else { | |
|
4461
103587c7ae5f
Proxy: renamed some "proxy_redirect" related declarations to a more general and
Valentin Bartenev <vbart@nginx.com>
parents:
4422
diff
changeset
|
2793 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
|
2794 + sizeof("/") - 1; |
|
103587c7ae5f
Proxy: renamed some "proxy_redirect" related declarations to a more general and
Valentin Bartenev <vbart@nginx.com>
parents:
4422
diff
changeset
|
2795 |
|
103587c7ae5f
Proxy: renamed some "proxy_redirect" related declarations to a more general and
Valentin Bartenev <vbart@nginx.com>
parents:
4422
diff
changeset
|
2796 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
|
2797 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
|
2798 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
|
2799 } |
|
f4c49c9e4bb5
always test proxy_redirect with slash, this fixes a case when nginx uses
Igor Sysoev <igor@sysoev.ru>
parents:
3734
diff
changeset
|
2800 |
|
4461
103587c7ae5f
Proxy: renamed some "proxy_redirect" related declarations to a more general and
Valentin Bartenev <vbart@nginx.com>
parents:
4422
diff
changeset
|
2801 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
|
2802 |
|
f4c49c9e4bb5
always test proxy_redirect with slash, this fixes a case when nginx uses
Igor Sysoev <igor@sysoev.ru>
parents:
3734
diff
changeset
|
2803 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
|
2804 *p = '/'; |
|
f4c49c9e4bb5
always test proxy_redirect with slash, this fixes a case when nginx uses
Igor Sysoev <igor@sysoev.ru>
parents:
3734
diff
changeset
|
2805 |
|
4336
99437094e86f
Proxy: added variables and regexp support to the first parameter of
Valentin Bartenev <vbart@nginx.com>
parents:
4276
diff
changeset
|
2806 ngx_str_set(&pr->replacement.value, "/"); |
| 653 | 2807 } |
| 509 | 2808 } |
| 2809 } | |
| 2810 | |
|
2753
9ba1bee1b1e4
merge SSL context inside "if" block
Igor Sysoev <igor@sysoev.ru>
parents:
2716
diff
changeset
|
2811 #if (NGX_HTTP_SSL) |
|
9ba1bee1b1e4
merge SSL context inside "if" block
Igor Sysoev <igor@sysoev.ru>
parents:
2716
diff
changeset
|
2812 if (conf->upstream.ssl == NULL) { |
|
9ba1bee1b1e4
merge SSL context inside "if" block
Igor Sysoev <igor@sysoev.ru>
parents:
2716
diff
changeset
|
2813 conf->upstream.ssl = prev->upstream.ssl; |
|
9ba1bee1b1e4
merge SSL context inside "if" block
Igor Sysoev <igor@sysoev.ru>
parents:
2716
diff
changeset
|
2814 } |
|
9ba1bee1b1e4
merge SSL context inside "if" block
Igor Sysoev <igor@sysoev.ru>
parents:
2716
diff
changeset
|
2815 #endif |
|
9ba1bee1b1e4
merge SSL context inside "if" block
Igor Sysoev <igor@sysoev.ru>
parents:
2716
diff
changeset
|
2816 |
|
4126
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2817 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
|
2818 NGX_HTTP_VERSION_10); |
|
bba9a5ccc6cd
Proxy: basic HTTP/1.1 support (including keepalive).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4125
diff
changeset
|
2819 |
|
1180
1666b7b0bafc
proxy_headers_hash_max_size and proxy_headers_hash_bucket_size
Igor Sysoev <igor@sysoev.ru>
parents:
1125
diff
changeset
|
2820 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
|
2821 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
|
2822 |
|
1666b7b0bafc
proxy_headers_hash_max_size and proxy_headers_hash_bucket_size
Igor Sysoev <igor@sysoev.ru>
parents:
1125
diff
changeset
|
2823 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
|
2824 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
|
2825 |
|
1666b7b0bafc
proxy_headers_hash_max_size and proxy_headers_hash_bucket_size
Igor Sysoev <igor@sysoev.ru>
parents:
1125
diff
changeset
|
2826 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
|
2827 ngx_cacheline_size); |
|
1666b7b0bafc
proxy_headers_hash_max_size and proxy_headers_hash_bucket_size
Igor Sysoev <igor@sysoev.ru>
parents:
1125
diff
changeset
|
2828 |
|
1701
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
2829 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
|
2830 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
|
2831 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
|
2832 |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
2833 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
|
2834 &prev->upstream, ngx_http_proxy_hide_headers, &hash) |
| 649 | 2835 != NGX_OK) |
| 2836 { | |
| 2837 return NGX_CONF_ERROR; | |
| 2838 } | |
| 2839 | |
| 884 | 2840 if (conf->upstream.upstream == NULL) { |
| 2841 conf->upstream.upstream = prev->upstream.upstream; | |
| 1658 | 2842 conf->vars = prev->vars; |
| 507 | 2843 } |
| 2844 | |
|
3734
e3a6785b5be4
*) make code consistent to fastcgi, etc
Igor Sysoev <igor@sysoev.ru>
parents:
3733
diff
changeset
|
2845 if (conf->proxy_lengths == NULL) { |
|
e3a6785b5be4
*) make code consistent to fastcgi, etc
Igor Sysoev <igor@sysoev.ru>
parents:
3733
diff
changeset
|
2846 conf->proxy_lengths = prev->proxy_lengths; |
|
e3a6785b5be4
*) make code consistent to fastcgi, etc
Igor Sysoev <igor@sysoev.ru>
parents:
3733
diff
changeset
|
2847 conf->proxy_values = prev->proxy_values; |
|
e3a6785b5be4
*) make code consistent to fastcgi, etc
Igor Sysoev <igor@sysoev.ru>
parents:
3733
diff
changeset
|
2848 } |
|
e3a6785b5be4
*) make code consistent to fastcgi, etc
Igor Sysoev <igor@sysoev.ru>
parents:
3733
diff
changeset
|
2849 |
|
3731
72cc5b789021
inherit proxy_pass, fastcgi_pass, uwsgi_pass, scgi_pass inside
Igor Sysoev <igor@sysoev.ru>
parents:
3729
diff
changeset
|
2850 if (conf->upstream.upstream || conf->proxy_lengths) { |
|
72cc5b789021
inherit proxy_pass, fastcgi_pass, uwsgi_pass, scgi_pass inside
Igor Sysoev <igor@sysoev.ru>
parents:
3729
diff
changeset
|
2851 clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module); |
|
72cc5b789021
inherit proxy_pass, fastcgi_pass, uwsgi_pass, scgi_pass inside
Igor Sysoev <igor@sysoev.ru>
parents:
3729
diff
changeset
|
2852 if (clcf->handler == NULL && clcf->lmt_excpt) { |
|
72cc5b789021
inherit proxy_pass, fastcgi_pass, uwsgi_pass, scgi_pass inside
Igor Sysoev <igor@sysoev.ru>
parents:
3729
diff
changeset
|
2853 clcf->handler = ngx_http_proxy_handler; |
|
72cc5b789021
inherit proxy_pass, fastcgi_pass, uwsgi_pass, scgi_pass inside
Igor Sysoev <igor@sysoev.ru>
parents:
3729
diff
changeset
|
2854 conf->location = prev->location; |
|
72cc5b789021
inherit proxy_pass, fastcgi_pass, uwsgi_pass, scgi_pass inside
Igor Sysoev <igor@sysoev.ru>
parents:
3729
diff
changeset
|
2855 } |
|
72cc5b789021
inherit proxy_pass, fastcgi_pass, uwsgi_pass, scgi_pass inside
Igor Sysoev <igor@sysoev.ru>
parents:
3729
diff
changeset
|
2856 } |
| 577 | 2857 |
| 2858 if (conf->body_source.data == NULL) { | |
| 2859 conf->body_source = prev->body_source; | |
| 2860 conf->body_set_len = prev->body_set_len; | |
| 2861 conf->body_set = prev->body_set; | |
| 2862 } | |
| 2863 | |
| 579 | 2864 if (conf->body_source.data && conf->body_set_len == NULL) { |
| 577 | 2865 |
| 2866 ngx_memzero(&sc, sizeof(ngx_http_script_compile_t)); | |
| 2867 | |
| 2868 sc.cf = cf; | |
| 2869 sc.source = &conf->body_source; | |
| 2870 sc.flushes = &conf->flushes; | |
| 2871 sc.lengths = &conf->body_set_len; | |
| 2872 sc.values = &conf->body_set; | |
| 2873 sc.complete_lengths = 1; | |
| 2874 sc.complete_values = 1; | |
| 2875 | |
| 2876 if (ngx_http_script_compile(&sc) != NGX_OK) { | |
| 2877 return NGX_CONF_ERROR; | |
| 2878 } | |
| 2879 } | |
| 2880 | |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2881 if (ngx_http_proxy_merge_headers(cf, conf, prev) != NGX_OK) { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2882 return NGX_CONF_ERROR; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2883 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2884 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2885 return NGX_CONF_OK; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2886 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2887 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2888 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2889 static ngx_int_t |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2890 ngx_http_proxy_merge_headers(ngx_conf_t *cf, ngx_http_proxy_loc_conf_t *conf, |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2891 ngx_http_proxy_loc_conf_t *prev) |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2892 { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2893 u_char *p; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2894 size_t size; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2895 uintptr_t *code; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2896 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
|
2897 ngx_array_t headers_names, headers_merged; |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2898 ngx_keyval_t *src, *s, *h; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2899 ngx_hash_key_t *hk; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2900 ngx_hash_init_t hash; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2901 ngx_http_script_compile_t sc; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2902 ngx_http_script_copy_code_t *copy; |
| 577 | 2903 |
| 509 | 2904 if (conf->headers_source == NULL) { |
| 573 | 2905 conf->flushes = prev->flushes; |
| 507 | 2906 conf->headers_set_len = prev->headers_set_len; |
| 2907 conf->headers_set = prev->headers_set; | |
| 2908 conf->headers_set_hash = prev->headers_set_hash; | |
| 573 | 2909 conf->headers_source = prev->headers_source; |
| 507 | 2910 } |
| 2911 | |
|
2929
37b7cd336fdf
inherit proxy_set_header, proxy_hide_header, and fastcgi_hide_header
Igor Sysoev <igor@sysoev.ru>
parents:
2927
diff
changeset
|
2912 if (conf->headers_set_hash.buckets |
|
4275
bb909c0c8629
Fixed proxy_set_header inheritance with proxy_set_body.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4274
diff
changeset
|
2913 && ((conf->body_source.data == NULL) |
|
bb909c0c8629
Fixed proxy_set_header inheritance with proxy_set_body.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4274
diff
changeset
|
2914 == (prev->body_source.data == NULL)) |
|
2949
fe484c0be7c0
fix building --without-http-cache, broken in r2930
Igor Sysoev <igor@sysoev.ru>
parents:
2929
diff
changeset
|
2915 #if (NGX_HTTP_CACHE) |
|
fe484c0be7c0
fix building --without-http-cache, broken in r2930
Igor Sysoev <igor@sysoev.ru>
parents:
2929
diff
changeset
|
2916 && ((conf->upstream.cache == NULL) == (prev->upstream.cache == NULL)) |
|
fe484c0be7c0
fix building --without-http-cache, broken in r2930
Igor Sysoev <igor@sysoev.ru>
parents:
2929
diff
changeset
|
2917 #endif |
|
fe484c0be7c0
fix building --without-http-cache, broken in r2930
Igor Sysoev <igor@sysoev.ru>
parents:
2929
diff
changeset
|
2918 ) |
|
2929
37b7cd336fdf
inherit proxy_set_header, proxy_hide_header, and fastcgi_hide_header
Igor Sysoev <igor@sysoev.ru>
parents:
2927
diff
changeset
|
2919 { |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2920 return NGX_OK; |
| 509 | 2921 } |
| 2922 | |
| 2923 | |
|
3561
20708cffd6dc
use local headers_names array instead of stored in configuration
Igor Sysoev <igor@sysoev.ru>
parents:
3526
diff
changeset
|
2924 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
|
2925 != NGX_OK) |
|
20708cffd6dc
use local headers_names array instead of stored in configuration
Igor Sysoev <igor@sysoev.ru>
parents:
3526
diff
changeset
|
2926 { |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2927 return NGX_ERROR; |
| 509 | 2928 } |
| 2929 | |
|
4274
595560d9dcbf
Fixed proxy_set_header inheritance with proxy_cache (ticket #45).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4205
diff
changeset
|
2930 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
|
2931 != NGX_OK) |
|
595560d9dcbf
Fixed proxy_set_header inheritance with proxy_cache (ticket #45).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4205
diff
changeset
|
2932 { |
|
595560d9dcbf
Fixed proxy_set_header inheritance with proxy_cache (ticket #45).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4205
diff
changeset
|
2933 return NGX_ERROR; |
|
595560d9dcbf
Fixed proxy_set_header inheritance with proxy_cache (ticket #45).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4205
diff
changeset
|
2934 } |
|
595560d9dcbf
Fixed proxy_set_header inheritance with proxy_cache (ticket #45).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4205
diff
changeset
|
2935 |
| 509 | 2936 if (conf->headers_source == NULL) { |
| 2937 conf->headers_source = ngx_array_create(cf->pool, 4, | |
| 649 | 2938 sizeof(ngx_keyval_t)); |
| 509 | 2939 if (conf->headers_source == NULL) { |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2940 return NGX_ERROR; |
| 509 | 2941 } |
| 2942 } | |
| 507 | 2943 |
| 509 | 2944 conf->headers_set_len = ngx_array_create(cf->pool, 64, 1); |
| 2945 if (conf->headers_set_len == NULL) { | |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2946 return NGX_ERROR; |
| 509 | 2947 } |
| 2948 | |
| 2949 conf->headers_set = ngx_array_create(cf->pool, 512, 1); | |
| 2950 if (conf->headers_set == NULL) { | |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2951 return NGX_ERROR; |
| 509 | 2952 } |
| 2953 | |
| 2954 | |
|
2705
d040c3786239
do not pass if-... headers for cacheable responses
Igor Sysoev <igor@sysoev.ru>
parents:
2672
diff
changeset
|
2955 #if (NGX_HTTP_CACHE) |
|
d040c3786239
do not pass if-... headers for cacheable responses
Igor Sysoev <igor@sysoev.ru>
parents:
2672
diff
changeset
|
2956 |
|
d040c3786239
do not pass if-... headers for cacheable responses
Igor Sysoev <igor@sysoev.ru>
parents:
2672
diff
changeset
|
2957 h = conf->upstream.cache ? ngx_http_proxy_cache_headers: |
|
d040c3786239
do not pass if-... headers for cacheable responses
Igor Sysoev <igor@sysoev.ru>
parents:
2672
diff
changeset
|
2958 ngx_http_proxy_headers; |
|
d040c3786239
do not pass if-... headers for cacheable responses
Igor Sysoev <igor@sysoev.ru>
parents:
2672
diff
changeset
|
2959 #else |
|
d040c3786239
do not pass if-... headers for cacheable responses
Igor Sysoev <igor@sysoev.ru>
parents:
2672
diff
changeset
|
2960 |
|
d040c3786239
do not pass if-... headers for cacheable responses
Igor Sysoev <igor@sysoev.ru>
parents:
2672
diff
changeset
|
2961 h = ngx_http_proxy_headers; |
|
d040c3786239
do not pass if-... headers for cacheable responses
Igor Sysoev <igor@sysoev.ru>
parents:
2672
diff
changeset
|
2962 |
|
d040c3786239
do not pass if-... headers for cacheable responses
Igor Sysoev <igor@sysoev.ru>
parents:
2672
diff
changeset
|
2963 #endif |
|
d040c3786239
do not pass if-... headers for cacheable responses
Igor Sysoev <igor@sysoev.ru>
parents:
2672
diff
changeset
|
2964 |
|
4274
595560d9dcbf
Fixed proxy_set_header inheritance with proxy_cache (ticket #45).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4205
diff
changeset
|
2965 src = conf->headers_source->elts; |
|
595560d9dcbf
Fixed proxy_set_header inheritance with proxy_cache (ticket #45).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4205
diff
changeset
|
2966 for (i = 0; i < conf->headers_source->nelts; i++) { |
|
595560d9dcbf
Fixed proxy_set_header inheritance with proxy_cache (ticket #45).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4205
diff
changeset
|
2967 |
|
595560d9dcbf
Fixed proxy_set_header inheritance with proxy_cache (ticket #45).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4205
diff
changeset
|
2968 s = ngx_array_push(&headers_merged); |
|
595560d9dcbf
Fixed proxy_set_header inheritance with proxy_cache (ticket #45).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4205
diff
changeset
|
2969 if (s == NULL) { |
|
595560d9dcbf
Fixed proxy_set_header inheritance with proxy_cache (ticket #45).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4205
diff
changeset
|
2970 return NGX_ERROR; |
|
595560d9dcbf
Fixed proxy_set_header inheritance with proxy_cache (ticket #45).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4205
diff
changeset
|
2971 } |
|
595560d9dcbf
Fixed proxy_set_header inheritance with proxy_cache (ticket #45).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4205
diff
changeset
|
2972 |
|
595560d9dcbf
Fixed proxy_set_header inheritance with proxy_cache (ticket #45).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4205
diff
changeset
|
2973 *s = src[i]; |
|
595560d9dcbf
Fixed proxy_set_header inheritance with proxy_cache (ticket #45).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4205
diff
changeset
|
2974 } |
|
595560d9dcbf
Fixed proxy_set_header inheritance with proxy_cache (ticket #45).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4205
diff
changeset
|
2975 |
|
2705
d040c3786239
do not pass if-... headers for cacheable responses
Igor Sysoev <igor@sysoev.ru>
parents:
2672
diff
changeset
|
2976 while (h->key.len) { |
| 509 | 2977 |
|
4274
595560d9dcbf
Fixed proxy_set_header inheritance with proxy_cache (ticket #45).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4205
diff
changeset
|
2978 src = headers_merged.elts; |
|
595560d9dcbf
Fixed proxy_set_header inheritance with proxy_cache (ticket #45).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4205
diff
changeset
|
2979 for (i = 0; i < headers_merged.nelts; i++) { |
| 509 | 2980 if (ngx_strcasecmp(h->key.data, src[i].key.data) == 0) { |
| 2981 goto next; | |
| 507 | 2982 } |
| 2983 } | |
| 2984 | |
|
4274
595560d9dcbf
Fixed proxy_set_header inheritance with proxy_cache (ticket #45).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4205
diff
changeset
|
2985 s = ngx_array_push(&headers_merged); |
| 509 | 2986 if (s == NULL) { |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
2987 return NGX_ERROR; |
| 507 | 2988 } |
| 2989 | |
| 509 | 2990 *s = *h; |
| 507 | 2991 |
| 509 | 2992 next: |
| 507 | 2993 |
|
2705
d040c3786239
do not pass if-... headers for cacheable responses
Igor Sysoev <igor@sysoev.ru>
parents:
2672
diff
changeset
|
2994 h++; |
| 509 | 2995 } |
| 507 | 2996 |
|
4275
bb909c0c8629
Fixed proxy_set_header inheritance with proxy_set_body.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4274
diff
changeset
|
2997 if (conf->body_source.data) { |
|
bb909c0c8629
Fixed proxy_set_header inheritance with proxy_set_body.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4274
diff
changeset
|
2998 s = ngx_array_push(&headers_merged); |
|
bb909c0c8629
Fixed proxy_set_header inheritance with proxy_set_body.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4274
diff
changeset
|
2999 if (s == NULL) { |
|
bb909c0c8629
Fixed proxy_set_header inheritance with proxy_set_body.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4274
diff
changeset
|
3000 return NGX_ERROR; |
|
bb909c0c8629
Fixed proxy_set_header inheritance with proxy_set_body.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4274
diff
changeset
|
3001 } |
|
bb909c0c8629
Fixed proxy_set_header inheritance with proxy_set_body.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4274
diff
changeset
|
3002 |
|
bb909c0c8629
Fixed proxy_set_header inheritance with proxy_set_body.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4274
diff
changeset
|
3003 ngx_str_set(&s->key, "Content-Length"); |
|
bb909c0c8629
Fixed proxy_set_header inheritance with proxy_set_body.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4274
diff
changeset
|
3004 ngx_str_set(&s->value, "$proxy_internal_body_length"); |
|
bb909c0c8629
Fixed proxy_set_header inheritance with proxy_set_body.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4274
diff
changeset
|
3005 } |
|
bb909c0c8629
Fixed proxy_set_header inheritance with proxy_set_body.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4274
diff
changeset
|
3006 |
| 577 | 3007 |
|
4274
595560d9dcbf
Fixed proxy_set_header inheritance with proxy_cache (ticket #45).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4205
diff
changeset
|
3008 src = headers_merged.elts; |
|
595560d9dcbf
Fixed proxy_set_header inheritance with proxy_cache (ticket #45).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4205
diff
changeset
|
3009 for (i = 0; i < headers_merged.nelts; i++) { |
| 507 | 3010 |
|
3561
20708cffd6dc
use local headers_names array instead of stored in configuration
Igor Sysoev <igor@sysoev.ru>
parents:
3526
diff
changeset
|
3011 hk = ngx_array_push(&headers_names); |
| 649 | 3012 if (hk == NULL) { |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
3013 return NGX_ERROR; |
| 507 | 3014 } |
| 3015 | |
| 649 | 3016 hk->key = src[i].key; |
| 3017 hk->key_hash = ngx_hash_key_lc(src[i].key.data, src[i].key.len); | |
| 3018 hk->value = (void *) 1; | |
| 509 | 3019 |
| 519 | 3020 if (src[i].value.len == 0) { |
| 3021 continue; | |
| 3022 } | |
| 3023 | |
| 509 | 3024 if (ngx_http_script_variables_count(&src[i].value) == 0) { |
| 3025 copy = ngx_array_push_n(conf->headers_set_len, | |
| 3026 sizeof(ngx_http_script_copy_code_t)); | |
| 3027 if (copy == NULL) { | |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
3028 return NGX_ERROR; |
| 509 | 3029 } |
| 3030 | |
| 3031 copy->code = (ngx_http_script_code_pt) | |
| 3032 ngx_http_script_copy_len_code; | |
| 3033 copy->len = src[i].key.len + sizeof(": ") - 1 | |
| 3034 + src[i].value.len + sizeof(CRLF) - 1; | |
| 507 | 3035 |
| 3036 | |
| 509 | 3037 size = (sizeof(ngx_http_script_copy_code_t) |
| 3038 + src[i].key.len + sizeof(": ") - 1 | |
| 3039 + src[i].value.len + sizeof(CRLF) - 1 | |
| 3040 + sizeof(uintptr_t) - 1) | |
| 3041 & ~(sizeof(uintptr_t) - 1); | |
| 3042 | |
| 3043 copy = ngx_array_push_n(conf->headers_set, size); | |
| 3044 if (copy == NULL) { | |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
3045 return NGX_ERROR; |
| 509 | 3046 } |
| 3047 | |
| 3048 copy->code = ngx_http_script_copy_code; | |
| 3049 copy->len = src[i].key.len + sizeof(": ") - 1 | |
| 3050 + src[i].value.len + sizeof(CRLF) - 1; | |
| 3051 | |
| 3052 p = (u_char *) copy + sizeof(ngx_http_script_copy_code_t); | |
| 3053 | |
| 3054 p = ngx_cpymem(p, src[i].key.data, src[i].key.len); | |
| 3055 *p++ = ':'; *p++ = ' '; | |
| 3056 p = ngx_cpymem(p, src[i].value.data, src[i].value.len); | |
| 3057 *p++ = CR; *p = LF; | |
| 3058 | |
| 3059 } else { | |
| 3060 copy = ngx_array_push_n(conf->headers_set_len, | |
| 3061 sizeof(ngx_http_script_copy_code_t)); | |
| 3062 if (copy == NULL) { | |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
3063 return NGX_ERROR; |
| 509 | 3064 } |
| 3065 | |
| 3066 copy->code = (ngx_http_script_code_pt) | |
| 3067 ngx_http_script_copy_len_code; | |
| 3068 copy->len = src[i].key.len + sizeof(": ") - 1; | |
| 507 | 3069 |
| 3070 | |
| 509 | 3071 size = (sizeof(ngx_http_script_copy_code_t) |
| 3072 + src[i].key.len + sizeof(": ") - 1 + sizeof(uintptr_t) - 1) | |
| 3073 & ~(sizeof(uintptr_t) - 1); | |
| 3074 | |
| 3075 copy = ngx_array_push_n(conf->headers_set, size); | |
| 3076 if (copy == NULL) { | |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
3077 return NGX_ERROR; |
| 509 | 3078 } |
| 3079 | |
| 3080 copy->code = ngx_http_script_copy_code; | |
| 3081 copy->len = src[i].key.len + sizeof(": ") - 1; | |
| 3082 | |
| 3083 p = (u_char *) copy + sizeof(ngx_http_script_copy_code_t); | |
| 3084 p = ngx_cpymem(p, src[i].key.data, src[i].key.len); | |
| 3085 *p++ = ':'; *p = ' '; | |
| 3086 | |
| 3087 | |
| 3088 ngx_memzero(&sc, sizeof(ngx_http_script_compile_t)); | |
| 3089 | |
| 3090 sc.cf = cf; | |
| 3091 sc.source = &src[i].value; | |
| 573 | 3092 sc.flushes = &conf->flushes; |
| 509 | 3093 sc.lengths = &conf->headers_set_len; |
| 3094 sc.values = &conf->headers_set; | |
| 3095 | |
| 3096 if (ngx_http_script_compile(&sc) != NGX_OK) { | |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
3097 return NGX_ERROR; |
| 509 | 3098 } |
| 3099 | |
| 3100 | |
| 3101 copy = ngx_array_push_n(conf->headers_set_len, | |
| 3102 sizeof(ngx_http_script_copy_code_t)); | |
| 3103 if (copy == NULL) { | |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
3104 return NGX_ERROR; |
| 509 | 3105 } |
| 3106 | |
| 3107 copy->code = (ngx_http_script_code_pt) | |
| 3108 ngx_http_script_copy_len_code; | |
| 3109 copy->len = sizeof(CRLF) - 1; | |
| 3110 | |
| 3111 | |
| 3112 size = (sizeof(ngx_http_script_copy_code_t) | |
| 3113 + sizeof(CRLF) - 1 + sizeof(uintptr_t) - 1) | |
| 3114 & ~(sizeof(uintptr_t) - 1); | |
| 3115 | |
| 3116 copy = ngx_array_push_n(conf->headers_set, size); | |
| 3117 if (copy == NULL) { | |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
3118 return NGX_ERROR; |
| 509 | 3119 } |
| 3120 | |
| 3121 copy->code = ngx_http_script_copy_code; | |
| 3122 copy->len = sizeof(CRLF) - 1; | |
| 3123 | |
| 3124 p = (u_char *) copy + sizeof(ngx_http_script_copy_code_t); | |
| 3125 *p++ = CR; *p = LF; | |
| 507 | 3126 } |
| 3127 | |
| 509 | 3128 code = ngx_array_push_n(conf->headers_set_len, sizeof(uintptr_t)); |
| 3129 if (code == NULL) { | |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
3130 return NGX_ERROR; |
| 507 | 3131 } |
| 3132 | |
| 509 | 3133 *code = (uintptr_t) NULL; |
| 3134 | |
| 3135 code = ngx_array_push_n(conf->headers_set, sizeof(uintptr_t)); | |
| 3136 if (code == NULL) { | |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
3137 return NGX_ERROR; |
| 509 | 3138 } |
| 3139 | |
| 3140 *code = (uintptr_t) NULL; | |
| 507 | 3141 } |
| 3142 | |
| 509 | 3143 code = ngx_array_push_n(conf->headers_set_len, sizeof(uintptr_t)); |
| 3144 if (code == NULL) { | |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
3145 return NGX_ERROR; |
| 507 | 3146 } |
| 3147 | |
| 509 | 3148 *code = (uintptr_t) NULL; |
| 507 | 3149 |
| 3150 | |
| 649 | 3151 hash.hash = &conf->headers_set_hash; |
| 3152 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
|
3153 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
|
3154 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
|
3155 hash.name = "proxy_headers_hash"; |
| 649 | 3156 hash.pool = cf->pool; |
| 3157 hash.temp_pool = NULL; | |
| 3158 | |
|
3561
20708cffd6dc
use local headers_names array instead of stored in configuration
Igor Sysoev <igor@sysoev.ru>
parents:
3526
diff
changeset
|
3159 return ngx_hash_init(&hash, headers_names.elts, headers_names.nelts); |
| 507 | 3160 } |
| 3161 | |
| 3162 | |
| 3163 static char * | |
| 3164 ngx_http_proxy_pass(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) | |
| 3165 { | |
| 509 | 3166 ngx_http_proxy_loc_conf_t *plcf = conf; |
| 507 | 3167 |
| 1658 | 3168 size_t add; |
| 3169 u_short port; | |
| 3170 ngx_str_t *value, *url; | |
| 3171 ngx_url_t u; | |
| 3172 ngx_uint_t n; | |
| 3173 ngx_http_core_loc_conf_t *clcf; | |
| 3174 ngx_http_script_compile_t sc; | |
| 507 | 3175 |
|
2391
d88e757cc7d8
delete surplus upstream.schema field
Igor Sysoev <igor@sysoev.ru>
parents:
2285
diff
changeset
|
3176 if (plcf->upstream.upstream || plcf->proxy_lengths) { |
| 555 | 3177 return "is duplicate"; |
| 3178 } | |
| 3179 | |
| 1658 | 3180 clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module); |
| 3181 | |
|
2989
dff9764eaca2
do auto redirect for proxy_pass/fastcgi_pass with variables
Igor Sysoev <igor@sysoev.ru>
parents:
2949
diff
changeset
|
3182 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
|
3183 |
|
dff9764eaca2
do auto redirect for proxy_pass/fastcgi_pass with variables
Igor Sysoev <igor@sysoev.ru>
parents:
2949
diff
changeset
|
3184 if (clcf->name.data[clcf->name.len - 1] == '/') { |
|
dff9764eaca2
do auto redirect for proxy_pass/fastcgi_pass with variables
Igor Sysoev <igor@sysoev.ru>
parents:
2949
diff
changeset
|
3185 clcf->auto_redirect = 1; |
|
dff9764eaca2
do auto redirect for proxy_pass/fastcgi_pass with variables
Igor Sysoev <igor@sysoev.ru>
parents:
2949
diff
changeset
|
3186 } |
|
dff9764eaca2
do auto redirect for proxy_pass/fastcgi_pass with variables
Igor Sysoev <igor@sysoev.ru>
parents:
2949
diff
changeset
|
3187 |
| 507 | 3188 value = cf->args->elts; |
| 3189 | |
| 3190 url = &value[1]; | |
| 3191 | |
| 1658 | 3192 n = ngx_http_script_variables_count(url); |
| 3193 | |
| 3194 if (n) { | |
| 3195 | |
| 3196 ngx_memzero(&sc, sizeof(ngx_http_script_compile_t)); | |
| 3197 | |
| 3198 sc.cf = cf; | |
| 3199 sc.source = url; | |
| 3200 sc.lengths = &plcf->proxy_lengths; | |
| 3201 sc.values = &plcf->proxy_values; | |
| 3202 sc.variables = n; | |
| 3203 sc.complete_lengths = 1; | |
| 3204 sc.complete_values = 1; | |
|
1679
ca317d9b5c09
style fix: remove trailing spaces
Igor Sysoev <igor@sysoev.ru>
parents:
1671
diff
changeset
|
3205 |
| 1658 | 3206 if (ngx_http_script_compile(&sc) != NGX_OK) { |
| 3207 return NGX_CONF_ERROR; | |
| 3208 } | |
| 3209 | |
| 3210 #if (NGX_HTTP_SSL) | |
| 3211 if (ngx_http_proxy_set_ssl(cf, plcf) != NGX_OK) { | |
| 3212 return NGX_CONF_ERROR; | |
| 3213 } | |
| 3214 #endif | |
| 3215 | |
| 3216 return NGX_CONF_OK; | |
| 3217 } | |
| 3218 | |
|
1107
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
969
diff
changeset
|
3219 if (ngx_strncasecmp(url->data, (u_char *) "http://", 7) == 0) { |
| 577 | 3220 add = 7; |
| 591 | 3221 port = 80; |
| 577 | 3222 |
|
1107
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
969
diff
changeset
|
3223 } else if (ngx_strncasecmp(url->data, (u_char *) "https://", 8) == 0) { |
| 577 | 3224 |
| 3225 #if (NGX_HTTP_SSL) | |
| 1658 | 3226 if (ngx_http_proxy_set_ssl(cf, plcf) != NGX_OK) { |
| 3227 return NGX_CONF_ERROR; | |
| 3228 } | |
| 577 | 3229 |
| 3230 add = 8; | |
| 591 | 3231 port = 443; |
| 577 | 3232 #else |
| 3233 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
| 3234 "https protocol requires SSL support"); | |
| 3235 return NGX_CONF_ERROR; | |
| 3236 #endif | |
| 3237 | |
| 3238 } else { | |
| 507 | 3239 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "invalid URL prefix"); |
| 3240 return NGX_CONF_ERROR; | |
| 3241 } | |
| 3242 | |
| 651 | 3243 ngx_memzero(&u, sizeof(ngx_url_t)); |
| 3244 | |
| 3245 u.url.len = url->len - add; | |
| 3246 u.url.data = url->data + add; | |
| 906 | 3247 u.default_port = port; |
| 3248 u.uri_part = 1; | |
| 884 | 3249 u.no_resolve = 1; |
| 3250 | |
| 3251 plcf->upstream.upstream = ngx_http_upstream_add(cf, &u, 0); | |
| 3252 if (plcf->upstream.upstream == NULL) { | |
| 507 | 3253 return NGX_CONF_ERROR; |
| 3254 } | |
| 3255 | |
|
2391
d88e757cc7d8
delete surplus upstream.schema field
Igor Sysoev <igor@sysoev.ru>
parents:
2285
diff
changeset
|
3256 plcf->vars.schema.len = add; |
|
d88e757cc7d8
delete surplus upstream.schema field
Igor Sysoev <igor@sysoev.ru>
parents:
2285
diff
changeset
|
3257 plcf->vars.schema.data = url->data; |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
3258 plcf->vars.key_start = plcf->vars.schema; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
3259 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
3260 ngx_http_proxy_set_vars(&u, &plcf->vars); |
| 507 | 3261 |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
3262 plcf->location = clcf->name; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
3263 |
| 1353 | 3264 if (clcf->named |
| 507 | 3265 #if (NGX_PCRE) |
| 1353 | 3266 || clcf->regex |
| 3267 #endif | |
| 3268 || clcf->noname) | |
| 3269 { | |
| 1658 | 3270 if (plcf->vars.uri.len) { |
| 573 | 3271 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
| 3272 "\"proxy_pass\" may not have URI part in " | |
|
843
ebab9490204c
allow proxy_pass inside limit_except
Igor Sysoev <igor@sysoev.ru>
parents:
812
diff
changeset
|
3273 "location given by regular expression, " |
| 1353 | 3274 "or inside named location, " |
|
843
ebab9490204c
allow proxy_pass inside limit_except
Igor Sysoev <igor@sysoev.ru>
parents:
812
diff
changeset
|
3275 "or inside the \"if\" statement, " |
|
ebab9490204c
allow proxy_pass inside limit_except
Igor Sysoev <igor@sysoev.ru>
parents:
812
diff
changeset
|
3276 "or inside the \"limit_except\" block"); |
| 573 | 3277 return NGX_CONF_ERROR; |
| 3278 } | |
| 3279 | |
| 1658 | 3280 plcf->location.len = 0; |
| 555 | 3281 } |
| 3282 | |
| 1658 | 3283 plcf->url = *url; |
| 509 | 3284 |
| 507 | 3285 return NGX_CONF_OK; |
| 3286 } | |
| 3287 | |
| 3288 | |
| 3289 static char * | |
| 509 | 3290 ngx_http_proxy_redirect(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) |
| 507 | 3291 { |
| 509 | 3292 ngx_http_proxy_loc_conf_t *plcf = conf; |
| 3293 | |
|
4336
99437094e86f
Proxy: added variables and regexp support to the first parameter of
Valentin Bartenev <vbart@nginx.com>
parents:
4276
diff
changeset
|
3294 u_char *p; |
|
99437094e86f
Proxy: added variables and regexp support to the first parameter of
Valentin Bartenev <vbart@nginx.com>
parents:
4276
diff
changeset
|
3295 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
|
3296 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
|
3297 ngx_http_compile_complex_value_t ccv; |
| 509 | 3298 |
| 3299 if (plcf->redirect == 0) { | |
| 3300 return NGX_CONF_OK; | |
| 3301 } | |
| 3302 | |
|
4422
b1a9d725ab69
Fixed proxy_redirect off inheritance.
Valentin Bartenev <vbart@nginx.com>
parents:
4412
diff
changeset
|
3303 plcf->redirect = 1; |
|
b1a9d725ab69
Fixed proxy_redirect off inheritance.
Valentin Bartenev <vbart@nginx.com>
parents:
4412
diff
changeset
|
3304 |
| 509 | 3305 value = cf->args->elts; |
| 3306 | |
|
2784
c2230102df6f
*) check a proxy_redirect single parameter
Igor Sysoev <igor@sysoev.ru>
parents:
2753
diff
changeset
|
3307 if (cf->args->nelts == 2) { |
|
c2230102df6f
*) check a proxy_redirect single parameter
Igor Sysoev <igor@sysoev.ru>
parents:
2753
diff
changeset
|
3308 if (ngx_strcmp(value[1].data, "off") == 0) { |
|
c2230102df6f
*) check a proxy_redirect single parameter
Igor Sysoev <igor@sysoev.ru>
parents:
2753
diff
changeset
|
3309 plcf->redirect = 0; |
|
c2230102df6f
*) check a proxy_redirect single parameter
Igor Sysoev <igor@sysoev.ru>
parents:
2753
diff
changeset
|
3310 plcf->redirects = NULL; |
|
c2230102df6f
*) check a proxy_redirect single parameter
Igor Sysoev <igor@sysoev.ru>
parents:
2753
diff
changeset
|
3311 return NGX_CONF_OK; |
|
c2230102df6f
*) check a proxy_redirect single parameter
Igor Sysoev <igor@sysoev.ru>
parents:
2753
diff
changeset
|
3312 } |
|
c2230102df6f
*) check a proxy_redirect single parameter
Igor Sysoev <igor@sysoev.ru>
parents:
2753
diff
changeset
|
3313 |
|
c2230102df6f
*) check a proxy_redirect single parameter
Igor Sysoev <igor@sysoev.ru>
parents:
2753
diff
changeset
|
3314 if (ngx_strcmp(value[1].data, "false") == 0) { |
|
c2230102df6f
*) check a proxy_redirect single parameter
Igor Sysoev <igor@sysoev.ru>
parents:
2753
diff
changeset
|
3315 ngx_conf_log_error(NGX_LOG_ERR, cf, 0, |
|
c2230102df6f
*) check a proxy_redirect single parameter
Igor Sysoev <igor@sysoev.ru>
parents:
2753
diff
changeset
|
3316 "invalid parameter \"false\", use \"off\" instead"); |
|
c2230102df6f
*) check a proxy_redirect single parameter
Igor Sysoev <igor@sysoev.ru>
parents:
2753
diff
changeset
|
3317 plcf->redirect = 0; |
|
c2230102df6f
*) check a proxy_redirect single parameter
Igor Sysoev <igor@sysoev.ru>
parents:
2753
diff
changeset
|
3318 plcf->redirects = NULL; |
|
c2230102df6f
*) check a proxy_redirect single parameter
Igor Sysoev <igor@sysoev.ru>
parents:
2753
diff
changeset
|
3319 return NGX_CONF_OK; |
|
c2230102df6f
*) check a proxy_redirect single parameter
Igor Sysoev <igor@sysoev.ru>
parents:
2753
diff
changeset
|
3320 } |
|
c2230102df6f
*) check a proxy_redirect single parameter
Igor Sysoev <igor@sysoev.ru>
parents:
2753
diff
changeset
|
3321 |
|
c2230102df6f
*) check a proxy_redirect single parameter
Igor Sysoev <igor@sysoev.ru>
parents:
2753
diff
changeset
|
3322 if (ngx_strcmp(value[1].data, "default") != 0) { |
|
c2230102df6f
*) check a proxy_redirect single parameter
Igor Sysoev <igor@sysoev.ru>
parents:
2753
diff
changeset
|
3323 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
|
3324 "invalid parameter \"%V\"", &value[1]); |
|
c2230102df6f
*) check a proxy_redirect single parameter
Igor Sysoev <igor@sysoev.ru>
parents:
2753
diff
changeset
|
3325 return NGX_CONF_ERROR; |
|
c2230102df6f
*) check a proxy_redirect single parameter
Igor Sysoev <igor@sysoev.ru>
parents:
2753
diff
changeset
|
3326 } |
| 509 | 3327 } |
| 3328 | |
| 3329 if (plcf->redirects == NULL) { | |
| 3330 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
|
3331 sizeof(ngx_http_proxy_rewrite_t)); |
| 509 | 3332 if (plcf->redirects == NULL) { |
| 3333 return NGX_CONF_ERROR; | |
| 3334 } | |
| 3335 } | |
| 3336 | |
| 3337 pr = ngx_array_push(plcf->redirects); | |
| 3338 if (pr == NULL) { | |
| 3339 return NGX_CONF_ERROR; | |
| 3340 } | |
| 3341 | |
|
2784
c2230102df6f
*) check a proxy_redirect single parameter
Igor Sysoev <igor@sysoev.ru>
parents:
2753
diff
changeset
|
3342 if (ngx_strcmp(value[1].data, "default") == 0) { |
|
3471
d8c56e7851b8
"proxy_redirect default" may not be used if a proxy_pass uses variables
Igor Sysoev <igor@sysoev.ru>
parents:
3470
diff
changeset
|
3343 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
|
3344 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
|
d8c56e7851b8
"proxy_redirect default" may not be used if a proxy_pass uses variables
Igor Sysoev <igor@sysoev.ru>
parents:
3470
diff
changeset
|
3345 "\"proxy_redirect default\" may not be used " |
|
d8c56e7851b8
"proxy_redirect default" may not be used if a proxy_pass uses variables
Igor Sysoev <igor@sysoev.ru>
parents:
3470
diff
changeset
|
3346 "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
|
3347 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
|
3348 } |
|
d8c56e7851b8
"proxy_redirect default" may not be used if a proxy_pass uses variables
Igor Sysoev <igor@sysoev.ru>
parents:
3470
diff
changeset
|
3349 |
| 1658 | 3350 if (plcf->url.data == NULL) { |
| 509 | 3351 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
|
3470
b982f2dee8cf
fix proxy_redirect name in error message
Igor Sysoev <igor@sysoev.ru>
parents:
3399
diff
changeset
|
3352 "\"proxy_redirect default\" must go " |
| 509 | 3353 "after the \"proxy_pass\" directive"); |
| 3354 return NGX_CONF_ERROR; | |
| 3355 } | |
| 3356 | |
|
4461
103587c7ae5f
Proxy: renamed some "proxy_redirect" related declarations to a more general and
Valentin Bartenev <vbart@nginx.com>
parents:
4422
diff
changeset
|
3357 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
|
3358 |
|
103587c7ae5f
Proxy: renamed some "proxy_redirect" related declarations to a more general and
Valentin Bartenev <vbart@nginx.com>
parents:
4422
diff
changeset
|
3359 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
|
3360 |
|
99437094e86f
Proxy: added variables and regexp support to the first parameter of
Valentin Bartenev <vbart@nginx.com>
parents:
4276
diff
changeset
|
3361 ngx_memzero(&pr->replacement, sizeof(ngx_http_complex_value_t)); |
| 1658 | 3362 |
| 3363 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
|
3364 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
|
3365 pr->replacement.value = plcf->location; |
| 653 | 3366 |
| 3367 } else { | |
|
4461
103587c7ae5f
Proxy: renamed some "proxy_redirect" related declarations to a more general and
Valentin Bartenev <vbart@nginx.com>
parents:
4422
diff
changeset
|
3368 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
|
3369 |
|
103587c7ae5f
Proxy: renamed some "proxy_redirect" related declarations to a more general and
Valentin Bartenev <vbart@nginx.com>
parents:
4422
diff
changeset
|
3370 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
|
3371 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
|
3372 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
|
3373 } |
|
f4c49c9e4bb5
always test proxy_redirect with slash, this fixes a case when nginx uses
Igor Sysoev <igor@sysoev.ru>
parents:
3734
diff
changeset
|
3374 |
|
4461
103587c7ae5f
Proxy: renamed some "proxy_redirect" related declarations to a more general and
Valentin Bartenev <vbart@nginx.com>
parents:
4422
diff
changeset
|
3375 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
|
3376 |
|
f4c49c9e4bb5
always test proxy_redirect with slash, this fixes a case when nginx uses
Igor Sysoev <igor@sysoev.ru>
parents:
3734
diff
changeset
|
3377 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
|
3378 *p = '/'; |
|
f4c49c9e4bb5
always test proxy_redirect with slash, this fixes a case when nginx uses
Igor Sysoev <igor@sysoev.ru>
parents:
3734
diff
changeset
|
3379 |
|
4336
99437094e86f
Proxy: added variables and regexp support to the first parameter of
Valentin Bartenev <vbart@nginx.com>
parents:
4276
diff
changeset
|
3380 ngx_str_set(&pr->replacement.value, "/"); |
| 653 | 3381 } |
| 509 | 3382 |
| 3383 return NGX_CONF_OK; | |
| 3384 } | |
| 3385 | |
|
4336
99437094e86f
Proxy: added variables and regexp support to the first parameter of
Valentin Bartenev <vbart@nginx.com>
parents:
4276
diff
changeset
|
3386 |
|
99437094e86f
Proxy: added variables and regexp support to the first parameter of
Valentin Bartenev <vbart@nginx.com>
parents:
4276
diff
changeset
|
3387 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
|
3388 #if (NGX_PCRE) |
|
99437094e86f
Proxy: added variables and regexp support to the first parameter of
Valentin Bartenev <vbart@nginx.com>
parents:
4276
diff
changeset
|
3389 u_char errstr[NGX_MAX_CONF_ERRSTR]; |
|
99437094e86f
Proxy: added variables and regexp support to the first parameter of
Valentin Bartenev <vbart@nginx.com>
parents:
4276
diff
changeset
|
3390 ngx_regex_compile_t rc; |
|
99437094e86f
Proxy: added variables and regexp support to the first parameter of
Valentin Bartenev <vbart@nginx.com>
parents:
4276
diff
changeset
|
3391 |
|
99437094e86f
Proxy: added variables and regexp support to the first parameter of
Valentin Bartenev <vbart@nginx.com>
parents:
4276
diff
changeset
|
3392 value[1].len--; |
|
99437094e86f
Proxy: added variables and regexp support to the first parameter of
Valentin Bartenev <vbart@nginx.com>
parents:
4276
diff
changeset
|
3393 value[1].data++; |
|
99437094e86f
Proxy: added variables and regexp support to the first parameter of
Valentin Bartenev <vbart@nginx.com>
parents:
4276
diff
changeset
|
3394 |
|
99437094e86f
Proxy: added variables and regexp support to the first parameter of
Valentin Bartenev <vbart@nginx.com>
parents:
4276
diff
changeset
|
3395 ngx_memzero(&rc, sizeof(ngx_regex_compile_t)); |
|
99437094e86f
Proxy: added variables and regexp support to the first parameter of
Valentin Bartenev <vbart@nginx.com>
parents:
4276
diff
changeset
|
3396 |
|
99437094e86f
Proxy: added variables and regexp support to the first parameter of
Valentin Bartenev <vbart@nginx.com>
parents:
4276
diff
changeset
|
3397 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
|
3398 value[1].len--; |
|
99437094e86f
Proxy: added variables and regexp support to the first parameter of
Valentin Bartenev <vbart@nginx.com>
parents:
4276
diff
changeset
|
3399 value[1].data++; |
|
99437094e86f
Proxy: added variables and regexp support to the first parameter of
Valentin Bartenev <vbart@nginx.com>
parents:
4276
diff
changeset
|
3400 rc.options = NGX_REGEX_CASELESS; |
|
99437094e86f
Proxy: added variables and regexp support to the first parameter of
Valentin Bartenev <vbart@nginx.com>
parents:
4276
diff
changeset
|
3401 } |
|
99437094e86f
Proxy: added variables and regexp support to the first parameter of
Valentin Bartenev <vbart@nginx.com>
parents:
4276
diff
changeset
|
3402 |
|
99437094e86f
Proxy: added variables and regexp support to the first parameter of
Valentin Bartenev <vbart@nginx.com>
parents:
4276
diff
changeset
|
3403 rc.pattern = value[1]; |
|
99437094e86f
Proxy: added variables and regexp support to the first parameter of
Valentin Bartenev <vbart@nginx.com>
parents:
4276
diff
changeset
|
3404 rc.err.len = NGX_MAX_CONF_ERRSTR; |
|
99437094e86f
Proxy: added variables and regexp support to the first parameter of
Valentin Bartenev <vbart@nginx.com>
parents:
4276
diff
changeset
|
3405 rc.err.data = errstr; |
|
99437094e86f
Proxy: added variables and regexp support to the first parameter of
Valentin Bartenev <vbart@nginx.com>
parents:
4276
diff
changeset
|
3406 |
|
4461
103587c7ae5f
Proxy: renamed some "proxy_redirect" related declarations to a more general and
Valentin Bartenev <vbart@nginx.com>
parents:
4422
diff
changeset
|
3407 pr->pattern.regex = ngx_http_regex_compile(cf, &rc); |
|
103587c7ae5f
Proxy: renamed some "proxy_redirect" related declarations to a more general and
Valentin Bartenev <vbart@nginx.com>
parents:
4422
diff
changeset
|
3408 if (pr->pattern.regex == NULL) { |
|
4336
99437094e86f
Proxy: added variables and regexp support to the first parameter of
Valentin Bartenev <vbart@nginx.com>
parents:
4276
diff
changeset
|
3409 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
|
3410 } |
|
99437094e86f
Proxy: added variables and regexp support to the first parameter of
Valentin Bartenev <vbart@nginx.com>
parents:
4276
diff
changeset
|
3411 |
|
4461
103587c7ae5f
Proxy: renamed some "proxy_redirect" related declarations to a more general and
Valentin Bartenev <vbart@nginx.com>
parents:
4422
diff
changeset
|
3412 pr->handler = ngx_http_proxy_rewrite_regex_handler; |
|
4336
99437094e86f
Proxy: added variables and regexp support to the first parameter of
Valentin Bartenev <vbart@nginx.com>
parents:
4276
diff
changeset
|
3413 |
|
99437094e86f
Proxy: added variables and regexp support to the first parameter of
Valentin Bartenev <vbart@nginx.com>
parents:
4276
diff
changeset
|
3414 #else |
|
99437094e86f
Proxy: added variables and regexp support to the first parameter of
Valentin Bartenev <vbart@nginx.com>
parents:
4276
diff
changeset
|
3415 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
|
99437094e86f
Proxy: added variables and regexp support to the first parameter of
Valentin Bartenev <vbart@nginx.com>
parents:
4276
diff
changeset
|
3416 "using regex \"%V\" requires PCRE library", |
|
99437094e86f
Proxy: added variables and regexp support to the first parameter of
Valentin Bartenev <vbart@nginx.com>
parents:
4276
diff
changeset
|
3417 &value[1]); |
|
99437094e86f
Proxy: added variables and regexp support to the first parameter of
Valentin Bartenev <vbart@nginx.com>
parents:
4276
diff
changeset
|
3418 |
|
99437094e86f
Proxy: added variables and regexp support to the first parameter of
Valentin Bartenev <vbart@nginx.com>
parents:
4276
diff
changeset
|
3419 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
|
3420 #endif |
|
99437094e86f
Proxy: added variables and regexp support to the first parameter of
Valentin Bartenev <vbart@nginx.com>
parents:
4276
diff
changeset
|
3421 } else { |
|
99437094e86f
Proxy: added variables and regexp support to the first parameter of
Valentin Bartenev <vbart@nginx.com>
parents:
4276
diff
changeset
|
3422 |
|
99437094e86f
Proxy: added variables and regexp support to the first parameter of
Valentin Bartenev <vbart@nginx.com>
parents:
4276
diff
changeset
|
3423 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
|
3424 |
|
99437094e86f
Proxy: added variables and regexp support to the first parameter of
Valentin Bartenev <vbart@nginx.com>
parents:
4276
diff
changeset
|
3425 ccv.cf = cf; |
|
99437094e86f
Proxy: added variables and regexp support to the first parameter of
Valentin Bartenev <vbart@nginx.com>
parents:
4276
diff
changeset
|
3426 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
|
3427 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
|
3428 |
|
99437094e86f
Proxy: added variables and regexp support to the first parameter of
Valentin Bartenev <vbart@nginx.com>
parents:
4276
diff
changeset
|
3429 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
|
3430 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
|
3431 } |
|
99437094e86f
Proxy: added variables and regexp support to the first parameter of
Valentin Bartenev <vbart@nginx.com>
parents:
4276
diff
changeset
|
3432 |
|
4461
103587c7ae5f
Proxy: renamed some "proxy_redirect" related declarations to a more general and
Valentin Bartenev <vbart@nginx.com>
parents:
4422
diff
changeset
|
3433 pr->handler = ngx_http_proxy_rewrite_complex_handler; |
| 509 | 3434 } |
| 3435 | |
|
4336
99437094e86f
Proxy: added variables and regexp support to the first parameter of
Valentin Bartenev <vbart@nginx.com>
parents:
4276
diff
changeset
|
3436 |
|
99437094e86f
Proxy: added variables and regexp support to the first parameter of
Valentin Bartenev <vbart@nginx.com>
parents:
4276
diff
changeset
|
3437 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
|
3438 |
|
99437094e86f
Proxy: added variables and regexp support to the first parameter of
Valentin Bartenev <vbart@nginx.com>
parents:
4276
diff
changeset
|
3439 ccv.cf = cf; |
|
99437094e86f
Proxy: added variables and regexp support to the first parameter of
Valentin Bartenev <vbart@nginx.com>
parents:
4276
diff
changeset
|
3440 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
|
3441 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
|
3442 |
|
99437094e86f
Proxy: added variables and regexp support to the first parameter of
Valentin Bartenev <vbart@nginx.com>
parents:
4276
diff
changeset
|
3443 if (ngx_http_compile_complex_value(&ccv) != NGX_OK) { |
| 509 | 3444 return NGX_CONF_ERROR; |
| 3445 } | |
| 3446 | |
| 507 | 3447 return NGX_CONF_OK; |
| 3448 } | |
| 3449 | |
| 3450 | |
| 3451 static char * | |
|
1295
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3452 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
|
3453 { |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3454 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
|
3455 |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3456 ngx_str_t *value; |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3457 ngx_http_script_compile_t sc; |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3458 |
| 2894 | 3459 if (plcf->upstream.store != NGX_CONF_UNSET |
| 3460 || plcf->upstream.store_lengths) | |
|
1295
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3461 { |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3462 return "is duplicate"; |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3463 } |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3464 |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3465 value = cf->args->elts; |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3466 |
|
2895
d65e58a8d3a4
report about proxy/fastcgi_store and proxy/fastcgi_cache incompatibility
Igor Sysoev <igor@sysoev.ru>
parents:
2894
diff
changeset
|
3467 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
|
3468 plcf->upstream.store = 0; |
|
1295
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3469 return NGX_CONF_OK; |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3470 } |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3471 |
|
2895
d65e58a8d3a4
report about proxy/fastcgi_store and proxy/fastcgi_cache incompatibility
Igor Sysoev <igor@sysoev.ru>
parents:
2894
diff
changeset
|
3472 #if (NGX_HTTP_CACHE) |
|
d65e58a8d3a4
report about proxy/fastcgi_store and proxy/fastcgi_cache incompatibility
Igor Sysoev <igor@sysoev.ru>
parents:
2894
diff
changeset
|
3473 |
|
d65e58a8d3a4
report about proxy/fastcgi_store and proxy/fastcgi_cache incompatibility
Igor Sysoev <igor@sysoev.ru>
parents:
2894
diff
changeset
|
3474 if (plcf->upstream.cache != NGX_CONF_UNSET_PTR |
|
d65e58a8d3a4
report about proxy/fastcgi_store and proxy/fastcgi_cache incompatibility
Igor Sysoev <igor@sysoev.ru>
parents:
2894
diff
changeset
|
3475 && plcf->upstream.cache != NULL) |
|
d65e58a8d3a4
report about proxy/fastcgi_store and proxy/fastcgi_cache incompatibility
Igor Sysoev <igor@sysoev.ru>
parents:
2894
diff
changeset
|
3476 { |
|
d65e58a8d3a4
report about proxy/fastcgi_store and proxy/fastcgi_cache incompatibility
Igor Sysoev <igor@sysoev.ru>
parents:
2894
diff
changeset
|
3477 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
|
3478 } |
|
d65e58a8d3a4
report about proxy/fastcgi_store and proxy/fastcgi_cache incompatibility
Igor Sysoev <igor@sysoev.ru>
parents:
2894
diff
changeset
|
3479 |
|
d65e58a8d3a4
report about proxy/fastcgi_store and proxy/fastcgi_cache incompatibility
Igor Sysoev <igor@sysoev.ru>
parents:
2894
diff
changeset
|
3480 #endif |
|
d65e58a8d3a4
report about proxy/fastcgi_store and proxy/fastcgi_cache incompatibility
Igor Sysoev <igor@sysoev.ru>
parents:
2894
diff
changeset
|
3481 |
|
d65e58a8d3a4
report about proxy/fastcgi_store and proxy/fastcgi_cache incompatibility
Igor Sysoev <igor@sysoev.ru>
parents:
2894
diff
changeset
|
3482 if (ngx_strcmp(value[1].data, "on") == 0) { |
|
d65e58a8d3a4
report about proxy/fastcgi_store and proxy/fastcgi_cache incompatibility
Igor Sysoev <igor@sysoev.ru>
parents:
2894
diff
changeset
|
3483 plcf->upstream.store = 1; |
|
1295
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3484 return NGX_CONF_OK; |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3485 } |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3486 |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3487 /* include the terminating '\0' into script */ |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3488 value[1].len++; |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3489 |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3490 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
|
3491 |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3492 sc.cf = cf; |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3493 sc.source = &value[1]; |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3494 sc.lengths = &plcf->upstream.store_lengths; |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3495 sc.values = &plcf->upstream.store_values; |
|
1563
022ec9420f80
style fix: remove double semicolons
Igor Sysoev <igor@sysoev.ru>
parents:
1488
diff
changeset
|
3496 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
|
3497 sc.complete_lengths = 1; |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3498 sc.complete_values = 1; |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3499 |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3500 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
|
3501 return NGX_CONF_ERROR; |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3502 } |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3503 |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3504 return NGX_CONF_OK; |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3505 } |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3506 |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3507 |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
3508 #if (NGX_HTTP_CACHE) |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
3509 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
3510 static char * |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
3511 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
|
3512 { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
3513 ngx_http_proxy_loc_conf_t *plcf = conf; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
3514 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
3515 ngx_str_t *value; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
3516 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
3517 value = cf->args->elts; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
3518 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
3519 if (plcf->upstream.cache != NGX_CONF_UNSET_PTR) { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
3520 return "is duplicate"; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
3521 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
3522 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
3523 if (ngx_strcmp(value[1].data, "off") == 0) { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
3524 plcf->upstream.cache = NULL; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
3525 return NGX_CONF_OK; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
3526 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
3527 |
|
2895
d65e58a8d3a4
report about proxy/fastcgi_store and proxy/fastcgi_cache incompatibility
Igor Sysoev <igor@sysoev.ru>
parents:
2894
diff
changeset
|
3528 if (plcf->upstream.store > 0 || plcf->upstream.store_lengths) { |
|
d65e58a8d3a4
report about proxy/fastcgi_store and proxy/fastcgi_cache incompatibility
Igor Sysoev <igor@sysoev.ru>
parents:
2894
diff
changeset
|
3529 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
|
3530 } |
|
d65e58a8d3a4
report about proxy/fastcgi_store and proxy/fastcgi_cache incompatibility
Igor Sysoev <igor@sysoev.ru>
parents:
2894
diff
changeset
|
3531 |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
3532 plcf->upstream.cache = ngx_shared_memory_add(cf, &value[1], 0, |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
3533 &ngx_http_proxy_module); |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
3534 if (plcf->upstream.cache == NULL) { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
3535 return NGX_CONF_ERROR; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
3536 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
3537 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
3538 return NGX_CONF_OK; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
3539 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
3540 |
| 2672 | 3541 |
| 3542 static char * | |
| 3543 ngx_http_proxy_cache_key(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) | |
| 3544 { | |
| 3545 ngx_http_proxy_loc_conf_t *plcf = conf; | |
| 3546 | |
| 3547 ngx_str_t *value; | |
| 3548 ngx_http_compile_complex_value_t ccv; | |
| 3549 | |
| 3550 value = cf->args->elts; | |
| 3551 | |
| 3552 if (plcf->cache_key.value.len) { | |
| 3553 return "is duplicate"; | |
| 3554 } | |
| 3555 | |
| 3556 ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t)); | |
| 3557 | |
| 3558 ccv.cf = cf; | |
| 3559 ccv.value = &value[1]; | |
| 3560 ccv.complex_value = &plcf->cache_key; | |
| 3561 | |
| 3562 if (ngx_http_compile_complex_value(&ccv) != NGX_OK) { | |
| 3563 return NGX_CONF_ERROR; | |
| 3564 } | |
| 3565 | |
| 3566 return NGX_CONF_OK; | |
| 3567 } | |
| 3568 | |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
3569 #endif |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
3570 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
3571 |
|
1295
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3572 static char * |
| 507 | 3573 ngx_http_proxy_lowat_check(ngx_conf_t *cf, void *post, void *data) |
| 3574 { | |
| 3575 #if (NGX_FREEBSD) | |
| 3576 ssize_t *np = data; | |
| 3577 | |
| 673 | 3578 if ((u_long) *np >= ngx_freebsd_net_inet_tcp_sendspace) { |
| 507 | 3579 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
| 3580 "\"proxy_send_lowat\" must be less than %d " | |
| 3581 "(sysctl net.inet.tcp.sendspace)", | |
| 3582 ngx_freebsd_net_inet_tcp_sendspace); | |
| 3583 | |
| 3584 return NGX_CONF_ERROR; | |
| 3585 } | |
| 3586 | |
| 3587 #elif !(NGX_HAVE_SO_SNDLOWAT) | |
| 3588 ssize_t *np = data; | |
| 3589 | |
| 3590 ngx_conf_log_error(NGX_LOG_WARN, cf, 0, | |
| 3591 "\"proxy_send_lowat\" is not supported, ignored"); | |
| 3592 | |
| 3593 *np = 0; | |
| 3594 | |
| 3595 #endif | |
| 3596 | |
| 3597 return NGX_CONF_OK; | |
| 3598 } | |
| 884 | 3599 |
| 3600 | |
| 1658 | 3601 #if (NGX_HTTP_SSL) |
| 3602 | |
| 3603 static ngx_int_t | |
| 3604 ngx_http_proxy_set_ssl(ngx_conf_t *cf, ngx_http_proxy_loc_conf_t *plcf) | |
| 3605 { | |
| 3606 ngx_pool_cleanup_t *cln; | |
| 3607 | |
| 3608 plcf->upstream.ssl = ngx_pcalloc(cf->pool, sizeof(ngx_ssl_t)); | |
| 3609 if (plcf->upstream.ssl == NULL) { | |
| 3610 return NGX_ERROR; | |
| 3611 } | |
| 3612 | |
| 3613 plcf->upstream.ssl->log = cf->log; | |
| 3614 | |
| 3615 if (ngx_ssl_create(plcf->upstream.ssl, | |
|
4400
a0505851e70c
Added support for TLSv1.1, TLSv1.2 in ssl_protocols directive.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4398
diff
changeset
|
3616 NGX_SSL_SSLv2|NGX_SSL_SSLv3|NGX_SSL_TLSv1 |
|
a0505851e70c
Added support for TLSv1.1, TLSv1.2 in ssl_protocols directive.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4398
diff
changeset
|
3617 |NGX_SSL_TLSv1_1|NGX_SSL_TLSv1_2, |
|
a0505851e70c
Added support for TLSv1.1, TLSv1.2 in ssl_protocols directive.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4398
diff
changeset
|
3618 NULL) |
| 1658 | 3619 != NGX_OK) |
| 3620 { | |
| 3621 return NGX_ERROR; | |
| 3622 } | |
| 3623 | |
| 3624 cln = ngx_pool_cleanup_add(cf->pool, 0); | |
| 3625 if (cln == NULL) { | |
| 3626 return NGX_ERROR; | |
| 3627 } | |
| 3628 | |
| 3629 cln->handler = ngx_ssl_cleanup_ctx; | |
| 3630 cln->data = plcf->upstream.ssl; | |
| 3631 | |
| 3632 return NGX_OK; | |
| 3633 } | |
| 3634 | |
| 3635 #endif | |
| 3636 | |
| 3637 | |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
3638 static void |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
3639 ngx_http_proxy_set_vars(ngx_url_t *u, ngx_http_proxy_vars_t *v) |
| 1658 | 3640 { |
|
2203
8e5bf1bc87e2
*) refactor ngx_parse_inet_url()
Igor Sysoev <igor@sysoev.ru>
parents:
2184
diff
changeset
|
3641 if (u->family != AF_UNIX) { |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
3642 |
| 1658 | 3643 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
|
3644 |
| 1658 | 3645 v->host_header = u->host; |
| 3646 | |
| 3647 if (u->default_port == 80) { | |
|
3516
dd1570b6f237
ngx_str_set() and ngx_str_null()
Igor Sysoev <igor@sysoev.ru>
parents:
3477
diff
changeset
|
3648 ngx_str_set(&v->port, "80"); |
| 1658 | 3649 |
| 3650 } else { | |
|
3516
dd1570b6f237
ngx_str_set() and ngx_str_null()
Igor Sysoev <igor@sysoev.ru>
parents:
3477
diff
changeset
|
3651 ngx_str_set(&v->port, "443"); |
| 1658 | 3652 } |
| 3653 | |
| 3654 } 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
|
3655 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
|
3656 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
|
3657 v->port = u->port_text; |
| 1658 | 3658 } |
| 3659 | |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
3660 v->key_start.len += v->host_header.len; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
3661 |
| 1658 | 3662 } else { |
|
3516
dd1570b6f237
ngx_str_set() and ngx_str_null()
Igor Sysoev <igor@sysoev.ru>
parents:
3477
diff
changeset
|
3663 ngx_str_set(&v->host_header, "localhost"); |
|
dd1570b6f237
ngx_str_set() and ngx_str_null()
Igor Sysoev <igor@sysoev.ru>
parents:
3477
diff
changeset
|
3664 ngx_str_null(&v->port); |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2430
diff
changeset
|
3665 v->key_start.len += sizeof("unix:") - 1 + u->host.len + 1; |
| 1658 | 3666 } |
| 3667 | |
| 3668 v->uri = u->uri; | |
| 3669 } |