nginx-quic: src/http/ngx_http_upstream.c annotate

annotate src/http/ngx_http_upstream.c @ 5937:5b9f711dc819

Upstream: inheritance of proxy_pass and friends (ticket #645). Instead of independant inheritance of conf->upstream.upstream (proxy_pass without variables) and conf->proxy_lengths (proxy_pass with variables) we now test them both and inherit only if neither is set. Additionally, SSL context is also inherited only in this case now. Based on the patch by Alexey Radkov.

author	Maxim Dounin <mdounin@mdounin.ru>
date	Tue, 09 Dec 2014 18:21:55 +0300
parents	1573fc7875fa
children	d9025ea1f5a5

rev	line source
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2 /*
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3 * Copyright (C) Igor Sysoev
4412 d620f497c50f Copyright updated. Maxim Konovalov <maxim@nginx.com> parents: 4385 diff changeset	4 * Copyright (C) Nginx, Inc.
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	5 */
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	6
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	7
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	8 #include <ngx_config.h>
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	9 #include <ngx_core.h>
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	10 #include <ngx_http.h>
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	11
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	12
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	13 #if (NGX_HTTP_CACHE)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	14 static ngx_int_t ngx_http_upstream_cache(ngx_http_request_t *r,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	15 ngx_http_upstream_t *u);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	16 static ngx_int_t ngx_http_upstream_cache_send(ngx_http_request_t *r,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	17 ngx_http_upstream_t *u);
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	18 static ngx_int_t ngx_http_upstream_cache_status(ngx_http_request_t *r,
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	19 ngx_http_variable_value_t *v, uintptr_t data);
5441 43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	20 static ngx_int_t ngx_http_upstream_cache_last_modified(ngx_http_request_t *r,
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	21 ngx_http_variable_value_t *v, uintptr_t data);
5738 c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	22 static ngx_int_t ngx_http_upstream_cache_etag(ngx_http_request_t *r,
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	23 ngx_http_variable_value_t *v, uintptr_t data);
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	24 #endif
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	25
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	26 static void ngx_http_upstream_init_request(ngx_http_request_t *r);
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	27 static void ngx_http_upstream_resolve_handler(ngx_resolver_ctx_t *ctx);
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	28 static void ngx_http_upstream_rd_check_broken_connection(ngx_http_request_t *r);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	29 static void ngx_http_upstream_wr_check_broken_connection(ngx_http_request_t *r);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	30 static void ngx_http_upstream_check_broken_connection(ngx_http_request_t *r,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	31 ngx_event_t *ev);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	32 static void ngx_http_upstream_connect(ngx_http_request_t *r,
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	33 ngx_http_upstream_t *u);
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	34 static ngx_int_t ngx_http_upstream_reinit(ngx_http_request_t *r,
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	35 ngx_http_upstream_t *u);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	36 static void ngx_http_upstream_send_request(ngx_http_request_t *r,
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	37 ngx_http_upstream_t *u);
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	38 static void ngx_http_upstream_send_request_handler(ngx_http_request_t *r,
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	39 ngx_http_upstream_t *u);
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	40 static void ngx_http_upstream_process_header(ngx_http_request_t *r,
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	41 ngx_http_upstream_t *u);
2268 33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	42 static ngx_int_t ngx_http_upstream_test_next(ngx_http_request_t *r,
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	43 ngx_http_upstream_t *u);
2267 920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	44 static ngx_int_t ngx_http_upstream_intercept_errors(ngx_http_request_t *r,
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	45 ngx_http_upstream_t *u);
1153 c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	46 static ngx_int_t ngx_http_upstream_test_connect(ngx_connection_t *c);
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	47 static ngx_int_t ngx_http_upstream_process_headers(ngx_http_request_t *r,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	48 ngx_http_upstream_t *u);
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	49 static void ngx_http_upstream_process_body_in_memory(ngx_http_request_t *r,
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	50 ngx_http_upstream_t *u);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	51 static void ngx_http_upstream_send_response(ngx_http_request_t *r,
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	52 ngx_http_upstream_t *u);
5072 7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	53 static void ngx_http_upstream_upgrade(ngx_http_request_t *r,
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	54 ngx_http_upstream_t *u);
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	55 static void ngx_http_upstream_upgraded_read_downstream(ngx_http_request_t *r);
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	56 static void ngx_http_upstream_upgraded_write_downstream(ngx_http_request_t *r);
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	57 static void ngx_http_upstream_upgraded_read_upstream(ngx_http_request_t *r,
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	58 ngx_http_upstream_t *u);
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	59 static void ngx_http_upstream_upgraded_write_upstream(ngx_http_request_t *r,
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	60 ngx_http_upstream_t *u);
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	61 static void ngx_http_upstream_process_upgraded(ngx_http_request_t *r,
5073 52eb762c68a9 Proxy: fixed do_write handling in previous commit. Maxim Dounin <mdounin@mdounin.ru> parents: 5072 diff changeset	62 ngx_uint_t from_upstream, ngx_uint_t do_write);
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	63 static void
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	64 ngx_http_upstream_process_non_buffered_downstream(ngx_http_request_t *r);
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	65 static void
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	66 ngx_http_upstream_process_non_buffered_upstream(ngx_http_request_t *r,
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	67 ngx_http_upstream_t *u);
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	68 static void
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	69 ngx_http_upstream_process_non_buffered_request(ngx_http_request_t *r,
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	70 ngx_uint_t do_write);
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	71 static ngx_int_t ngx_http_upstream_non_buffered_filter_init(void *data);
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	72 static ngx_int_t ngx_http_upstream_non_buffered_filter(void *data,
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	73 ssize_t bytes);
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	74 static void ngx_http_upstream_process_downstream(ngx_http_request_t *r);
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	75 static void ngx_http_upstream_process_upstream(ngx_http_request_t *r,
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	76 ngx_http_upstream_t *u);
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	77 static void ngx_http_upstream_process_request(ngx_http_request_t *r);
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	78 static void ngx_http_upstream_store(ngx_http_request_t *r,
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	79 ngx_http_upstream_t *u);
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	80 static void ngx_http_upstream_dummy_handler(ngx_http_request_t *r,
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	81 ngx_http_upstream_t *u);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	82 static void ngx_http_upstream_next(ngx_http_request_t *r,
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	83 ngx_http_upstream_t *u, ngx_uint_t ft_type);
569 174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	84 static void ngx_http_upstream_cleanup(void *data);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	85 static void ngx_http_upstream_finalize_request(ngx_http_request_t *r,
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	86 ngx_http_upstream_t *u, ngx_int_t rc);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	87
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	88 static ngx_int_t ngx_http_upstream_process_header_line(ngx_http_request_t *r,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	89 ngx_table_elt_t *h, ngx_uint_t offset);
4117 103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	90 static ngx_int_t ngx_http_upstream_process_content_length(ngx_http_request_t *r,
103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	91 ngx_table_elt_t *h, ngx_uint_t offset);
5732 d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	92 static ngx_int_t ngx_http_upstream_process_last_modified(ngx_http_request_t *r,
d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	93 ngx_table_elt_t *h, ngx_uint_t offset);
3669 1f5841b1fcd7 treat Set-Cookie as a header that forbids caching Igor Sysoev <igor@sysoev.ru> parents: 3667 diff changeset	94 static ngx_int_t ngx_http_upstream_process_set_cookie(ngx_http_request_t *r,
1f5841b1fcd7 treat Set-Cookie as a header that forbids caching Igor Sysoev <igor@sysoev.ru> parents: 3667 diff changeset	95 ngx_table_elt_t *h, ngx_uint_t offset);
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	96 static ngx_int_t
2669 5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	97 ngx_http_upstream_process_cache_control(ngx_http_request_t *r,
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	98 ngx_table_elt_t *h, ngx_uint_t offset);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	99 static ngx_int_t ngx_http_upstream_ignore_header_line(ngx_http_request_t *r,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	100 ngx_table_elt_t *h, ngx_uint_t offset);
2666 81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	101 static ngx_int_t ngx_http_upstream_process_expires(ngx_http_request_t *r,
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	102 ngx_table_elt_t *h, ngx_uint_t offset);
2663 09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	103 static ngx_int_t ngx_http_upstream_process_accel_expires(ngx_http_request_t *r,
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	104 ngx_table_elt_t *h, ngx_uint_t offset);
527 7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	105 static ngx_int_t ngx_http_upstream_process_limit_rate(ngx_http_request_t *r,
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	106 ngx_table_elt_t *h, ngx_uint_t offset);
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	107 static ngx_int_t ngx_http_upstream_process_buffering(ngx_http_request_t *r,
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	108 ngx_table_elt_t *h, ngx_uint_t offset);
657 400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	109 static ngx_int_t ngx_http_upstream_process_charset(ngx_http_request_t *r,
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	110 ngx_table_elt_t *h, ngx_uint_t offset);
4124 0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	111 static ngx_int_t ngx_http_upstream_process_connection(ngx_http_request_t *r,
0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	112 ngx_table_elt_t *h, ngx_uint_t offset);
4123 0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	113 static ngx_int_t
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	114 ngx_http_upstream_process_transfer_encoding(ngx_http_request_t *r,
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	115 ngx_table_elt_t *h, ngx_uint_t offset);
5877 60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	116 static ngx_int_t ngx_http_upstream_process_vary(ngx_http_request_t *r,
60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	117 ngx_table_elt_t *h, ngx_uint_t offset);
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	118 static ngx_int_t ngx_http_upstream_copy_header_line(ngx_http_request_t *r,
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	119 ngx_table_elt_t *h, ngx_uint_t offset);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	120 static ngx_int_t
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	121 ngx_http_upstream_copy_multi_header_lines(ngx_http_request_t *r,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	122 ngx_table_elt_t *h, ngx_uint_t offset);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	123 static ngx_int_t ngx_http_upstream_copy_content_type(ngx_http_request_t *r,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	124 ngx_table_elt_t *h, ngx_uint_t offset);
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	125 static ngx_int_t ngx_http_upstream_copy_last_modified(ngx_http_request_t *r,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	126 ngx_table_elt_t *h, ngx_uint_t offset);
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	127 static ngx_int_t ngx_http_upstream_rewrite_location(ngx_http_request_t *r,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	128 ngx_table_elt_t *h, ngx_uint_t offset);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	129 static ngx_int_t ngx_http_upstream_rewrite_refresh(ngx_http_request_t *r,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	130 ngx_table_elt_t *h, ngx_uint_t offset);
4464 7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	131 static ngx_int_t ngx_http_upstream_rewrite_set_cookie(ngx_http_request_t *r,
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	132 ngx_table_elt_t *h, ngx_uint_t offset);
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	133 static ngx_int_t ngx_http_upstream_copy_allow_ranges(ngx_http_request_t *r,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	134 ngx_table_elt_t *h, ngx_uint_t offset);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	135
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	136 #if (NGX_HTTP_GZIP)
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	137 static ngx_int_t ngx_http_upstream_copy_content_encoding(ngx_http_request_t *r,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	138 ngx_table_elt_t *h, ngx_uint_t offset);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	139 #endif
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	140
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	141 static ngx_int_t ngx_http_upstream_add_variables(ngx_conf_t *cf);
1181 ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	142 static ngx_int_t ngx_http_upstream_addr_variable(ngx_http_request_t *r,
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	143 ngx_http_variable_value_t *v, uintptr_t data);
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	144 static ngx_int_t ngx_http_upstream_status_variable(ngx_http_request_t *r,
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	145 ngx_http_variable_value_t *v, uintptr_t data);
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	146 static ngx_int_t ngx_http_upstream_response_time_variable(ngx_http_request_t *r,
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	147 ngx_http_variable_value_t *v, uintptr_t data);
2402 cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	148 static ngx_int_t ngx_http_upstream_response_length_variable(
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	149 ngx_http_request_t r, ngx_http_variable_value_t v, uintptr_t data);
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	150
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	151 static char ngx_http_upstream(ngx_conf_t cf, ngx_command_t cmd, void dummy);
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	152 static char ngx_http_upstream_server(ngx_conf_t cf, ngx_command_t *cmd,
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	153 void *conf);
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	154
5008 fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	155 static ngx_addr_t ngx_http_upstream_get_local(ngx_http_request_t r,
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	156 ngx_http_upstream_local_t *local);
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	157
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	158 static void ngx_http_upstream_create_main_conf(ngx_conf_t cf);
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	159 static char ngx_http_upstream_init_main_conf(ngx_conf_t cf, void *conf);
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	160
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	161 #if (NGX_HTTP_SSL)
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	162 static void ngx_http_upstream_ssl_init_connection(ngx_http_request_t *,
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	163 ngx_http_upstream_t u, ngx_connection_t c);
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	164 static void ngx_http_upstream_ssl_handshake(ngx_connection_t *c);
5660 7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	165 static ngx_int_t ngx_http_upstream_ssl_name(ngx_http_request_t *r,
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	166 ngx_http_upstream_t u, ngx_connection_t c);
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	167 #endif
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	168
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	169
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	170 ngx_http_upstream_header_t ngx_http_upstream_headers_in[] = {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	171
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	172 { ngx_string("Status"),
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	173 ngx_http_upstream_process_header_line,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	174 offsetof(ngx_http_upstream_headers_in_t, status),
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	175 ngx_http_upstream_copy_header_line, 0, 0 },
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	176
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	177 { ngx_string("Content-Type"),
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	178 ngx_http_upstream_process_header_line,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	179 offsetof(ngx_http_upstream_headers_in_t, content_type),
673 b80f94fa2197 nginx-0.3.58-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 671 diff changeset	180 ngx_http_upstream_copy_content_type, 0, 1 },
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	181
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	182 { ngx_string("Content-Length"),
5731 02674312be45 Upstream: removed unused offset to content_length. Maxim Dounin <mdounin@mdounin.ru> parents: 5730 diff changeset	183 ngx_http_upstream_process_content_length, 0,
4117 103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	184 ngx_http_upstream_ignore_header_line, 0, 0 },
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	185
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	186 { ngx_string("Date"),
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	187 ngx_http_upstream_process_header_line,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	188 offsetof(ngx_http_upstream_headers_in_t, date),
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	189 ngx_http_upstream_copy_header_line,
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	190 offsetof(ngx_http_headers_out_t, date), 0 },
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	191
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	192 { ngx_string("Last-Modified"),
5732 d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	193 ngx_http_upstream_process_last_modified, 0,
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	194 ngx_http_upstream_copy_last_modified, 0, 0 },
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	195
3037 0278f13b04c5 process upstream ETag header Igor Sysoev <igor@sysoev.ru> parents: 3032 diff changeset	196 { ngx_string("ETag"),
0278f13b04c5 process upstream ETag header Igor Sysoev <igor@sysoev.ru> parents: 3032 diff changeset	197 ngx_http_upstream_process_header_line,
0278f13b04c5 process upstream ETag header Igor Sysoev <igor@sysoev.ru> parents: 3032 diff changeset	198 offsetof(ngx_http_upstream_headers_in_t, etag),
0278f13b04c5 process upstream ETag header Igor Sysoev <igor@sysoev.ru> parents: 3032 diff changeset	199 ngx_http_upstream_copy_header_line,
0278f13b04c5 process upstream ETag header Igor Sysoev <igor@sysoev.ru> parents: 3032 diff changeset	200 offsetof(ngx_http_headers_out_t, etag), 0 },
0278f13b04c5 process upstream ETag header Igor Sysoev <igor@sysoev.ru> parents: 3032 diff changeset	201
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	202 { ngx_string("Server"),
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	203 ngx_http_upstream_process_header_line,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	204 offsetof(ngx_http_upstream_headers_in_t, server),
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	205 ngx_http_upstream_copy_header_line,
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	206 offsetof(ngx_http_headers_out_t, server), 0 },
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	207
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	208 { ngx_string("WWW-Authenticate"),
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	209 ngx_http_upstream_process_header_line,
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	210 offsetof(ngx_http_upstream_headers_in_t, www_authenticate),
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	211 ngx_http_upstream_copy_header_line, 0, 0 },
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	212
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	213 { ngx_string("Location"),
2140 dce5ddef5af9 if upstream sent a location header without status use 302 Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	214 ngx_http_upstream_process_header_line,
dce5ddef5af9 if upstream sent a location header without status use 302 Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	215 offsetof(ngx_http_upstream_headers_in_t, location),
515 417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	216 ngx_http_upstream_rewrite_location, 0, 0 },
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	217
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	218 { ngx_string("Refresh"),
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	219 ngx_http_upstream_ignore_header_line, 0,
515 417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	220 ngx_http_upstream_rewrite_refresh, 0, 0 },
417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	221
417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	222 { ngx_string("Set-Cookie"),
5677 3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	223 ngx_http_upstream_process_set_cookie,
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	224 offsetof(ngx_http_upstream_headers_in_t, cookies),
4464 7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	225 ngx_http_upstream_rewrite_set_cookie, 0, 1 },
531 c3bd8cdabb8f nginx-0.1.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	226
c3bd8cdabb8f nginx-0.1.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	227 { ngx_string("Content-Disposition"),
c3bd8cdabb8f nginx-0.1.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	228 ngx_http_upstream_ignore_header_line, 0,
c3bd8cdabb8f nginx-0.1.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	229 ngx_http_upstream_copy_header_line, 0, 1 },
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	230
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	231 { ngx_string("Cache-Control"),
2669 5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	232 ngx_http_upstream_process_cache_control, 0,
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	233 ngx_http_upstream_copy_multi_header_lines,
515 417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	234 offsetof(ngx_http_headers_out_t, cache_control), 1 },
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	235
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	236 { ngx_string("Expires"),
2666 81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	237 ngx_http_upstream_process_expires, 0,
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	238 ngx_http_upstream_copy_header_line,
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	239 offsetof(ngx_http_headers_out_t, expires), 1 },
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	240
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	241 { ngx_string("Accept-Ranges"),
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	242 ngx_http_upstream_process_header_line,
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	243 offsetof(ngx_http_upstream_headers_in_t, accept_ranges),
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	244 ngx_http_upstream_copy_allow_ranges,
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	245 offsetof(ngx_http_headers_out_t, accept_ranges), 1 },
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	246
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	247 { ngx_string("Connection"),
4124 0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	248 ngx_http_upstream_process_connection, 0,
515 417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	249 ngx_http_upstream_ignore_header_line, 0, 0 },
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	250
641 5e8fb59c18c1 nginx-0.3.42-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	251 { ngx_string("Keep-Alive"),
5e8fb59c18c1 nginx-0.3.42-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	252 ngx_http_upstream_ignore_header_line, 0,
5e8fb59c18c1 nginx-0.3.42-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	253 ngx_http_upstream_ignore_header_line, 0, 0 },
5e8fb59c18c1 nginx-0.3.42-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	254
5877 60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	255 { ngx_string("Vary"),
60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	256 ngx_http_upstream_process_vary, 0,
60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	257 ngx_http_upstream_copy_header_line, 0, 0 },
60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	258
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	259 { ngx_string("X-Powered-By"),
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	260 ngx_http_upstream_ignore_header_line, 0,
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	261 ngx_http_upstream_copy_header_line, 0, 0 },
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	262
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	263 { ngx_string("X-Accel-Expires"),
2664 f903114355d4 zero field Igor Sysoev <igor@sysoev.ru> parents: 2663 diff changeset	264 ngx_http_upstream_process_accel_expires, 0,
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	265 ngx_http_upstream_copy_header_line, 0, 0 },
515 417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	266
417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	267 { ngx_string("X-Accel-Redirect"),
417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	268 ngx_http_upstream_process_header_line,
417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	269 offsetof(ngx_http_upstream_headers_in_t, x_accel_redirect),
3003 b630e7d095b3 allow to proxy_pass_header/fastcgi_pass_header "X-Accel-Redirect", Igor Sysoev <igor@sysoev.ru> parents: 2971 diff changeset	270 ngx_http_upstream_copy_header_line, 0, 0 },
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	271
527 7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	272 { ngx_string("X-Accel-Limit-Rate"),
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	273 ngx_http_upstream_process_limit_rate, 0,
3003 b630e7d095b3 allow to proxy_pass_header/fastcgi_pass_header "X-Accel-Redirect", Igor Sysoev <igor@sysoev.ru> parents: 2971 diff changeset	274 ngx_http_upstream_copy_header_line, 0, 0 },
527 7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	275
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	276 { ngx_string("X-Accel-Buffering"),
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	277 ngx_http_upstream_process_buffering, 0,
3003 b630e7d095b3 allow to proxy_pass_header/fastcgi_pass_header "X-Accel-Redirect", Igor Sysoev <igor@sysoev.ru> parents: 2971 diff changeset	278 ngx_http_upstream_copy_header_line, 0, 0 },
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	279
657 400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	280 { ngx_string("X-Accel-Charset"),
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	281 ngx_http_upstream_process_charset, 0,
3003 b630e7d095b3 allow to proxy_pass_header/fastcgi_pass_header "X-Accel-Redirect", Igor Sysoev <igor@sysoev.ru> parents: 2971 diff changeset	282 ngx_http_upstream_copy_header_line, 0, 0 },
657 400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	283
4123 0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	284 { ngx_string("Transfer-Encoding"),
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	285 ngx_http_upstream_process_transfer_encoding, 0,
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	286 ngx_http_upstream_ignore_header_line, 0, 0 },
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	287
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	288 #if (NGX_HTTP_GZIP)
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	289 { ngx_string("Content-Encoding"),
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	290 ngx_http_upstream_process_header_line,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	291 offsetof(ngx_http_upstream_headers_in_t, content_encoding),
515 417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	292 ngx_http_upstream_copy_content_encoding, 0, 0 },
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	293 #endif
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	294
515 417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	295 { ngx_null_string, NULL, 0, NULL, 0, 0 }
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	296 };
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	297
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	298
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	299 static ngx_command_t ngx_http_upstream_commands[] = {
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	300
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	301 { ngx_string("upstream"),
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	302 NGX_HTTP_MAIN_CONF\|NGX_CONF_BLOCK\|NGX_CONF_TAKE1,
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	303 ngx_http_upstream,
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	304 0,
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	305 0,
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	306 NULL },
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	307
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	308 { ngx_string("server"),
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	309 NGX_HTTP_UPS_CONF\|NGX_CONF_1MORE,
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	310 ngx_http_upstream_server,
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	311 NGX_HTTP_SRV_CONF_OFFSET,
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	312 0,
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	313 NULL },
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	314
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	315 ngx_null_command
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	316 };
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	317
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	318
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	319 static ngx_http_module_t ngx_http_upstream_module_ctx = {
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	320 ngx_http_upstream_add_variables, /* preconfiguration */
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	321 NULL, /* postconfiguration */
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	322
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	323 ngx_http_upstream_create_main_conf, /* create main configuration */
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	324 ngx_http_upstream_init_main_conf, /* init main configuration */
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	325
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	326 NULL, /* create server configuration */
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	327 NULL, /* merge server configuration */
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	328
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	329 NULL, /* create location configuration */
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	330 NULL /* merge location configuration */
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	331 };
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	332
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	333
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	334 ngx_module_t ngx_http_upstream_module = {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	335 NGX_MODULE_V1,
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	336 &ngx_http_upstream_module_ctx, /* module context */
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	337 ngx_http_upstream_commands, /* module directives */
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	338 NGX_HTTP_MODULE, /* module type */
541 b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 537 diff changeset	339 NULL, /* init master */
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	340 NULL, /* init module */
541 b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 537 diff changeset	341 NULL, /* init process */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 537 diff changeset	342 NULL, /* init thread */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 537 diff changeset	343 NULL, /* exit thread */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 537 diff changeset	344 NULL, /* exit process */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 537 diff changeset	345 NULL, /* exit master */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 537 diff changeset	346 NGX_MODULE_V1_PADDING
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	347 };
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	348
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	349
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	350 static ngx_http_variable_t ngx_http_upstream_vars[] = {
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	351
1181 ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	352 { ngx_string("upstream_addr"), NULL,
2377 87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	353 ngx_http_upstream_addr_variable, 0,
3898 bd1222fb0192 allow to use $upstream_... variables in SSI Igor Sysoev <igor@sysoev.ru> parents: 3879 diff changeset	354 NGX_HTTP_VAR_NOCACHEABLE, 0 },
1181 ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	355
637 e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 629 diff changeset	356 { ngx_string("upstream_status"), NULL,
2377 87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	357 ngx_http_upstream_status_variable, 0,
3898 bd1222fb0192 allow to use $upstream_... variables in SSI Igor Sysoev <igor@sysoev.ru> parents: 3879 diff changeset	358 NGX_HTTP_VAR_NOCACHEABLE, 0 },
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	359
637 e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 629 diff changeset	360 { ngx_string("upstream_response_time"), NULL,
2377 87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	361 ngx_http_upstream_response_time_variable, 0,
3898 bd1222fb0192 allow to use $upstream_... variables in SSI Igor Sysoev <igor@sysoev.ru> parents: 3879 diff changeset	362 NGX_HTTP_VAR_NOCACHEABLE, 0 },
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	363
2402 cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	364 { ngx_string("upstream_response_length"), NULL,
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	365 ngx_http_upstream_response_length_variable, 0,
3898 bd1222fb0192 allow to use $upstream_... variables in SSI Igor Sysoev <igor@sysoev.ru> parents: 3879 diff changeset	366 NGX_HTTP_VAR_NOCACHEABLE, 0 },
2402 cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	367
2957 b4f39842523b fix building --without-http-cache, broken in r2953 Igor Sysoev <igor@sysoev.ru> parents: 2953 diff changeset	368 #if (NGX_HTTP_CACHE)
b4f39842523b fix building --without-http-cache, broken in r2953 Igor Sysoev <igor@sysoev.ru> parents: 2953 diff changeset	369
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	370 { ngx_string("upstream_cache_status"), NULL,
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	371 ngx_http_upstream_cache_status, 0,
3898 bd1222fb0192 allow to use $upstream_... variables in SSI Igor Sysoev <igor@sysoev.ru> parents: 3879 diff changeset	372 NGX_HTTP_VAR_NOCACHEABLE, 0 },
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	373
5441 43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	374 { ngx_string("upstream_cache_last_modified"), NULL,
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	375 ngx_http_upstream_cache_last_modified, 0,
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	376 NGX_HTTP_VAR_NOCACHEABLE\|NGX_HTTP_VAR_NOHASH, 0 },
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	377
5738 c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	378 { ngx_string("upstream_cache_etag"), NULL,
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	379 ngx_http_upstream_cache_etag, 0,
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	380 NGX_HTTP_VAR_NOCACHEABLE\|NGX_HTTP_VAR_NOHASH, 0 },
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	381
2957 b4f39842523b fix building --without-http-cache, broken in r2953 Igor Sysoev <igor@sysoev.ru> parents: 2953 diff changeset	382 #endif
b4f39842523b fix building --without-http-cache, broken in r2953 Igor Sysoev <igor@sysoev.ru> parents: 2953 diff changeset	383
637 e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 629 diff changeset	384 { ngx_null_string, NULL, NULL, 0, 0, 0 }
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	385 };
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	386
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	387
2268 33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	388 static ngx_http_upstream_next_t ngx_http_upstream_next_errors[] = {
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	389 { 500, NGX_HTTP_UPSTREAM_FT_HTTP_500 },
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	390 { 502, NGX_HTTP_UPSTREAM_FT_HTTP_502 },
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	391 { 503, NGX_HTTP_UPSTREAM_FT_HTTP_503 },
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	392 { 504, NGX_HTTP_UPSTREAM_FT_HTTP_504 },
5231 05c53652e7b4 Upstream: http_403 support in proxy_next_upstream (and friends). Maxim Dounin <mdounin@mdounin.ru> parents: 5217 diff changeset	393 { 403, NGX_HTTP_UPSTREAM_FT_HTTP_403 },
2268 33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	394 { 404, NGX_HTTP_UPSTREAM_FT_HTTP_404 },
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	395 { 0, 0 }
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	396 };
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	397
2875 6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2874 diff changeset	398
6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2874 diff changeset	399 ngx_conf_bitmask_t ngx_http_upstream_cache_method_mask[] = {
6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2874 diff changeset	400 { ngx_string("GET"), NGX_HTTP_GET},
6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2874 diff changeset	401 { ngx_string("HEAD"), NGX_HTTP_HEAD },
6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2874 diff changeset	402 { ngx_string("POST"), NGX_HTTP_POST },
6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2874 diff changeset	403 { ngx_null_string, 0 }
6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2874 diff changeset	404 };
6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2874 diff changeset	405
6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2874 diff changeset	406
3667 12bd9e26fadb use shared ngx_http_upstream_ignore_headers_masks[] Igor Sysoev <igor@sysoev.ru> parents: 3527 diff changeset	407 ngx_conf_bitmask_t ngx_http_upstream_ignore_headers_masks[] = {
12bd9e26fadb use shared ngx_http_upstream_ignore_headers_masks[] Igor Sysoev <igor@sysoev.ru> parents: 3527 diff changeset	408 { ngx_string("X-Accel-Redirect"), NGX_HTTP_UPSTREAM_IGN_XA_REDIRECT },
12bd9e26fadb use shared ngx_http_upstream_ignore_headers_masks[] Igor Sysoev <igor@sysoev.ru> parents: 3527 diff changeset	409 { ngx_string("X-Accel-Expires"), NGX_HTTP_UPSTREAM_IGN_XA_EXPIRES },
4197 cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	410 { ngx_string("X-Accel-Limit-Rate"), NGX_HTTP_UPSTREAM_IGN_XA_LIMIT_RATE },
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	411 { ngx_string("X-Accel-Buffering"), NGX_HTTP_UPSTREAM_IGN_XA_BUFFERING },
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	412 { ngx_string("X-Accel-Charset"), NGX_HTTP_UPSTREAM_IGN_XA_CHARSET },
3667 12bd9e26fadb use shared ngx_http_upstream_ignore_headers_masks[] Igor Sysoev <igor@sysoev.ru> parents: 3527 diff changeset	413 { ngx_string("Expires"), NGX_HTTP_UPSTREAM_IGN_EXPIRES },
12bd9e26fadb use shared ngx_http_upstream_ignore_headers_masks[] Igor Sysoev <igor@sysoev.ru> parents: 3527 diff changeset	414 { ngx_string("Cache-Control"), NGX_HTTP_UPSTREAM_IGN_CACHE_CONTROL },
3669 1f5841b1fcd7 treat Set-Cookie as a header that forbids caching Igor Sysoev <igor@sysoev.ru> parents: 3667 diff changeset	415 { ngx_string("Set-Cookie"), NGX_HTTP_UPSTREAM_IGN_SET_COOKIE },
5877 60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	416 { ngx_string("Vary"), NGX_HTTP_UPSTREAM_IGN_VARY },
3667 12bd9e26fadb use shared ngx_http_upstream_ignore_headers_masks[] Igor Sysoev <igor@sysoev.ru> parents: 3527 diff changeset	417 { ngx_null_string, 0 }
12bd9e26fadb use shared ngx_http_upstream_ignore_headers_masks[] Igor Sysoev <igor@sysoev.ru> parents: 3527 diff changeset	418 };
12bd9e26fadb use shared ngx_http_upstream_ignore_headers_masks[] Igor Sysoev <igor@sysoev.ru> parents: 3527 diff changeset	419
12bd9e26fadb use shared ngx_http_upstream_ignore_headers_masks[] Igor Sysoev <igor@sysoev.ru> parents: 3527 diff changeset	420
3006 95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	421 ngx_int_t
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	422 ngx_http_upstream_create(ngx_http_request_t *r)
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	423 {
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	424 ngx_http_upstream_t *u;
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	425
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	426 u = r->upstream;
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	427
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	428 if (u && u->cleanup) {
3112 5ddc9458e4bb increase request counter before an upstream cleanup because the cleanup Igor Sysoev <igor@sysoev.ru> parents: 3083 diff changeset	429 r->main->count++;
3006 95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	430 ngx_http_upstream_cleanup(r);
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	431 }
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	432
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	433 u = ngx_pcalloc(r->pool, sizeof(ngx_http_upstream_t));
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	434 if (u == NULL) {
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	435 return NGX_ERROR;
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	436 }
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	437
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	438 r->upstream = u;
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	439
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	440 u->peer.log = r->connection->log;
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	441 u->peer.log_error = NGX_ERROR_ERR;
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	442 #if (NGX_THREADS)
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	443 u->peer.lock = &r->connection->lock;
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	444 #endif
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	445
3056 d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	446 #if (NGX_HTTP_CACHE)
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	447 r->cache = NULL;
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	448 #endif
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	449
4117 103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	450 u->headers_in.content_length_n = -1;
5869 fd283aa92e04 Upstream: fix $upstream_cache_last_modified variable. Piotr Sikora <piotr@cloudflare.com> parents: 5848 diff changeset	451 u->headers_in.last_modified_time = -1;
4117 103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	452
3006 95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	453 return NGX_OK;
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	454 }
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	455
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	456
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	457 void
31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	458 ngx_http_upstream_init(ngx_http_request_t *r)
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	459 {
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	460 ngx_connection_t *c;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	461
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	462 c = r->connection;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	463
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	464 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	465 "http init upstream, client timer: %d", c->read->timer_set);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	466
5121 c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: 5113 diff changeset	467 #if (NGX_HTTP_SPDY)
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: 5113 diff changeset	468 if (r->spdy_stream) {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: 5113 diff changeset	469 ngx_http_upstream_init_request(r);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: 5113 diff changeset	470 return;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: 5113 diff changeset	471 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: 5113 diff changeset	472 #endif
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: 5113 diff changeset	473
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	474 if (c->read->timer_set) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	475 ngx_del_timer(c->read);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	476 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	477
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	478 if (ngx_event_flags & NGX_USE_CLEAR_EVENT) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	479
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	480 if (!c->write->active) {
531 c3bd8cdabb8f nginx-0.1.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	481 if (ngx_add_event(c->write, NGX_WRITE_EVENT, NGX_CLEAR_EVENT)
c3bd8cdabb8f nginx-0.1.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	482 == NGX_ERROR)
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	483 {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	484 ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	485 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	486 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	487 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	488 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	489
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	490 ngx_http_upstream_init_request(r);
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	491 }
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	492
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	493
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	494 static void
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	495 ngx_http_upstream_init_request(ngx_http_request_t *r)
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	496 {
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	497 ngx_str_t *host;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	498 ngx_uint_t i;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	499 ngx_resolver_ctx_t *ctx, temp;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	500 ngx_http_cleanup_t *cln;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	501 ngx_http_upstream_t *u;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	502 ngx_http_core_loc_conf_t *clcf;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	503 ngx_http_upstream_srv_conf_t uscf, *uscfp;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	504 ngx_http_upstream_main_conf_t *umcf;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	505
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	506 if (r->aio) {
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	507 return;
537 c9ad0d9c7d59 nginx-0.1.43-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 531 diff changeset	508 }
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	509
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	510 u = r->upstream;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	511
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	512 #if (NGX_HTTP_CACHE)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	513
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	514 if (u->conf->cache) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	515 ngx_int_t rc;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	516
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	517 rc = ngx_http_upstream_cache(r, u);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	518
3055 92b6cfaa3c27 fix sending a cached file using AIO Igor Sysoev <igor@sysoev.ru> parents: 3053 diff changeset	519 if (rc == NGX_BUSY) {
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	520 r->write_event_handler = ngx_http_upstream_init_request;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	521 return;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	522 }
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	523
3055 92b6cfaa3c27 fix sending a cached file using AIO Igor Sysoev <igor@sysoev.ru> parents: 3053 diff changeset	524 r->write_event_handler = ngx_http_request_empty_handler;
92b6cfaa3c27 fix sending a cached file using AIO Igor Sysoev <igor@sysoev.ru> parents: 3053 diff changeset	525
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	526 if (rc == NGX_DONE) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	527 return;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	528 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	529
5827 54e9b83d00f0 Upstream: avoided directly terminating the connection. FengGu <flygoast@126.com> parents: 5818 diff changeset	530 if (rc == NGX_ERROR) {
54e9b83d00f0 Upstream: avoided directly terminating the connection. FengGu <flygoast@126.com> parents: 5818 diff changeset	531 ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
54e9b83d00f0 Upstream: avoided directly terminating the connection. FengGu <flygoast@126.com> parents: 5818 diff changeset	532 return;
54e9b83d00f0 Upstream: avoided directly terminating the connection. FengGu <flygoast@126.com> parents: 5818 diff changeset	533 }
54e9b83d00f0 Upstream: avoided directly terminating the connection. FengGu <flygoast@126.com> parents: 5818 diff changeset	534
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	535 if (rc != NGX_DECLINED) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	536 ngx_http_finalize_request(r, rc);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	537 return;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	538 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	539 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	540
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	541 #endif
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	542
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	543 u->store = (u->conf->store \|\| u->conf->store_lengths);
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	544
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	545 if (!u->store && !r->post_action && !u->conf->ignore_client_abort) {
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	546 r->read_event_handler = ngx_http_upstream_rd_check_broken_connection;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	547 r->write_event_handler = ngx_http_upstream_wr_check_broken_connection;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	548 }
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	549
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	550 if (r->request_body) {
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	551 u->request_bufs = r->request_body->bufs;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	552 }
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	553
537 c9ad0d9c7d59 nginx-0.1.43-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 531 diff changeset	554 if (u->create_request(r) != NGX_OK) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	555 ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	556 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	557 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	558
5008 fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	559 u->peer.local = ngx_http_upstream_get_local(r, u->conf->local);
3271 fcd98af88df3 proxy_bind, fastcgi_bind, and memcached_bind Igor Sysoev <igor@sysoev.ru> parents: 3198 diff changeset	560
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	561 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	562
3053 0d253659da12 directio_alignment Igor Sysoev <igor@sysoev.ru> parents: 3052 diff changeset	563 u->output.alignment = clcf->directio_alignment;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	564 u->output.pool = r->pool;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	565 u->output.bufs.num = 1;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	566 u->output.bufs.size = clcf->client_body_buffer_size;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	567 u->output.output_filter = ngx_chain_writer;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	568 u->output.filter_ctx = &u->writer;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	569
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	570 u->writer.pool = r->pool;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	571
1168 4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	572 if (r->upstream_states == NULL) {
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	573
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	574 r->upstream_states = ngx_array_create(r->pool, 1,
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	575 sizeof(ngx_http_upstream_state_t));
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	576 if (r->upstream_states == NULL) {
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	577 ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	578 return;
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	579 }
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	580
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	581 } else {
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	582
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	583 u->state = ngx_array_push(r->upstream_states);
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	584 if (u->state == NULL) {
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	585 ngx_http_upstream_finalize_request(r, u,
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	586 NGX_HTTP_INTERNAL_SERVER_ERROR);
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	587 return;
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	588 }
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	589
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	590 ngx_memzero(u->state, sizeof(ngx_http_upstream_state_t));
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	591 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	592
593 425af804d968 nginx-0.3.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 591 diff changeset	593 cln = ngx_http_cleanup_add(r, 0);
569 174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	594 if (cln == NULL) {
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	595 ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	596 return;
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	597 }
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	598
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	599 cln->handler = ngx_http_upstream_cleanup;
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	600 cln->data = r;
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	601 u->cleanup = &cln->handler;
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	602
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	603 if (u->resolved == NULL) {
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	604
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	605 uscf = u->conf->upstream;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	606
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	607 } else {
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	608
5660 7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	609 #if (NGX_HTTP_SSL)
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	610 u->ssl_name = u->resolved->host;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	611 #endif
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	612
2422 7af1e5fe102c variable support for unix sockets in fastcgi_pass and proxy_pass Igor Sysoev <igor@sysoev.ru> parents: 2413 diff changeset	613 if (u->resolved->sockaddr) {
7af1e5fe102c variable support for unix sockets in fastcgi_pass and proxy_pass Igor Sysoev <igor@sysoev.ru> parents: 2413 diff changeset	614
7af1e5fe102c variable support for unix sockets in fastcgi_pass and proxy_pass Igor Sysoev <igor@sysoev.ru> parents: 2413 diff changeset	615 if (ngx_http_upstream_create_round_robin_peer(r, u->resolved)
7af1e5fe102c variable support for unix sockets in fastcgi_pass and proxy_pass Igor Sysoev <igor@sysoev.ru> parents: 2413 diff changeset	616 != NGX_OK)
7af1e5fe102c variable support for unix sockets in fastcgi_pass and proxy_pass Igor Sysoev <igor@sysoev.ru> parents: 2413 diff changeset	617 {
3169 b1013d768911 fix request counter in resolver handling, the bug was introduced in r3050 Igor Sysoev <igor@sysoev.ru> parents: 3161 diff changeset	618 ngx_http_upstream_finalize_request(r, u,
b1013d768911 fix request counter in resolver handling, the bug was introduced in r3050 Igor Sysoev <igor@sysoev.ru> parents: 3161 diff changeset	619 NGX_HTTP_INTERNAL_SERVER_ERROR);
2422 7af1e5fe102c variable support for unix sockets in fastcgi_pass and proxy_pass Igor Sysoev <igor@sysoev.ru> parents: 2413 diff changeset	620 return;
7af1e5fe102c variable support for unix sockets in fastcgi_pass and proxy_pass Igor Sysoev <igor@sysoev.ru> parents: 2413 diff changeset	621 }
7af1e5fe102c variable support for unix sockets in fastcgi_pass and proxy_pass Igor Sysoev <igor@sysoev.ru> parents: 2413 diff changeset	622
7af1e5fe102c variable support for unix sockets in fastcgi_pass and proxy_pass Igor Sysoev <igor@sysoev.ru> parents: 2413 diff changeset	623 ngx_http_upstream_connect(r, u);
7af1e5fe102c variable support for unix sockets in fastcgi_pass and proxy_pass Igor Sysoev <igor@sysoev.ru> parents: 2413 diff changeset	624
7af1e5fe102c variable support for unix sockets in fastcgi_pass and proxy_pass Igor Sysoev <igor@sysoev.ru> parents: 2413 diff changeset	625 return;
7af1e5fe102c variable support for unix sockets in fastcgi_pass and proxy_pass Igor Sysoev <igor@sysoev.ru> parents: 2413 diff changeset	626 }
7af1e5fe102c variable support for unix sockets in fastcgi_pass and proxy_pass Igor Sysoev <igor@sysoev.ru> parents: 2413 diff changeset	627
1705 d22095839d86 optimize r->upstream usage Igor Sysoev <igor@sysoev.ru> parents: 1701 diff changeset	628 host = &u->resolved->host;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	629
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	630 umcf = ngx_http_get_module_main_conf(r, ngx_http_upstream_module);
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	631
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	632 uscfp = umcf->upstreams.elts;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	633
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	634 for (i = 0; i < umcf->upstreams.nelts; i++) {
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	635
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	636 uscf = uscfp[i];
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	637
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	638 if (uscf->host.len == host->len
2285 c77f4710595c fix r1913 Igor Sysoev <igor@sysoev.ru> parents: 2268 diff changeset	639 && ((uscf->port == 0 && u->resolved->no_port)
1912 68b426b43c31 fix r1903 Igor Sysoev <igor@sysoev.ru> parents: 1908 diff changeset	640 \|\| uscf->port == u->resolved->port)
5546 f385349d584b Proxy: fixed upstream search by proxy_pass with variables. Ruslan Ermilov <ru@nginx.com> parents: 5532 diff changeset	641 && ngx_strncasecmp(uscf->host.data, host->data, host->len) == 0)
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	642 {
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	643 goto found;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	644 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	645 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	646
3879 502a6b0acf3f fix case when a host in fastcgi_pass, scgi_pass, and uwsgi_pass Igor Sysoev <igor@sysoev.ru> parents: 3713 diff changeset	647 if (u->resolved->port == 0) {
502a6b0acf3f fix case when a host in fastcgi_pass, scgi_pass, and uwsgi_pass Igor Sysoev <igor@sysoev.ru> parents: 3713 diff changeset	648 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
502a6b0acf3f fix case when a host in fastcgi_pass, scgi_pass, and uwsgi_pass Igor Sysoev <igor@sysoev.ru> parents: 3713 diff changeset	649 "no port in upstream \"%V\"", host);
502a6b0acf3f fix case when a host in fastcgi_pass, scgi_pass, and uwsgi_pass Igor Sysoev <igor@sysoev.ru> parents: 3713 diff changeset	650 ngx_http_upstream_finalize_request(r, u,
502a6b0acf3f fix case when a host in fastcgi_pass, scgi_pass, and uwsgi_pass Igor Sysoev <igor@sysoev.ru> parents: 3713 diff changeset	651 NGX_HTTP_INTERNAL_SERVER_ERROR);
502a6b0acf3f fix case when a host in fastcgi_pass, scgi_pass, and uwsgi_pass Igor Sysoev <igor@sysoev.ru> parents: 3713 diff changeset	652 return;
502a6b0acf3f fix case when a host in fastcgi_pass, scgi_pass, and uwsgi_pass Igor Sysoev <igor@sysoev.ru> parents: 3713 diff changeset	653 }
502a6b0acf3f fix case when a host in fastcgi_pass, scgi_pass, and uwsgi_pass Igor Sysoev <igor@sysoev.ru> parents: 3713 diff changeset	654
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	655 temp.name = *host;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	656
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	657 ctx = ngx_resolve_start(clcf->resolver, &temp);
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	658 if (ctx == NULL) {
3169 b1013d768911 fix request counter in resolver handling, the bug was introduced in r3050 Igor Sysoev <igor@sysoev.ru> parents: 3161 diff changeset	659 ngx_http_upstream_finalize_request(r, u,
b1013d768911 fix request counter in resolver handling, the bug was introduced in r3050 Igor Sysoev <igor@sysoev.ru> parents: 3161 diff changeset	660 NGX_HTTP_INTERNAL_SERVER_ERROR);
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	661 return;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	662 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	663
1683 1e0b028055ec allow to use IP addresses without defined resolver Igor Sysoev <igor@sysoev.ru> parents: 1658 diff changeset	664 if (ctx == NGX_NO_RESOLVER) {
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	665 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
1683 1e0b028055ec allow to use IP addresses without defined resolver Igor Sysoev <igor@sysoev.ru> parents: 1658 diff changeset	666 "no resolver defined to resolve %V", host);
1e0b028055ec allow to use IP addresses without defined resolver Igor Sysoev <igor@sysoev.ru> parents: 1658 diff changeset	667
3169 b1013d768911 fix request counter in resolver handling, the bug was introduced in r3050 Igor Sysoev <igor@sysoev.ru> parents: 3161 diff changeset	668 ngx_http_upstream_finalize_request(r, u, NGX_HTTP_BAD_GATEWAY);
1683 1e0b028055ec allow to use IP addresses without defined resolver Igor Sysoev <igor@sysoev.ru> parents: 1658 diff changeset	669 return;
1e0b028055ec allow to use IP addresses without defined resolver Igor Sysoev <igor@sysoev.ru> parents: 1658 diff changeset	670 }
1e0b028055ec allow to use IP addresses without defined resolver Igor Sysoev <igor@sysoev.ru> parents: 1658 diff changeset	671
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	672 ctx->name = *host;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	673 ctx->handler = ngx_http_upstream_resolve_handler;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	674 ctx->data = r;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	675 ctx->timeout = clcf->resolver_timeout;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	676
1959 4f16186f5603 quick resolving handles u->resolved->ctx by itself Igor Sysoev <igor@sysoev.ru> parents: 1958 diff changeset	677 u->resolved->ctx = ctx;
4f16186f5603 quick resolving handles u->resolved->ctx by itself Igor Sysoev <igor@sysoev.ru> parents: 1958 diff changeset	678
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	679 if (ngx_resolve_name(ctx) != NGX_OK) {
1959 4f16186f5603 quick resolving handles u->resolved->ctx by itself Igor Sysoev <igor@sysoev.ru> parents: 1958 diff changeset	680 u->resolved->ctx = NULL;
3169 b1013d768911 fix request counter in resolver handling, the bug was introduced in r3050 Igor Sysoev <igor@sysoev.ru> parents: 3161 diff changeset	681 ngx_http_upstream_finalize_request(r, u,
b1013d768911 fix request counter in resolver handling, the bug was introduced in r3050 Igor Sysoev <igor@sysoev.ru> parents: 3161 diff changeset	682 NGX_HTTP_INTERNAL_SERVER_ERROR);
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	683 return;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	684 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	685
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	686 return;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	687 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	688
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	689 found:
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	690
4964 2464ccebdb52 Upstream: fixed SIGSEGV with the "if" directive. Maxim Dounin <mdounin@mdounin.ru> parents: 4916 diff changeset	691 if (uscf == NULL) {
2464ccebdb52 Upstream: fixed SIGSEGV with the "if" directive. Maxim Dounin <mdounin@mdounin.ru> parents: 4916 diff changeset	692 ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
2464ccebdb52 Upstream: fixed SIGSEGV with the "if" directive. Maxim Dounin <mdounin@mdounin.ru> parents: 4916 diff changeset	693 "no upstream configuration");
2464ccebdb52 Upstream: fixed SIGSEGV with the "if" directive. Maxim Dounin <mdounin@mdounin.ru> parents: 4916 diff changeset	694 ngx_http_upstream_finalize_request(r, u,
2464ccebdb52 Upstream: fixed SIGSEGV with the "if" directive. Maxim Dounin <mdounin@mdounin.ru> parents: 4916 diff changeset	695 NGX_HTTP_INTERNAL_SERVER_ERROR);
2464ccebdb52 Upstream: fixed SIGSEGV with the "if" directive. Maxim Dounin <mdounin@mdounin.ru> parents: 4916 diff changeset	696 return;
2464ccebdb52 Upstream: fixed SIGSEGV with the "if" directive. Maxim Dounin <mdounin@mdounin.ru> parents: 4916 diff changeset	697 }
2464ccebdb52 Upstream: fixed SIGSEGV with the "if" directive. Maxim Dounin <mdounin@mdounin.ru> parents: 4916 diff changeset	698
5682 110b50657d77 Upstream: restored workaround for "if". Maxim Dounin <mdounin@mdounin.ru> parents: 5677 diff changeset	699 #if (NGX_HTTP_SSL)
110b50657d77 Upstream: restored workaround for "if". Maxim Dounin <mdounin@mdounin.ru> parents: 5677 diff changeset	700 u->ssl_name = uscf->host;
110b50657d77 Upstream: restored workaround for "if". Maxim Dounin <mdounin@mdounin.ru> parents: 5677 diff changeset	701 #endif
110b50657d77 Upstream: restored workaround for "if". Maxim Dounin <mdounin@mdounin.ru> parents: 5677 diff changeset	702
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	703 if (uscf->peer.init(r, uscf) != NGX_OK) {
3169 b1013d768911 fix request counter in resolver handling, the bug was introduced in r3050 Igor Sysoev <igor@sysoev.ru> parents: 3161 diff changeset	704 ngx_http_upstream_finalize_request(r, u,
b1013d768911 fix request counter in resolver handling, the bug was introduced in r3050 Igor Sysoev <igor@sysoev.ru> parents: 3161 diff changeset	705 NGX_HTTP_INTERNAL_SERVER_ERROR);
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	706 return;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	707 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	708
5832 d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5827 diff changeset	709 u->peer.start_time = ngx_current_msec;
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5827 diff changeset	710
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5827 diff changeset	711 if (u->conf->next_upstream_tries
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5827 diff changeset	712 && u->peer.tries > u->conf->next_upstream_tries)
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5827 diff changeset	713 {
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5827 diff changeset	714 u->peer.tries = u->conf->next_upstream_tries;
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5827 diff changeset	715 }
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5827 diff changeset	716
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	717 ngx_http_upstream_connect(r, u);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	718 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	719
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	720
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	721 #if (NGX_HTTP_CACHE)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	722
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	723 static ngx_int_t
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	724 ngx_http_upstream_cache(ngx_http_request_t r, ngx_http_upstream_t u)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	725 {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	726 ngx_int_t rc;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	727 ngx_http_cache_t *c;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	728
3056 d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	729 c = r->cache;
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	730
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	731 if (c == NULL) {
3056 d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	732
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	733 if (!(r->method & u->conf->cache_methods)) {
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	734 return NGX_DECLINED;
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	735 }
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	736
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	737 if (r->method & NGX_HTTP_HEAD) {
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	738 u->method = ngx_http_core_get_method;
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	739 }
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	740
3698 d11227f0107f rename ngx_http_file_cache_create() to ngx_http_file_cache_new() Igor Sysoev <igor@sysoev.ru> parents: 3697 diff changeset	741 if (ngx_http_file_cache_new(r) != NGX_OK) {
3056 d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	742 return NGX_ERROR;
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	743 }
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	744
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	745 if (u->create_key(r) != NGX_OK) {
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	746 return NGX_ERROR;
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	747 }
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	748
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	749 /* TODO: add keys */
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	750
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	751 ngx_http_file_cache_create_key(r);
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	752
3976 215fe9223419 update r3945 with more descriptive error message Igor Sysoev <igor@sysoev.ru> parents: 3963 diff changeset	753 if (r->cache->header_start + 256 >= u->conf->buffer_size) {
3944 f1f194ceab16 fix segfault if cache key is larger than upstream buffer size Igor Sysoev <igor@sysoev.ru> parents: 3940 diff changeset	754 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
3976 215fe9223419 update r3945 with more descriptive error message Igor Sysoev <igor@sysoev.ru> parents: 3963 diff changeset	755 "%V_buffer_size %uz is not enough for cache key, "
5581 4dee5ad51e9e Upstream: fixed error message wording. Konstantin Pavlov <thresh@nginx.com> parents: 5579 diff changeset	756 "it should be increased to at least %uz",
3976 215fe9223419 update r3945 with more descriptive error message Igor Sysoev <igor@sysoev.ru> parents: 3963 diff changeset	757 &u->conf->module, u->conf->buffer_size,
215fe9223419 update r3945 with more descriptive error message Igor Sysoev <igor@sysoev.ru> parents: 3963 diff changeset	758 ngx_align(r->cache->header_start + 256, 1024));
3944 f1f194ceab16 fix segfault if cache key is larger than upstream buffer size Igor Sysoev <igor@sysoev.ru> parents: 3940 diff changeset	759
f1f194ceab16 fix segfault if cache key is larger than upstream buffer size Igor Sysoev <igor@sysoev.ru> parents: 3940 diff changeset	760 r->cache = NULL;
f1f194ceab16 fix segfault if cache key is larger than upstream buffer size Igor Sysoev <igor@sysoev.ru> parents: 3940 diff changeset	761 return NGX_DECLINED;
f1f194ceab16 fix segfault if cache key is larger than upstream buffer size Igor Sysoev <igor@sysoev.ru> parents: 3940 diff changeset	762 }
f1f194ceab16 fix segfault if cache key is larger than upstream buffer size Igor Sysoev <igor@sysoev.ru> parents: 3940 diff changeset	763
4176 2b5151a2300b Fixed cache bypass caching of non-cacheable replies (ticket #21). Maxim Dounin <mdounin@mdounin.ru> parents: 4152 diff changeset	764 u->cacheable = 1;
2b5151a2300b Fixed cache bypass caching of non-cacheable replies (ticket #21). Maxim Dounin <mdounin@mdounin.ru> parents: 4152 diff changeset	765
3917 2a70484a6580 fix a broken cached response if bypass/no_cache directive values are different, Igor Sysoev <igor@sysoev.ru> parents: 3898 diff changeset	766 switch (ngx_http_test_predicates(r, u->conf->cache_bypass)) {
2a70484a6580 fix a broken cached response if bypass/no_cache directive values are different, Igor Sysoev <igor@sysoev.ru> parents: 3898 diff changeset	767
2a70484a6580 fix a broken cached response if bypass/no_cache directive values are different, Igor Sysoev <igor@sysoev.ru> parents: 3898 diff changeset	768 case NGX_ERROR:
2a70484a6580 fix a broken cached response if bypass/no_cache directive values are different, Igor Sysoev <igor@sysoev.ru> parents: 3898 diff changeset	769 return NGX_ERROR;
2a70484a6580 fix a broken cached response if bypass/no_cache directive values are different, Igor Sysoev <igor@sysoev.ru> parents: 3898 diff changeset	770
2a70484a6580 fix a broken cached response if bypass/no_cache directive values are different, Igor Sysoev <igor@sysoev.ru> parents: 3898 diff changeset	771 case NGX_DECLINED:
2a70484a6580 fix a broken cached response if bypass/no_cache directive values are different, Igor Sysoev <igor@sysoev.ru> parents: 3898 diff changeset	772 u->cache_status = NGX_HTTP_CACHE_BYPASS;
2a70484a6580 fix a broken cached response if bypass/no_cache directive values are different, Igor Sysoev <igor@sysoev.ru> parents: 3898 diff changeset	773 return NGX_DECLINED;
2a70484a6580 fix a broken cached response if bypass/no_cache directive values are different, Igor Sysoev <igor@sysoev.ru> parents: 3898 diff changeset	774
2a70484a6580 fix a broken cached response if bypass/no_cache directive values are different, Igor Sysoev <igor@sysoev.ru> parents: 3898 diff changeset	775 default: /* NGX_OK */
2a70484a6580 fix a broken cached response if bypass/no_cache directive values are different, Igor Sysoev <igor@sysoev.ru> parents: 3898 diff changeset	776 break;
2a70484a6580 fix a broken cached response if bypass/no_cache directive values are different, Igor Sysoev <igor@sysoev.ru> parents: 3898 diff changeset	777 }
2a70484a6580 fix a broken cached response if bypass/no_cache directive values are different, Igor Sysoev <igor@sysoev.ru> parents: 3898 diff changeset	778
3697 3c442bd5597b ngx_http_file_cache_create() Igor Sysoev <igor@sysoev.ru> parents: 3692 diff changeset	779 c = r->cache;
3c442bd5597b ngx_http_file_cache_create() Igor Sysoev <igor@sysoev.ru> parents: 3692 diff changeset	780
3056 d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	781 c->min_uses = u->conf->cache_min_uses;
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	782 c->body_start = u->conf->buffer_size;
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	783 c->file_cache = u->conf->cache->data;
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	784
4385 70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4375 diff changeset	785 c->lock = u->conf->cache_lock;
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4375 diff changeset	786 c->lock_timeout = u->conf->cache_lock_timeout;
5905 2f7e557eab5b Cache: proxy_cache_lock_age and friends. Roman Arutyunyan <arut@nginx.com> parents: 5901 diff changeset	787 c->lock_age = u->conf->cache_lock_age;
4385 70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4375 diff changeset	788
3056 d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	789 u->cache_status = NGX_HTTP_CACHE_MISS;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	790 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	791
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	792 rc = ngx_http_file_cache_open(r);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	793
2926 80a314b63c56 delete useless r->cache->uses Igor Sysoev <igor@sysoev.ru> parents: 2912 diff changeset	794 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
80a314b63c56 delete useless r->cache->uses Igor Sysoev <igor@sysoev.ru> parents: 2912 diff changeset	795 "http upstream cache: %i", rc);
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	796
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	797 switch (rc) {
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	798
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	799 case NGX_HTTP_CACHE_UPDATING:
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	800
2927 55ceaef03d34 proxy_cache_use_stale/fastcgi_cache_use_stale updating Igor Sysoev <igor@sysoev.ru> parents: 2926 diff changeset	801 if (u->conf->cache_use_stale & NGX_HTTP_UPSTREAM_FT_UPDATING) {
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	802 u->cache_status = rc;
2927 55ceaef03d34 proxy_cache_use_stale/fastcgi_cache_use_stale updating Igor Sysoev <igor@sysoev.ru> parents: 2926 diff changeset	803 rc = NGX_OK;
55ceaef03d34 proxy_cache_use_stale/fastcgi_cache_use_stale updating Igor Sysoev <igor@sysoev.ru> parents: 2926 diff changeset	804
55ceaef03d34 proxy_cache_use_stale/fastcgi_cache_use_stale updating Igor Sysoev <igor@sysoev.ru> parents: 2926 diff changeset	805 } else {
55ceaef03d34 proxy_cache_use_stale/fastcgi_cache_use_stale updating Igor Sysoev <igor@sysoev.ru> parents: 2926 diff changeset	806 rc = NGX_HTTP_CACHE_STALE;
55ceaef03d34 proxy_cache_use_stale/fastcgi_cache_use_stale updating Igor Sysoev <igor@sysoev.ru> parents: 2926 diff changeset	807 }
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	808
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	809 break;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	810
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	811 case NGX_OK:
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	812 u->cache_status = NGX_HTTP_CACHE_HIT;
2927 55ceaef03d34 proxy_cache_use_stale/fastcgi_cache_use_stale updating Igor Sysoev <igor@sysoev.ru> parents: 2926 diff changeset	813 }
55ceaef03d34 proxy_cache_use_stale/fastcgi_cache_use_stale updating Igor Sysoev <igor@sysoev.ru> parents: 2926 diff changeset	814
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	815 switch (rc) {
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	816
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	817 case NGX_OK:
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	818
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	819 rc = ngx_http_upstream_cache_send(r, u);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	820
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	821 if (rc != NGX_HTTP_UPSTREAM_INVALID_HEADER) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	822 return rc;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	823 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	824
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	825 break;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	826
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	827 case NGX_HTTP_CACHE_STALE:
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	828
2665 4d627567c324 fix r2664: ..._cache_valid did not work for stale responses Igor Sysoev <igor@sysoev.ru> parents: 2664 diff changeset	829 c->valid_sec = 0;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	830 u->buffer.start = NULL;
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	831 u->cache_status = NGX_HTTP_CACHE_EXPIRED;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	832
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	833 break;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	834
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	835 case NGX_DECLINED:
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	836
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	837 if ((size_t) (u->buffer.end - u->buffer.start) < u->conf->buffer_size) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	838 u->buffer.start = NULL;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	839
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	840 } else {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	841 u->buffer.pos = u->buffer.start + c->header_start;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	842 u->buffer.last = u->buffer.pos;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	843 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	844
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	845 break;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	846
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	847 case NGX_HTTP_CACHE_SCARCE:
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	848
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	849 u->cacheable = 0;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	850
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	851 break;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	852
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	853 case NGX_AGAIN:
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	854
3055 92b6cfaa3c27 fix sending a cached file using AIO Igor Sysoev <igor@sysoev.ru> parents: 3053 diff changeset	855 return NGX_BUSY;
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	856
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	857 case NGX_ERROR:
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	858
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	859 return NGX_ERROR;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	860
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	861 default:
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	862
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	863 /* cached NGX_HTTP_BAD_GATEWAY, NGX_HTTP_GATEWAY_TIME_OUT, etc. */
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	864
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	865 u->cache_status = NGX_HTTP_CACHE_HIT;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	866
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	867 return rc;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	868 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	869
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	870 r->cached = 0;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	871
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	872 return NGX_DECLINED;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	873 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	874
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	875
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	876 static ngx_int_t
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	877 ngx_http_upstream_cache_send(ngx_http_request_t r, ngx_http_upstream_t u)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	878 {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	879 ngx_int_t rc;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	880 ngx_http_cache_t *c;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	881
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	882 r->cached = 1;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	883 c = r->cache;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	884
3369 479468a7d982 fix handling cached HTTP/0.9 response Igor Sysoev <igor@sysoev.ru> parents: 3272 diff changeset	885 if (c->header_start == c->body_start) {
479468a7d982 fix handling cached HTTP/0.9 response Igor Sysoev <igor@sysoev.ru> parents: 3272 diff changeset	886 r->http_version = NGX_HTTP_VERSION_9;
479468a7d982 fix handling cached HTTP/0.9 response Igor Sysoev <igor@sysoev.ru> parents: 3272 diff changeset	887 return ngx_http_cache_send(r);
479468a7d982 fix handling cached HTTP/0.9 response Igor Sysoev <igor@sysoev.ru> parents: 3272 diff changeset	888 }
479468a7d982 fix handling cached HTTP/0.9 response Igor Sysoev <igor@sysoev.ru> parents: 3272 diff changeset	889
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	890 /* TODO: cache stack */
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	891
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	892 u->buffer = *c->buf;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	893 u->buffer.pos += c->header_start;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	894
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	895 ngx_memzero(&u->headers_in, sizeof(ngx_http_upstream_headers_in_t));
4117 103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	896 u->headers_in.content_length_n = -1;
5869 fd283aa92e04 Upstream: fix $upstream_cache_last_modified variable. Piotr Sikora <piotr@cloudflare.com> parents: 5848 diff changeset	897 u->headers_in.last_modified_time = -1;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	898
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	899 if (ngx_list_init(&u->headers_in.headers, r->pool, 8,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	900 sizeof(ngx_table_elt_t))
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	901 != NGX_OK)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	902 {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	903 return NGX_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	904 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	905
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	906 rc = u->process_header(r);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	907
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	908 if (rc == NGX_OK) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	909
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	910 if (ngx_http_upstream_process_headers(r, u) != NGX_OK) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	911 return NGX_DONE;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	912 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	913
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	914 return ngx_http_cache_send(r);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	915 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	916
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	917 if (rc == NGX_ERROR) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	918 return NGX_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	919 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	920
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	921 /* rc == NGX_HTTP_UPSTREAM_INVALID_HEADER */
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	922
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	923 /* TODO: delete file */
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	924
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	925 return rc;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	926 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	927
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	928 #endif
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	929
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	930
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	931 static void
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	932 ngx_http_upstream_resolve_handler(ngx_resolver_ctx_t *ctx)
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	933 {
5113 08b36f2afc3f Upstream: fixed previous commit. Maxim Dounin <mdounin@mdounin.ru> parents: 5112 diff changeset	934 ngx_connection_t *c;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	935 ngx_http_request_t *r;
3169 b1013d768911 fix request counter in resolver handling, the bug was introduced in r3050 Igor Sysoev <igor@sysoev.ru> parents: 3161 diff changeset	936 ngx_http_upstream_t *u;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	937 ngx_http_upstream_resolved_t *ur;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	938
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	939 r = ctx->data;
5113 08b36f2afc3f Upstream: fixed previous commit. Maxim Dounin <mdounin@mdounin.ru> parents: 5112 diff changeset	940 c = r->connection;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	941
3169 b1013d768911 fix request counter in resolver handling, the bug was introduced in r3050 Igor Sysoev <igor@sysoev.ru> parents: 3161 diff changeset	942 u = r->upstream;
b1013d768911 fix request counter in resolver handling, the bug was introduced in r3050 Igor Sysoev <igor@sysoev.ru> parents: 3161 diff changeset	943 ur = u->resolved;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	944
5928 8dfee01ff0bd Upstream: improved subrequest logging. Maxim Dounin <mdounin@mdounin.ru> parents: 5911 diff changeset	945 ngx_http_set_log_request(c->log, r);
8dfee01ff0bd Upstream: improved subrequest logging. Maxim Dounin <mdounin@mdounin.ru> parents: 5911 diff changeset	946
8dfee01ff0bd Upstream: improved subrequest logging. Maxim Dounin <mdounin@mdounin.ru> parents: 5911 diff changeset	947 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
8dfee01ff0bd Upstream: improved subrequest logging. Maxim Dounin <mdounin@mdounin.ru> parents: 5911 diff changeset	948 "http upstream resolve: \"%V?%V\"", &r->uri, &r->args);
8dfee01ff0bd Upstream: improved subrequest logging. Maxim Dounin <mdounin@mdounin.ru> parents: 5911 diff changeset	949
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	950 if (ctx->state) {
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	951 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	952 "%V could not be resolved (%i: %s)",
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	953 &ctx->name, ctx->state,
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	954 ngx_resolver_strerror(ctx->state));
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	955
3169 b1013d768911 fix request counter in resolver handling, the bug was introduced in r3050 Igor Sysoev <igor@sysoev.ru> parents: 3161 diff changeset	956 ngx_http_upstream_finalize_request(r, u, NGX_HTTP_BAD_GATEWAY);
5112 d3c15c7831eb Upstream: call ngx_http_run_posted_requests() on resolve errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5104 diff changeset	957 goto failed;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	958 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	959
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	960 ur->naddrs = ctx->naddrs;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	961 ur->addrs = ctx->addrs;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	962
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	963 #if (NGX_DEBUG)
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	964 {
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5453 diff changeset	965 u_char text[NGX_SOCKADDR_STRLEN];
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5453 diff changeset	966 ngx_str_t addr;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	967 ngx_uint_t i;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	968
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5453 diff changeset	969 addr.data = text;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5453 diff changeset	970
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	971 for (i = 0; i < ctx->naddrs; i++) {
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5453 diff changeset	972 addr.len = ngx_sock_ntop(ur->addrs[i].sockaddr, ur->addrs[i].socklen,
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5453 diff changeset	973 text, NGX_SOCKADDR_STRLEN, 0);
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5453 diff changeset	974
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5453 diff changeset	975 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5453 diff changeset	976 "name was resolved to %V", &addr);
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	977 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	978 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	979 #endif
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	980
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	981 if (ngx_http_upstream_create_round_robin_peer(r, ur) != NGX_OK) {
3169 b1013d768911 fix request counter in resolver handling, the bug was introduced in r3050 Igor Sysoev <igor@sysoev.ru> parents: 3161 diff changeset	982 ngx_http_upstream_finalize_request(r, u,
b1013d768911 fix request counter in resolver handling, the bug was introduced in r3050 Igor Sysoev <igor@sysoev.ru> parents: 3161 diff changeset	983 NGX_HTTP_INTERNAL_SERVER_ERROR);
5112 d3c15c7831eb Upstream: call ngx_http_run_posted_requests() on resolve errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5104 diff changeset	984 goto failed;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	985 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	986
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	987 ngx_resolve_name_done(ctx);
3169 b1013d768911 fix request counter in resolver handling, the bug was introduced in r3050 Igor Sysoev <igor@sysoev.ru> parents: 3161 diff changeset	988 ur->ctx = NULL;
b1013d768911 fix request counter in resolver handling, the bug was introduced in r3050 Igor Sysoev <igor@sysoev.ru> parents: 3161 diff changeset	989
5885 5a042519bfe7 Upstream: limited next_upstream time and tries when resolving DNS. Gu Feng <flygoast@126.com> parents: 5883 diff changeset	990 u->peer.start_time = ngx_current_msec;
5a042519bfe7 Upstream: limited next_upstream time and tries when resolving DNS. Gu Feng <flygoast@126.com> parents: 5883 diff changeset	991
5a042519bfe7 Upstream: limited next_upstream time and tries when resolving DNS. Gu Feng <flygoast@126.com> parents: 5883 diff changeset	992 if (u->conf->next_upstream_tries
5a042519bfe7 Upstream: limited next_upstream time and tries when resolving DNS. Gu Feng <flygoast@126.com> parents: 5883 diff changeset	993 && u->peer.tries > u->conf->next_upstream_tries)
5a042519bfe7 Upstream: limited next_upstream time and tries when resolving DNS. Gu Feng <flygoast@126.com> parents: 5883 diff changeset	994 {
5a042519bfe7 Upstream: limited next_upstream time and tries when resolving DNS. Gu Feng <flygoast@126.com> parents: 5883 diff changeset	995 u->peer.tries = u->conf->next_upstream_tries;
5a042519bfe7 Upstream: limited next_upstream time and tries when resolving DNS. Gu Feng <flygoast@126.com> parents: 5883 diff changeset	996 }
5a042519bfe7 Upstream: limited next_upstream time and tries when resolving DNS. Gu Feng <flygoast@126.com> parents: 5883 diff changeset	997
3169 b1013d768911 fix request counter in resolver handling, the bug was introduced in r3050 Igor Sysoev <igor@sysoev.ru> parents: 3161 diff changeset	998 ngx_http_upstream_connect(r, u);
5112 d3c15c7831eb Upstream: call ngx_http_run_posted_requests() on resolve errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5104 diff changeset	999
d3c15c7831eb Upstream: call ngx_http_run_posted_requests() on resolve errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5104 diff changeset	1000 failed:
d3c15c7831eb Upstream: call ngx_http_run_posted_requests() on resolve errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5104 diff changeset	1001
5113 08b36f2afc3f Upstream: fixed previous commit. Maxim Dounin <mdounin@mdounin.ru> parents: 5112 diff changeset	1002 ngx_http_run_posted_requests(c);
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1003 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1004
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1005
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1006 static void
2377 87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1007 ngx_http_upstream_handler(ngx_event_t *ev)
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1008 {
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1009 ngx_connection_t *c;
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1010 ngx_http_request_t *r;
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1011 ngx_http_upstream_t *u;
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1012
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1013 c = ev->data;
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1014 r = c->data;
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1015
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1016 u = r->upstream;
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1017 c = r->connection;
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1018
5928 8dfee01ff0bd Upstream: improved subrequest logging. Maxim Dounin <mdounin@mdounin.ru> parents: 5911 diff changeset	1019 ngx_http_set_log_request(c->log, r);
2377 87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1020
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1021 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1022 "http upstream request: \"%V?%V\"", &r->uri, &r->args);
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1023
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1024 if (ev->write) {
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	1025 u->write_event_handler(r, u);
2377 87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1026
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1027 } else {
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	1028 u->read_event_handler(r, u);
2377 87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1029 }
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1030
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1031 ngx_http_run_posted_requests(c);
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1032 }
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1033
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1034
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1035 static void
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1036 ngx_http_upstream_rd_check_broken_connection(ngx_http_request_t *r)
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1037 {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1038 ngx_http_upstream_check_broken_connection(r, r->connection->read);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1039 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1040
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1041
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1042 static void
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1043 ngx_http_upstream_wr_check_broken_connection(ngx_http_request_t *r)
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1044 {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1045 ngx_http_upstream_check_broken_connection(r, r->connection->write);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1046 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1047
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1048
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1049 static void
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1050 ngx_http_upstream_check_broken_connection(ngx_http_request_t *r,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1051 ngx_event_t *ev)
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1052 {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1053 int n;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1054 char buf[1];
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1055 ngx_err_t err;
2807 6ad4bba6313e delete level event of appropriate type, this should fix select()'s EBADF, Igor Sysoev <igor@sysoev.ru> parents: 2805 diff changeset	1056 ngx_int_t event;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1057 ngx_connection_t *c;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1058 ngx_http_upstream_t *u;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1059
527 7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	1060 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ev->log, 0,
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	1061 "http upstream check client, write event:%d, \"%V\"",
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	1062 ev->write, &r->uri);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1063
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1064 c = r->connection;
483 621229427cba nginx-0.1.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	1065 u = r->upstream;
621229427cba nginx-0.1.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	1066
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	1067 if (c->error) {
2807 6ad4bba6313e delete level event of appropriate type, this should fix select()'s EBADF, Igor Sysoev <igor@sysoev.ru> parents: 2805 diff changeset	1068 if ((ngx_event_flags & NGX_USE_LEVEL_EVENT) && ev->active) {
6ad4bba6313e delete level event of appropriate type, this should fix select()'s EBADF, Igor Sysoev <igor@sysoev.ru> parents: 2805 diff changeset	1069
6ad4bba6313e delete level event of appropriate type, this should fix select()'s EBADF, Igor Sysoev <igor@sysoev.ru> parents: 2805 diff changeset	1070 event = ev->write ? NGX_WRITE_EVENT : NGX_READ_EVENT;
6ad4bba6313e delete level event of appropriate type, this should fix select()'s EBADF, Igor Sysoev <igor@sysoev.ru> parents: 2805 diff changeset	1071
6ad4bba6313e delete level event of appropriate type, this should fix select()'s EBADF, Igor Sysoev <igor@sysoev.ru> parents: 2805 diff changeset	1072 if (ngx_del_event(ev, event, 0) != NGX_OK) {
6ad4bba6313e delete level event of appropriate type, this should fix select()'s EBADF, Igor Sysoev <igor@sysoev.ru> parents: 2805 diff changeset	1073 ngx_http_upstream_finalize_request(r, u,
6ad4bba6313e delete level event of appropriate type, this should fix select()'s EBADF, Igor Sysoev <igor@sysoev.ru> parents: 2805 diff changeset	1074 NGX_HTTP_INTERNAL_SERVER_ERROR);
6ad4bba6313e delete level event of appropriate type, this should fix select()'s EBADF, Igor Sysoev <igor@sysoev.ru> parents: 2805 diff changeset	1075 return;
6ad4bba6313e delete level event of appropriate type, this should fix select()'s EBADF, Igor Sysoev <igor@sysoev.ru> parents: 2805 diff changeset	1076 }
6ad4bba6313e delete level event of appropriate type, this should fix select()'s EBADF, Igor Sysoev <igor@sysoev.ru> parents: 2805 diff changeset	1077 }
6ad4bba6313e delete level event of appropriate type, this should fix select()'s EBADF, Igor Sysoev <igor@sysoev.ru> parents: 2805 diff changeset	1078
2757 9cc973b46af1 get a full response if the response is cacheable or storable even Igor Sysoev <igor@sysoev.ru> parents: 2708 diff changeset	1079 if (!u->cacheable) {
9cc973b46af1 get a full response if the response is cacheable or storable even Igor Sysoev <igor@sysoev.ru> parents: 2708 diff changeset	1080 ngx_http_upstream_finalize_request(r, u,
9cc973b46af1 get a full response if the response is cacheable or storable even Igor Sysoev <igor@sysoev.ru> parents: 2708 diff changeset	1081 NGX_HTTP_CLIENT_CLOSED_REQUEST);
9cc973b46af1 get a full response if the response is cacheable or storable even Igor Sysoev <igor@sysoev.ru> parents: 2708 diff changeset	1082 }
2807 6ad4bba6313e delete level event of appropriate type, this should fix select()'s EBADF, Igor Sysoev <igor@sysoev.ru> parents: 2805 diff changeset	1083
527 7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	1084 return;
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	1085 }
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	1086
5121 c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: 5113 diff changeset	1087 #if (NGX_HTTP_SPDY)
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: 5113 diff changeset	1088 if (r->spdy_stream) {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: 5113 diff changeset	1089 return;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: 5113 diff changeset	1090 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: 5113 diff changeset	1091 #endif
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: 5113 diff changeset	1092
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1093 #if (NGX_HAVE_KQUEUE)
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1094
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1095 if (ngx_event_flags & NGX_USE_KQUEUE_EVENT) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1096
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1097 if (!ev->pending_eof) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1098 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1099 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1100
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1101 ev->eof = 1;
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	1102 c->error = 1;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1103
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1104 if (ev->kq_errno) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1105 ev->error = 1;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1106 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1107
2757 9cc973b46af1 get a full response if the response is cacheable or storable even Igor Sysoev <igor@sysoev.ru> parents: 2708 diff changeset	1108 if (!u->cacheable && u->peer.connection) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1109 ngx_log_error(NGX_LOG_INFO, ev->log, ev->kq_errno,
4182 75d2388bd6b9 Tweaked error messages. Ruslan Ermilov <ru@nginx.com> parents: 4176 diff changeset	1110 "kevent() reported that client prematurely closed "
527 7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	1111 "connection, so upstream connection is closed too");
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1112 ngx_http_upstream_finalize_request(r, u,
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1113 NGX_HTTP_CLIENT_CLOSED_REQUEST);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1114 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1115 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1116
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1117 ngx_log_error(NGX_LOG_INFO, ev->log, ev->kq_errno,
4182 75d2388bd6b9 Tweaked error messages. Ruslan Ermilov <ru@nginx.com> parents: 4176 diff changeset	1118 "kevent() reported that client prematurely closed "
75d2388bd6b9 Tweaked error messages. Ruslan Ermilov <ru@nginx.com> parents: 4176 diff changeset	1119 "connection");
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1120
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1121 if (u->peer.connection == NULL) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1122 ngx_http_upstream_finalize_request(r, u,
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1123 NGX_HTTP_CLIENT_CLOSED_REQUEST);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1124 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1125
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1126 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1127 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1128
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1129 #endif
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1130
5373 46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1131 #if (NGX_HAVE_EPOLLRDHUP)
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1132
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1133 if ((ngx_event_flags & NGX_USE_EPOLL_EVENT) && ev->pending_eof) {
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1134 socklen_t len;
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1135
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1136 ev->eof = 1;
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1137 c->error = 1;
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1138
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1139 err = 0;
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1140 len = sizeof(ngx_err_t);
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1141
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1142 /*
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1143 * BSDs and Linux return 0 and set a pending error in err
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1144 * Solaris returns -1 and sets errno
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1145 */
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1146
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1147 if (getsockopt(c->fd, SOL_SOCKET, SO_ERROR, (void *) &err, &len)
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1148 == -1)
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1149 {
5557 188481078faf Use ngx_socket_errno where appropriate. Piotr Sikora <piotr@cloudflare.com> parents: 5546 diff changeset	1150 err = ngx_socket_errno;
5373 46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1151 }
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1152
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1153 if (err) {
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1154 ev->error = 1;
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1155 }
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1156
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1157 if (!u->cacheable && u->peer.connection) {
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1158 ngx_log_error(NGX_LOG_INFO, ev->log, err,
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1159 "epoll_wait() reported that client prematurely closed "
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1160 "connection, so upstream connection is closed too");
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1161 ngx_http_upstream_finalize_request(r, u,
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1162 NGX_HTTP_CLIENT_CLOSED_REQUEST);
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1163 return;
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1164 }
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1165
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1166 ngx_log_error(NGX_LOG_INFO, ev->log, err,
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1167 "epoll_wait() reported that client prematurely closed "
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1168 "connection");
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1169
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1170 if (u->peer.connection == NULL) {
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1171 ngx_http_upstream_finalize_request(r, u,
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1172 NGX_HTTP_CLIENT_CLOSED_REQUEST);
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1173 }
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1174
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1175 return;
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1176 }
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1177
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1178 #endif
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1179
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1180 n = recv(c->fd, buf, 1, MSG_PEEK);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1181
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1182 err = ngx_socket_errno;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1183
1109 1402dbb554c4 add debug logging Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	1184 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ev->log, err,
1402dbb554c4 add debug logging Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	1185 "http upstream recv(): %d", n);
1402dbb554c4 add debug logging Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	1186
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1187 if (ev->write && (n >= 0 \|\| err == NGX_EAGAIN)) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1188 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1189 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1190
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1191 if ((ngx_event_flags & NGX_USE_LEVEL_EVENT) && ev->active) {
2807 6ad4bba6313e delete level event of appropriate type, this should fix select()'s EBADF, Igor Sysoev <igor@sysoev.ru> parents: 2805 diff changeset	1192
6ad4bba6313e delete level event of appropriate type, this should fix select()'s EBADF, Igor Sysoev <igor@sysoev.ru> parents: 2805 diff changeset	1193 event = ev->write ? NGX_WRITE_EVENT : NGX_READ_EVENT;
6ad4bba6313e delete level event of appropriate type, this should fix select()'s EBADF, Igor Sysoev <igor@sysoev.ru> parents: 2805 diff changeset	1194
6ad4bba6313e delete level event of appropriate type, this should fix select()'s EBADF, Igor Sysoev <igor@sysoev.ru> parents: 2805 diff changeset	1195 if (ngx_del_event(ev, event, 0) != NGX_OK) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1196 ngx_http_upstream_finalize_request(r, u,
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1197 NGX_HTTP_INTERNAL_SERVER_ERROR);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1198 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1199 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1200 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1201
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1202 if (n > 0) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1203 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1204 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1205
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1206 if (n == -1) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1207 if (err == NGX_EAGAIN) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1208 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1209 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1210
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1211 ev->error = 1;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1212
483 621229427cba nginx-0.1.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	1213 } else { /* n == 0 */
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1214 err = 0;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1215 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1216
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	1217 ev->eof = 1;
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	1218 c->error = 1;
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	1219
2757 9cc973b46af1 get a full response if the response is cacheable or storable even Igor Sysoev <igor@sysoev.ru> parents: 2708 diff changeset	1220 if (!u->cacheable && u->peer.connection) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1221 ngx_log_error(NGX_LOG_INFO, ev->log, err,
4182 75d2388bd6b9 Tweaked error messages. Ruslan Ermilov <ru@nginx.com> parents: 4176 diff changeset	1222 "client prematurely closed connection, "
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1223 "so upstream connection is closed too");
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1224 ngx_http_upstream_finalize_request(r, u,
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1225 NGX_HTTP_CLIENT_CLOSED_REQUEST);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1226 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1227 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1228
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1229 ngx_log_error(NGX_LOG_INFO, ev->log, err,
4182 75d2388bd6b9 Tweaked error messages. Ruslan Ermilov <ru@nginx.com> parents: 4176 diff changeset	1230 "client prematurely closed connection");
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1231
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1232 if (u->peer.connection == NULL) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1233 ngx_http_upstream_finalize_request(r, u,
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1234 NGX_HTTP_CLIENT_CLOSED_REQUEST);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1235 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1236 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1237
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1238
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	1239 static void
31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	1240 ngx_http_upstream_connect(ngx_http_request_t r, ngx_http_upstream_t u)
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1241 {
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1242 ngx_int_t rc;
665 5fd7a5e99047 nginx-0.3.54-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	1243 ngx_time_t *tp;
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1244 ngx_connection_t *c;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1245
483 621229427cba nginx-0.1.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	1246 r->connection->log->action = "connecting to upstream";
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1247
889 a9a7e4b1a72b the previous fix does not actually fix overflow Igor Sysoev <igor@sysoev.ru> parents: 888 diff changeset	1248 if (u->state && u->state->response_sec) {
665 5fd7a5e99047 nginx-0.3.54-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	1249 tp = ngx_timeofday();
889 a9a7e4b1a72b the previous fix does not actually fix overflow Igor Sysoev <igor@sysoev.ru> parents: 888 diff changeset	1250 u->state->response_sec = tp->sec - u->state->response_sec;
a9a7e4b1a72b the previous fix does not actually fix overflow Igor Sysoev <igor@sysoev.ru> parents: 888 diff changeset	1251 u->state->response_msec = tp->msec - u->state->response_msec;
665 5fd7a5e99047 nginx-0.3.54-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	1252 }
5fd7a5e99047 nginx-0.3.54-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	1253
1168 4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	1254 u->state = ngx_array_push(r->upstream_states);
665 5fd7a5e99047 nginx-0.3.54-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	1255 if (u->state == NULL) {
5fd7a5e99047 nginx-0.3.54-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	1256 ngx_http_upstream_finalize_request(r, u,
5fd7a5e99047 nginx-0.3.54-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	1257 NGX_HTTP_INTERNAL_SERVER_ERROR);
5fd7a5e99047 nginx-0.3.54-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	1258 return;
5fd7a5e99047 nginx-0.3.54-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	1259 }
5fd7a5e99047 nginx-0.3.54-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	1260
5fd7a5e99047 nginx-0.3.54-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	1261 ngx_memzero(u->state, sizeof(ngx_http_upstream_state_t));
5fd7a5e99047 nginx-0.3.54-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	1262
5fd7a5e99047 nginx-0.3.54-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	1263 tp = ngx_timeofday();
889 a9a7e4b1a72b the previous fix does not actually fix overflow Igor Sysoev <igor@sysoev.ru> parents: 888 diff changeset	1264 u->state->response_sec = tp->sec;
a9a7e4b1a72b the previous fix does not actually fix overflow Igor Sysoev <igor@sysoev.ru> parents: 888 diff changeset	1265 u->state->response_msec = tp->msec;
665 5fd7a5e99047 nginx-0.3.54-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	1266
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1267 rc = ngx_event_connect_peer(&u->peer);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1268
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1269 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1270 "http upstream connect: %i", rc);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1271
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1272 if (rc == NGX_ERROR) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1273 ngx_http_upstream_finalize_request(r, u,
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1274 NGX_HTTP_INTERNAL_SERVER_ERROR);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1275 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1276 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1277
1707 f3188f6eae1f $upstream_addr did not contain last address, the bug was introduced in r1659 Igor Sysoev <igor@sysoev.ru> parents: 1706 diff changeset	1278 u->state->peer = u->peer.name;
f3188f6eae1f $upstream_addr did not contain last address, the bug was introduced in r1659 Igor Sysoev <igor@sysoev.ru> parents: 1706 diff changeset	1279
543 511a89da35ad nginx-0.2.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 541 diff changeset	1280 if (rc == NGX_BUSY) {
511a89da35ad nginx-0.2.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 541 diff changeset	1281 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, "no live upstreams");
1378 0be898896d1a backup upstream servers Igor Sysoev <igor@sysoev.ru> parents: 1340 diff changeset	1282 ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_NOLIVE);
0be898896d1a backup upstream servers Igor Sysoev <igor@sysoev.ru> parents: 1340 diff changeset	1283 return;
543 511a89da35ad nginx-0.2.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 541 diff changeset	1284 }
511a89da35ad nginx-0.2.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 541 diff changeset	1285
1378 0be898896d1a backup upstream servers Igor Sysoev <igor@sysoev.ru> parents: 1340 diff changeset	1286 if (rc == NGX_DECLINED) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1287 ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_ERROR);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1288 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1289 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1290
5261 af60a210cb78 Upstream: updated list of ngx_event_connect_peer() return values. Ruslan Ermilov <ru@nginx.com> parents: 5231 diff changeset	1291 /* rc == NGX_OK \|\| rc == NGX_AGAIN \|\| rc == NGX_DONE */
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1292
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1293 c = u->peer.connection;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1294
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1295 c->data = r;
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1296
2377 87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1297 c->write->handler = ngx_http_upstream_handler;
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1298 c->read->handler = ngx_http_upstream_handler;
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1299
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1300 u->write_event_handler = ngx_http_upstream_send_request_handler;
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1301 u->read_event_handler = ngx_http_upstream_process_header;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1302
1397 6c25a49e548a upstream sendfile bit was overridden by r->connection->sendfile Igor Sysoev <igor@sysoev.ru> parents: 1378 diff changeset	1303 c->sendfile &= r->connection->sendfile;
1958 3e9e4581fbba fix peer sendfile capability Igor Sysoev <igor@sysoev.ru> parents: 1947 diff changeset	1304 u->output.sendfile = c->sendfile;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1305
4116 9baf12ea5ca1 Upstream: separate pool for peer connections. Maxim Dounin <mdounin@mdounin.ru> parents: 4115 diff changeset	1306 if (c->pool == NULL) {
9baf12ea5ca1 Upstream: separate pool for peer connections. Maxim Dounin <mdounin@mdounin.ru> parents: 4115 diff changeset	1307
9baf12ea5ca1 Upstream: separate pool for peer connections. Maxim Dounin <mdounin@mdounin.ru> parents: 4115 diff changeset	1308 /* we need separate pool here to be able to cache SSL connections */
9baf12ea5ca1 Upstream: separate pool for peer connections. Maxim Dounin <mdounin@mdounin.ru> parents: 4115 diff changeset	1309
9baf12ea5ca1 Upstream: separate pool for peer connections. Maxim Dounin <mdounin@mdounin.ru> parents: 4115 diff changeset	1310 c->pool = ngx_create_pool(128, r->connection->log);
9baf12ea5ca1 Upstream: separate pool for peer connections. Maxim Dounin <mdounin@mdounin.ru> parents: 4115 diff changeset	1311 if (c->pool == NULL) {
9baf12ea5ca1 Upstream: separate pool for peer connections. Maxim Dounin <mdounin@mdounin.ru> parents: 4115 diff changeset	1312 ngx_http_upstream_finalize_request(r, u,
9baf12ea5ca1 Upstream: separate pool for peer connections. Maxim Dounin <mdounin@mdounin.ru> parents: 4115 diff changeset	1313 NGX_HTTP_INTERNAL_SERVER_ERROR);
9baf12ea5ca1 Upstream: separate pool for peer connections. Maxim Dounin <mdounin@mdounin.ru> parents: 4115 diff changeset	1314 return;
9baf12ea5ca1 Upstream: separate pool for peer connections. Maxim Dounin <mdounin@mdounin.ru> parents: 4115 diff changeset	1315 }
9baf12ea5ca1 Upstream: separate pool for peer connections. Maxim Dounin <mdounin@mdounin.ru> parents: 4115 diff changeset	1316 }
9baf12ea5ca1 Upstream: separate pool for peer connections. Maxim Dounin <mdounin@mdounin.ru> parents: 4115 diff changeset	1317
2847 3e10674139e4 style fix Igor Sysoev <igor@sysoev.ru> parents: 2824 diff changeset	1318 c->log = r->connection->log;
4116 9baf12ea5ca1 Upstream: separate pool for peer connections. Maxim Dounin <mdounin@mdounin.ru> parents: 4115 diff changeset	1319 c->pool->log = c->log;
2847 3e10674139e4 style fix Igor Sysoev <igor@sysoev.ru> parents: 2824 diff changeset	1320 c->read->log = c->log;
3e10674139e4 style fix Igor Sysoev <igor@sysoev.ru> parents: 2824 diff changeset	1321 c->write->log = c->log;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1322
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1323 /* init or reinit the ngx_output_chain() and ngx_chain_writer() contexts */
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1324
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1325 u->writer.out = NULL;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1326 u->writer.last = &u->writer.out;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1327 u->writer.connection = c;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1328 u->writer.limit = 0;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1329
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1330 if (u->request_sent) {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1331 if (ngx_http_upstream_reinit(r, u) != NGX_OK) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1332 ngx_http_upstream_finalize_request(r, u,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1333 NGX_HTTP_INTERNAL_SERVER_ERROR);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1334 return;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1335 }
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1336 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1337
1064 7c84c877f2d7 fix segfault when client_body_in_file_only is on, the body is not passed Igor Sysoev <igor@sysoev.ru> parents: 1063 diff changeset	1338 if (r->request_body
7c84c877f2d7 fix segfault when client_body_in_file_only is on, the body is not passed Igor Sysoev <igor@sysoev.ru> parents: 1063 diff changeset	1339 && r->request_body->buf
7c84c877f2d7 fix segfault when client_body_in_file_only is on, the body is not passed Igor Sysoev <igor@sysoev.ru> parents: 1063 diff changeset	1340 && r->request_body->temp_file
7c84c877f2d7 fix segfault when client_body_in_file_only is on, the body is not passed Igor Sysoev <igor@sysoev.ru> parents: 1063 diff changeset	1341 && r == r->main)
7c84c877f2d7 fix segfault when client_body_in_file_only is on, the body is not passed Igor Sysoev <igor@sysoev.ru> parents: 1063 diff changeset	1342 {
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1343 /*
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1344 * the r->request_body->buf can be reused for one request only,
4572 67653855682e Fixed spelling in multiline C comments. Ruslan Ermilov <ru@nginx.com> parents: 4546 diff changeset	1345 * the subrequests should allocate their own temporary bufs
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1346 */
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1347
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1348 u->output.free = ngx_alloc_chain_link(r->pool);
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1349 if (u->output.free == NULL) {
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1350 ngx_http_upstream_finalize_request(r, u,
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1351 NGX_HTTP_INTERNAL_SERVER_ERROR);
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1352 return;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1353 }
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1354
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1355 u->output.free->buf = r->request_body->buf;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1356 u->output.free->next = NULL;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1357 u->output.allocated = 1;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1358
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1359 r->request_body->buf->pos = r->request_body->buf->start;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1360 r->request_body->buf->last = r->request_body->buf->start;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1361 r->request_body->buf->tag = u->output.tag;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1362 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1363
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1364 u->request_sent = 0;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1365
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1366 if (rc == NGX_AGAIN) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1367 ngx_add_timer(c->write, u->conf->connect_timeout);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1368 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1369 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1370
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1371 #if (NGX_HTTP_SSL)
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1372
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1373 if (u->ssl && c->ssl == NULL) {
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1374 ngx_http_upstream_ssl_init_connection(r, u, c);
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1375 return;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1376 }
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1377
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1378 #endif
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1379
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1380 ngx_http_upstream_send_request(r, u);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1381 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1382
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1383
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1384 #if (NGX_HTTP_SSL)
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1385
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1386 static void
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1387 ngx_http_upstream_ssl_init_connection(ngx_http_request_t *r,
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1388 ngx_http_upstream_t u, ngx_connection_t c)
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1389 {
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	1390 ngx_int_t rc;
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1391
5305 12b750d35162 Upstream: reliably detect connection failures with SSL peers. Ruslan Ermilov <ru@nginx.com> parents: 5304 diff changeset	1392 if (ngx_http_upstream_test_connect(c) != NGX_OK) {
12b750d35162 Upstream: reliably detect connection failures with SSL peers. Ruslan Ermilov <ru@nginx.com> parents: 5304 diff changeset	1393 ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_ERROR);
12b750d35162 Upstream: reliably detect connection failures with SSL peers. Ruslan Ermilov <ru@nginx.com> parents: 5304 diff changeset	1394 return;
12b750d35162 Upstream: reliably detect connection failures with SSL peers. Ruslan Ermilov <ru@nginx.com> parents: 5304 diff changeset	1395 }
12b750d35162 Upstream: reliably detect connection failures with SSL peers. Ruslan Ermilov <ru@nginx.com> parents: 5304 diff changeset	1396
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1397 if (ngx_ssl_create_connection(u->conf->ssl, c,
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1398 NGX_SSL_BUFFER\|NGX_SSL_CLIENT)
2536 a6d6d762c554 small optimization: " == NGX_ERROR" > " != NGX_OK" Igor Sysoev <igor@sysoev.ru> parents: 2463 diff changeset	1399 != NGX_OK)
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1400 {
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1401 ngx_http_upstream_finalize_request(r, u,
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1402 NGX_HTTP_INTERNAL_SERVER_ERROR);
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1403 return;
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1404 }
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1405
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1406 c->sendfile = 0;
619 7a16e281c01f nginx-0.3.31-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 615 diff changeset	1407 u->output.sendfile = 0;
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1408
5661 060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1409 if (u->conf->ssl_server_name \|\| u->conf->ssl_verify) {
5660 7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1410 if (ngx_http_upstream_ssl_name(r, u, c) != NGX_OK) {
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1411 ngx_http_upstream_finalize_request(r, u,
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1412 NGX_HTTP_INTERNAL_SERVER_ERROR);
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1413 return;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1414 }
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1415 }
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1416
2184 274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2183 diff changeset	1417 if (u->conf->ssl_session_reuse) {
274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2183 diff changeset	1418 if (u->peer.set_session(&u->peer, u->peer.data) != NGX_OK) {
274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2183 diff changeset	1419 ngx_http_upstream_finalize_request(r, u,
274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2183 diff changeset	1420 NGX_HTTP_INTERNAL_SERVER_ERROR);
274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2183 diff changeset	1421 return;
274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2183 diff changeset	1422 }
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1423 }
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1424
641 5e8fb59c18c1 nginx-0.3.42-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1425 r->connection->log->action = "SSL handshaking to upstream";
5e8fb59c18c1 nginx-0.3.42-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1426
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1427 rc = ngx_ssl_handshake(c);
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1428
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1429 if (rc == NGX_AGAIN) {
5774 9bf58a3da25b Upstream: SSL handshake timeouts. Maxim Dounin <mdounin@mdounin.ru> parents: 5770 diff changeset	1430
9bf58a3da25b Upstream: SSL handshake timeouts. Maxim Dounin <mdounin@mdounin.ru> parents: 5770 diff changeset	1431 if (!c->write->timer_set) {
9bf58a3da25b Upstream: SSL handshake timeouts. Maxim Dounin <mdounin@mdounin.ru> parents: 5770 diff changeset	1432 ngx_add_timer(c->write, u->conf->connect_timeout);
9bf58a3da25b Upstream: SSL handshake timeouts. Maxim Dounin <mdounin@mdounin.ru> parents: 5770 diff changeset	1433 }
9bf58a3da25b Upstream: SSL handshake timeouts. Maxim Dounin <mdounin@mdounin.ru> parents: 5770 diff changeset	1434
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1435 c->ssl->handler = ngx_http_upstream_ssl_handshake;
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1436 return;
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1437 }
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1438
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1439 ngx_http_upstream_ssl_handshake(c);
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1440 }
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1441
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1442
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1443 static void
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1444 ngx_http_upstream_ssl_handshake(ngx_connection_t *c)
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1445 {
5661 060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1446 long rc;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1447 ngx_http_request_t *r;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1448 ngx_http_upstream_t *u;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1449
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1450 r = c->data;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1451 u = r->upstream;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1452
5928 8dfee01ff0bd Upstream: improved subrequest logging. Maxim Dounin <mdounin@mdounin.ru> parents: 5911 diff changeset	1453 ngx_http_set_log_request(c->log, r);
8dfee01ff0bd Upstream: improved subrequest logging. Maxim Dounin <mdounin@mdounin.ru> parents: 5911 diff changeset	1454
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1455 if (c->ssl->handshaked) {
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1456
5661 060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1457 if (u->conf->ssl_verify) {
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1458 rc = SSL_get_verify_result(c->ssl->connection);
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1459
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1460 if (rc != X509_V_OK) {
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1461 ngx_log_error(NGX_LOG_ERR, c->log, 0,
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1462 "upstream SSL certificate verify error: (%l:%s)",
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1463 rc, X509_verify_cert_error_string(rc));
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1464 goto failed;
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1465 }
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1466
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1467 if (ngx_ssl_check_host(c, &u->ssl_name) != NGX_OK) {
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1468 ngx_log_error(NGX_LOG_ERR, c->log, 0,
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1469 "upstream SSL certificate does not match \"%V\"",
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1470 &u->ssl_name);
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1471 goto failed;
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1472 }
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1473 }
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1474
2184 274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2183 diff changeset	1475 if (u->conf->ssl_session_reuse) {
274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2183 diff changeset	1476 u->peer.save_session(&u->peer, u->peer.data);
274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2183 diff changeset	1477 }
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	1478
2377 87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1479 c->write->handler = ngx_http_upstream_handler;
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1480 c->read->handler = ngx_http_upstream_handler;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1481
5340 13a5f4765887 Upstream: posted requests handling after ssl handshake errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5305 diff changeset	1482 c = r->connection;
13a5f4765887 Upstream: posted requests handling after ssl handshake errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5305 diff changeset	1483
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1484 ngx_http_upstream_send_request(r, u);
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1485
5340 13a5f4765887 Upstream: posted requests handling after ssl handshake errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5305 diff changeset	1486 ngx_http_run_posted_requests(c);
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1487 return;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1488 }
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1489
5661 060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1490 failed:
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1491
5340 13a5f4765887 Upstream: posted requests handling after ssl handshake errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5305 diff changeset	1492 c = r->connection;
13a5f4765887 Upstream: posted requests handling after ssl handshake errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5305 diff changeset	1493
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1494 ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_ERROR);
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1495
5340 13a5f4765887 Upstream: posted requests handling after ssl handshake errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5305 diff changeset	1496 ngx_http_run_posted_requests(c);
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1497 }
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1498
5660 7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1499
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1500 static ngx_int_t
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1501 ngx_http_upstream_ssl_name(ngx_http_request_t r, ngx_http_upstream_t u,
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1502 ngx_connection_t *c)
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1503 {
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1504 u_char p, last;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1505 ngx_str_t name;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1506
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1507 if (u->conf->ssl_name) {
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1508 if (ngx_http_complex_value(r, u->conf->ssl_name, &name) != NGX_OK) {
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1509 return NGX_ERROR;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1510 }
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1511
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1512 } else {
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1513 name = u->ssl_name;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1514 }
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1515
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1516 if (name.len == 0) {
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1517 goto done;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1518 }
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1519
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1520 /*
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1521 * ssl name here may contain port, notably if derived from $proxy_host
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1522 * or $http_host; we have to strip it
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1523 */
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1524
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1525 p = name.data;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1526 last = name.data + name.len;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1527
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1528 if (*p == '[') {
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1529 p = ngx_strlchr(p, last, ']');
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1530
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1531 if (p == NULL) {
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1532 p = name.data;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1533 }
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1534 }
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1535
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1536 p = ngx_strlchr(p, last, ':');
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1537
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1538 if (p != NULL) {
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1539 name.len = p - name.data;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1540 }
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1541
5661 060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1542 if (!u->conf->ssl_server_name) {
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1543 goto done;
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1544 }
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1545
5660 7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1546 #ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1547
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1548 /* as per RFC 6066, literal IPv4 and IPv6 addresses are not permitted */
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1549
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1550 if (name.len == 0 \|\| *name.data == '[') {
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1551 goto done;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1552 }
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1553
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1554 if (ngx_inet_addr(name.data, name.len) != INADDR_NONE) {
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1555 goto done;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1556 }
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1557
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1558 /*
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1559 * SSL_set_tlsext_host_name() needs a null-terminated string,
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1560 * hence we explicitly null-terminate name here
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1561 */
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1562
5667 16405e02e612 Upstream: for ssl name, non-aligned memory allocation is enough. Ruslan Ermilov <ru@nginx.com> parents: 5661 diff changeset	1563 p = ngx_pnalloc(r->pool, name.len + 1);
5660 7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1564 if (p == NULL) {
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1565 return NGX_ERROR;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1566 }
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1567
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1568 (void) ngx_cpystrn(p, name.data, name.len + 1);
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1569
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1570 name.data = p;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1571
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1572 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1573 "upstream SSL server name: \"%s\"", name.data);
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1574
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1575 if (SSL_set_tlsext_host_name(c->ssl->connection, name.data) == 0) {
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1576 ngx_ssl_error(NGX_LOG_ERR, r->connection->log, 0,
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1577 "SSL_set_tlsext_host_name(\"%s\") failed", name.data);
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1578 return NGX_ERROR;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1579 }
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1580
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1581 #endif
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1582
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1583 done:
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1584
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1585 u->ssl_name = name;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1586
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1587 return NGX_OK;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1588 }
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1589
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1590 #endif
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1591
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1592
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1593 static ngx_int_t
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	1594 ngx_http_upstream_reinit(ngx_http_request_t r, ngx_http_upstream_t u)
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1595 {
5848 106a8bfa4f42 Upstream: fixed file buffers reinit in ngx_http_upstream_reinit(). Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	1596 off_t file_pos;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1597 ngx_chain_t *cl;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1598
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1599 if (u->reinit_request(r) != NGX_OK) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1600 return NGX_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1601 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1602
4120 42135dd1f0ea Upstream: keepalive flag. Maxim Dounin <mdounin@mdounin.ru> parents: 4119 diff changeset	1603 u->keepalive = 0;
5072 7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	1604 u->upgrade = 0;
4120 42135dd1f0ea Upstream: keepalive flag. Maxim Dounin <mdounin@mdounin.ru> parents: 4119 diff changeset	1605
1705 d22095839d86 optimize r->upstream usage Igor Sysoev <igor@sysoev.ru> parents: 1701 diff changeset	1606 ngx_memzero(&u->headers_in, sizeof(ngx_http_upstream_headers_in_t));
4117 103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	1607 u->headers_in.content_length_n = -1;
5869 fd283aa92e04 Upstream: fix $upstream_cache_last_modified variable. Piotr Sikora <piotr@cloudflare.com> parents: 5848 diff changeset	1608 u->headers_in.last_modified_time = -1;
1705 d22095839d86 optimize r->upstream usage Igor Sysoev <igor@sysoev.ru> parents: 1701 diff changeset	1609
d22095839d86 optimize r->upstream usage Igor Sysoev <igor@sysoev.ru> parents: 1701 diff changeset	1610 if (ngx_list_init(&u->headers_in.headers, r->pool, 8,
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1611 sizeof(ngx_table_elt_t))
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1612 != NGX_OK)
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1613 {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1614 return NGX_ERROR;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1615 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1616
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1617 /* reinit the request chain */
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1618
5848 106a8bfa4f42 Upstream: fixed file buffers reinit in ngx_http_upstream_reinit(). Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	1619 file_pos = 0;
106a8bfa4f42 Upstream: fixed file buffers reinit in ngx_http_upstream_reinit(). Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	1620
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1621 for (cl = u->request_bufs; cl; cl = cl->next) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1622 cl->buf->pos = cl->buf->start;
5848 106a8bfa4f42 Upstream: fixed file buffers reinit in ngx_http_upstream_reinit(). Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	1623
106a8bfa4f42 Upstream: fixed file buffers reinit in ngx_http_upstream_reinit(). Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	1624 /* there is at most one file */
106a8bfa4f42 Upstream: fixed file buffers reinit in ngx_http_upstream_reinit(). Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	1625
106a8bfa4f42 Upstream: fixed file buffers reinit in ngx_http_upstream_reinit(). Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	1626 if (cl->buf->in_file) {
106a8bfa4f42 Upstream: fixed file buffers reinit in ngx_http_upstream_reinit(). Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	1627 cl->buf->file_pos = file_pos;
106a8bfa4f42 Upstream: fixed file buffers reinit in ngx_http_upstream_reinit(). Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	1628 file_pos = cl->buf->file_last;
106a8bfa4f42 Upstream: fixed file buffers reinit in ngx_http_upstream_reinit(). Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	1629 }
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1630 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1631
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1632 /* reinit the subrequest's ngx_output_chain() context */
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1633
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1634 if (r->request_body && r->request_body->temp_file
597 9262f520ce21 nginx-0.3.20-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 593 diff changeset	1635 && r != r->main && u->output.buf)
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1636 {
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1637 u->output.free = ngx_alloc_chain_link(r->pool);
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1638 if (u->output.free == NULL) {
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1639 return NGX_ERROR;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1640 }
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1641
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1642 u->output.free->buf = u->output.buf;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1643 u->output.free->next = NULL;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1644
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1645 u->output.buf->pos = u->output.buf->start;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1646 u->output.buf->last = u->output.buf->start;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1647 }
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1648
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1649 u->output.buf = NULL;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1650 u->output.in = NULL;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1651 u->output.busy = NULL;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1652
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	1653 /* reinit u->buffer */
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1654
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1655 u->buffer.pos = u->buffer.start;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1656
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1657 #if (NGX_HTTP_CACHE)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1658
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1659 if (r->cache) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1660 u->buffer.pos += r->cache->header_start;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1661 }
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1662
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1663 #endif
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1664
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1665 u->buffer.last = u->buffer.pos;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1666
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1667 return NGX_OK;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1668 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1669
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1670
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	1671 static void
31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	1672 ngx_http_upstream_send_request(ngx_http_request_t r, ngx_http_upstream_t u)
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1673 {
1153 c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	1674 ngx_int_t rc;
483 621229427cba nginx-0.1.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	1675 ngx_connection_t *c;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1676
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1677 c = u->peer.connection;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1678
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1679 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1680 "http upstream send request");
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1681
1153 c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	1682 if (!u->request_sent && ngx_http_upstream_test_connect(c) != NGX_OK) {
1166 bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	1683 ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_ERROR);
1153 c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	1684 return;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1685 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1686
483 621229427cba nginx-0.1.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	1687 c->log->action = "sending request to upstream";
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1688
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1689 rc = ngx_output_chain(&u->output, u->request_sent ? NULL : u->request_bufs);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1690
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1691 u->request_sent = 1;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1692
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1693 if (rc == NGX_ERROR) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1694 ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_ERROR);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1695 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1696 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1697
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1698 if (c->write->timer_set) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1699 ngx_del_timer(c->write);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1700 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1701
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1702 if (rc == NGX_AGAIN) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1703 ngx_add_timer(c->write, u->conf->send_timeout);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1704
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	1705 if (ngx_handle_write_event(c->write, u->conf->send_lowat) != NGX_OK) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1706 ngx_http_upstream_finalize_request(r, u,
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1707 NGX_HTTP_INTERNAL_SERVER_ERROR);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1708 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1709 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1710
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1711 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1712 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1713
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1714 /* rc == NGX_OK */
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1715
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1716 if (c->tcp_nopush == NGX_TCP_NOPUSH_SET) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1717 if (ngx_tcp_push(c->fd) == NGX_ERROR) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1718 ngx_log_error(NGX_LOG_CRIT, c->log, ngx_socket_errno,
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1719 ngx_tcp_push_n " failed");
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1720 ngx_http_upstream_finalize_request(r, u,
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1721 NGX_HTTP_INTERNAL_SERVER_ERROR);
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1722 return;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1723 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1724
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1725 c->tcp_nopush = NGX_TCP_NOPUSH_UNSET;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1726 }
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1727
2377 87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1728 u->write_event_handler = ngx_http_upstream_dummy_handler;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1729
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	1730 if (ngx_handle_write_event(c->write, 0) != NGX_OK) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1731 ngx_http_upstream_finalize_request(r, u,
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1732 NGX_HTTP_INTERNAL_SERVER_ERROR);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1733 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1734 }
5745 9d3a9c45fc43 Upstream: fixed handling of write event after sending request. Valentin Bartenev <vbart@nginx.com> parents: 5738 diff changeset	1735
9d3a9c45fc43 Upstream: fixed handling of write event after sending request. Valentin Bartenev <vbart@nginx.com> parents: 5738 diff changeset	1736 ngx_add_timer(c->read, u->conf->read_timeout);
9d3a9c45fc43 Upstream: fixed handling of write event after sending request. Valentin Bartenev <vbart@nginx.com> parents: 5738 diff changeset	1737
9d3a9c45fc43 Upstream: fixed handling of write event after sending request. Valentin Bartenev <vbart@nginx.com> parents: 5738 diff changeset	1738 if (c->read->ready) {
9d3a9c45fc43 Upstream: fixed handling of write event after sending request. Valentin Bartenev <vbart@nginx.com> parents: 5738 diff changeset	1739 ngx_http_upstream_process_header(r, u);
9d3a9c45fc43 Upstream: fixed handling of write event after sending request. Valentin Bartenev <vbart@nginx.com> parents: 5738 diff changeset	1740 return;
9d3a9c45fc43 Upstream: fixed handling of write event after sending request. Valentin Bartenev <vbart@nginx.com> parents: 5738 diff changeset	1741 }
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1742 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1743
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1744
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	1745 static void
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	1746 ngx_http_upstream_send_request_handler(ngx_http_request_t *r,
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	1747 ngx_http_upstream_t *u)
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1748 {
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	1749 ngx_connection_t *c;
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	1750
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	1751 c = u->peer.connection;
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	1752
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	1753 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1754 "http upstream send request handler");
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1755
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	1756 if (c->write->timedout) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1757 ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_TIMEOUT);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1758 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1759 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1760
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1761 #if (NGX_HTTP_SSL)
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1762
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1763 if (u->ssl && c->ssl == NULL) {
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1764 ngx_http_upstream_ssl_init_connection(r, u, c);
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1765 return;
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1766 }
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1767
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1768 #endif
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1769
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	1770 if (u->header_sent) {
2377 87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1771 u->write_event_handler = ngx_http_upstream_dummy_handler;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	1772
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	1773 (void) ngx_handle_write_event(c->write, 0);
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	1774
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	1775 return;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	1776 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	1777
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1778 ngx_http_upstream_send_request(r, u);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1779 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1780
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1781
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	1782 static void
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	1783 ngx_http_upstream_process_header(ngx_http_request_t r, ngx_http_upstream_t u)
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1784 {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1785 ssize_t n;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1786 ngx_int_t rc;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1787 ngx_connection_t *c;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1788
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	1789 c = u->peer.connection;
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	1790
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	1791 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
483 621229427cba nginx-0.1.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	1792 "http upstream process header");
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1793
483 621229427cba nginx-0.1.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	1794 c->log->action = "reading response header from upstream";
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1795
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	1796 if (c->read->timedout) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1797 ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_TIMEOUT);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1798 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1799 }
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1800
1153 c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	1801 if (!u->request_sent && ngx_http_upstream_test_connect(c) != NGX_OK) {
1166 bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	1802 ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_ERROR);
1153 c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	1803 return;
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	1804 }
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	1805
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	1806 if (u->buffer.start == NULL) {
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	1807 u->buffer.start = ngx_palloc(r->pool, u->conf->buffer_size);
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	1808 if (u->buffer.start == NULL) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1809 ngx_http_upstream_finalize_request(r, u,
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1810 NGX_HTTP_INTERNAL_SERVER_ERROR);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1811 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1812 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1813
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	1814 u->buffer.pos = u->buffer.start;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	1815 u->buffer.last = u->buffer.start;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	1816 u->buffer.end = u->buffer.start + u->conf->buffer_size;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	1817 u->buffer.temporary = 1;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	1818
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	1819 u->buffer.tag = u->output.tag;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1820
1705 d22095839d86 optimize r->upstream usage Igor Sysoev <igor@sysoev.ru> parents: 1701 diff changeset	1821 if (ngx_list_init(&u->headers_in.headers, r->pool, 8,
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	1822 sizeof(ngx_table_elt_t))
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	1823 != NGX_OK)
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1824 {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1825 ngx_http_upstream_finalize_request(r, u,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1826 NGX_HTTP_INTERNAL_SERVER_ERROR);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1827 return;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1828 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1829
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1830 #if (NGX_HTTP_CACHE)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1831
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1832 if (r->cache) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1833 u->buffer.pos += r->cache->header_start;
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	1834 u->buffer.last = u->buffer.pos;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1835 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1836 #endif
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1837 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1838
2360 64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1839 for ( ;; ) {
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1840
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1841 n = c->recv(c, u->buffer.last, u->buffer.end - u->buffer.last);
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1842
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1843 if (n == NGX_AGAIN) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1844 #if 0
2360 64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1845 ngx_add_timer(rev, u->read_timeout);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1846 #endif
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1847
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	1848 if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
2360 64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1849 ngx_http_upstream_finalize_request(r, u,
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1850 NGX_HTTP_INTERNAL_SERVER_ERROR);
2360 64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1851 return;
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1852 }
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1853
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1854 return;
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1855 }
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1856
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1857 if (n == 0) {
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	1858 ngx_log_error(NGX_LOG_ERR, c->log, 0,
2360 64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1859 "upstream prematurely closed connection");
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1860 }
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1861
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1862 if (n == NGX_ERROR \|\| n == 0) {
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1863 ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_ERROR);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1864 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1865 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1866
2360 64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1867 u->buffer.last += n;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1868
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1869 #if 0
2360 64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1870 u->valid_header_in = 0;
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1871
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1872 u->peer.cached = 0;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1873 #endif
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1874
2360 64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1875 rc = u->process_header(r);
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1876
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1877 if (rc == NGX_AGAIN) {
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1878
4460 6299d1c4dbb4 Upstream: fixed "too big header" check. Maxim Dounin <mdounin@mdounin.ru> parents: 4412 diff changeset	1879 if (u->buffer.last == u->buffer.end) {
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	1880 ngx_log_error(NGX_LOG_ERR, c->log, 0,
2360 64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1881 "upstream sent too big header");
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1882
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1883 ngx_http_upstream_next(r, u,
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1884 NGX_HTTP_UPSTREAM_FT_INVALID_HEADER);
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1885 return;
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1886 }
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1887
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1888 continue;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1889 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1890
2360 64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1891 break;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1892 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1893
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1894 if (rc == NGX_HTTP_UPSTREAM_INVALID_HEADER) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1895 ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_INVALID_HEADER);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1896 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1897 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1898
1699 976db8c6fb64 return NGX_ERROR instead of NGX_HTTP_INTERNAL_SERVER_ERROR in u->parse_header() Igor Sysoev <igor@sysoev.ru> parents: 1693 diff changeset	1899 if (rc == NGX_ERROR) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1900 ngx_http_upstream_finalize_request(r, u,
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1901 NGX_HTTP_INTERNAL_SERVER_ERROR);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1902 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1903 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1904
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1905 /* rc == NGX_OK */
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1906
5209 07e515e65984 Upstream: allow to intercept responses with status 300. Ruslan Ermilov <ru@nginx.com> parents: 5169 diff changeset	1907 if (u->headers_in.status_n >= NGX_HTTP_SPECIAL_RESPONSE) {
2268 33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	1908
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	1909 if (ngx_http_upstream_test_next(r, u) == NGX_OK) {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1910 return;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1911 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1912
2267 920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	1913 if (ngx_http_upstream_intercept_errors(r, u) == NGX_OK) {
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	1914 return;
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	1915 }
31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	1916 }
31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	1917
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1918 if (ngx_http_upstream_process_headers(r, u) != NGX_OK) {
515 417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	1919 return;
417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	1920 }
417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	1921
777 4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	1922 if (!r->subrequest_in_memory) {
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	1923 ngx_http_upstream_send_response(r, u);
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	1924 return;
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	1925 }
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	1926
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	1927 /* subrequest content in memory */
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	1928
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	1929 if (u->input_filter == NULL) {
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	1930 u->input_filter_init = ngx_http_upstream_non_buffered_filter_init;
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	1931 u->input_filter = ngx_http_upstream_non_buffered_filter;
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	1932 u->input_filter_ctx = r;
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	1933 }
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	1934
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	1935 if (u->input_filter_init(u->input_filter_ctx) == NGX_ERROR) {
5294 d44c3b36c53f Upstream: consistent error handling after u->input_filter_init(). Maxim Dounin <mdounin@mdounin.ru> parents: 5293 diff changeset	1936 ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
777 4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	1937 return;
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	1938 }
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	1939
2308 3f98400e31e9 memcached response was stored in variable with END Igor Sysoev <igor@sysoev.ru> parents: 2285 diff changeset	1940 n = u->buffer.last - u->buffer.pos;
3f98400e31e9 memcached response was stored in variable with END Igor Sysoev <igor@sysoev.ru> parents: 2285 diff changeset	1941
3f98400e31e9 memcached response was stored in variable with END Igor Sysoev <igor@sysoev.ru> parents: 2285 diff changeset	1942 if (n) {
5216 4a40163772a1 Upstream: made the assignment more obvious. Ruslan Ermilov <ru@nginx.com> parents: 5209 diff changeset	1943 u->buffer.last = u->buffer.pos;
2308 3f98400e31e9 memcached response was stored in variable with END Igor Sysoev <igor@sysoev.ru> parents: 2285 diff changeset	1944
2402 cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	1945 u->state->response_length += n;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	1946
2308 3f98400e31e9 memcached response was stored in variable with END Igor Sysoev <igor@sysoev.ru> parents: 2285 diff changeset	1947 if (u->input_filter(u->input_filter_ctx, n) == NGX_ERROR) {
777 4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	1948 ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	1949 return;
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	1950 }
5217 ddba4e308ecc Upstream: slightly optimized ngx_http_upstream_process_header(). Ruslan Ermilov <ru@nginx.com> parents: 5216 diff changeset	1951 }
ddba4e308ecc Upstream: slightly optimized ngx_http_upstream_process_header(). Ruslan Ermilov <ru@nginx.com> parents: 5216 diff changeset	1952
ddba4e308ecc Upstream: slightly optimized ngx_http_upstream_process_header(). Ruslan Ermilov <ru@nginx.com> parents: 5216 diff changeset	1953 if (u->length == 0) {
ddba4e308ecc Upstream: slightly optimized ngx_http_upstream_process_header(). Ruslan Ermilov <ru@nginx.com> parents: 5216 diff changeset	1954 ngx_http_upstream_finalize_request(r, u, 0);
ddba4e308ecc Upstream: slightly optimized ngx_http_upstream_process_header(). Ruslan Ermilov <ru@nginx.com> parents: 5216 diff changeset	1955 return;
777 4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	1956 }
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	1957
2377 87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1958 u->read_event_handler = ngx_http_upstream_process_body_in_memory;
777 4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	1959
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	1960 ngx_http_upstream_process_body_in_memory(r, u);
777 4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	1961 }
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	1962
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	1963
1153 c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	1964 static ngx_int_t
2268 33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	1965 ngx_http_upstream_test_next(ngx_http_request_t r, ngx_http_upstream_t u)
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	1966 {
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	1967 ngx_uint_t status;
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	1968 ngx_http_upstream_next_t *un;
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	1969
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	1970 status = u->headers_in.status_n;
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	1971
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	1972 for (un = ngx_http_upstream_next_errors; un->status; un++) {
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	1973
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	1974 if (status != un->status) {
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	1975 continue;
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	1976 }
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	1977
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	1978 if (u->peer.tries > 1 && (u->conf->next_upstream & un->mask)) {
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	1979 ngx_http_upstream_next(r, u, un->mask);
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	1980 return NGX_OK;
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	1981 }
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	1982
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	1983 #if (NGX_HTTP_CACHE)
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	1984
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	1985 if (u->cache_status == NGX_HTTP_CACHE_EXPIRED
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	1986 && (u->conf->cache_use_stale & un->mask))
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	1987 {
2824 d106509491b5 fix building --without-http-cache Igor Sysoev <igor@sysoev.ru> parents: 2807 diff changeset	1988 ngx_int_t rc;
2805 60551422e150 reinit proxy/fastcgi header parser before ngx_http_upstream_cache_send() Igor Sysoev <igor@sysoev.ru> parents: 2804 diff changeset	1989
60551422e150 reinit proxy/fastcgi header parser before ngx_http_upstream_cache_send() Igor Sysoev <igor@sysoev.ru> parents: 2804 diff changeset	1990 rc = u->reinit_request(r);
60551422e150 reinit proxy/fastcgi header parser before ngx_http_upstream_cache_send() Igor Sysoev <igor@sysoev.ru> parents: 2804 diff changeset	1991
60551422e150 reinit proxy/fastcgi header parser before ngx_http_upstream_cache_send() Igor Sysoev <igor@sysoev.ru> parents: 2804 diff changeset	1992 if (rc == NGX_OK) {
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	1993 u->cache_status = NGX_HTTP_CACHE_STALE;
2805 60551422e150 reinit proxy/fastcgi header parser before ngx_http_upstream_cache_send() Igor Sysoev <igor@sysoev.ru> parents: 2804 diff changeset	1994 rc = ngx_http_upstream_cache_send(r, u);
60551422e150 reinit proxy/fastcgi header parser before ngx_http_upstream_cache_send() Igor Sysoev <igor@sysoev.ru> parents: 2804 diff changeset	1995 }
60551422e150 reinit proxy/fastcgi header parser before ngx_http_upstream_cache_send() Igor Sysoev <igor@sysoev.ru> parents: 2804 diff changeset	1996
60551422e150 reinit proxy/fastcgi header parser before ngx_http_upstream_cache_send() Igor Sysoev <igor@sysoev.ru> parents: 2804 diff changeset	1997 ngx_http_upstream_finalize_request(r, u, rc);
2268 33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	1998 return NGX_OK;
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	1999 }
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2000
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2001 #endif
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2002 }
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2003
5441 43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2004 #if (NGX_HTTP_CACHE)
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2005
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2006 if (status == NGX_HTTP_NOT_MODIFIED
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2007 && u->cache_status == NGX_HTTP_CACHE_EXPIRED
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2008 && u->conf->cache_revalidate)
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2009 {
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2010 time_t now, valid;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2011 ngx_int_t rc;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2012
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2013 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2014 "http upstream not modified");
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2015
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2016 now = ngx_time();
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2017 valid = r->cache->valid_sec;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2018
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2019 rc = u->reinit_request(r);
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2020
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2021 if (rc != NGX_OK) {
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2022 ngx_http_upstream_finalize_request(r, u, rc);
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2023 return NGX_OK;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2024 }
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2025
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2026 u->cache_status = NGX_HTTP_CACHE_REVALIDATED;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2027 rc = ngx_http_upstream_cache_send(r, u);
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2028
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2029 if (valid == 0) {
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2030 valid = r->cache->valid_sec;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2031 }
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2032
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2033 if (valid == 0) {
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2034 valid = ngx_http_file_cache_valid(u->conf->cache_valid,
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2035 u->headers_in.status_n);
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2036 if (valid) {
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2037 valid = now + valid;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2038 }
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2039 }
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2040
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2041 if (valid) {
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2042 r->cache->valid_sec = valid;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2043 r->cache->date = now;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2044
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2045 ngx_http_file_cache_update_header(r);
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2046 }
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2047
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2048 ngx_http_upstream_finalize_request(r, u, rc);
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2049 return NGX_OK;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2050 }
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2051
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2052 #endif
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2053
2268 33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2054 return NGX_DECLINED;
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2055 }
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2056
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2057
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2058 static ngx_int_t
2267 920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2059 ngx_http_upstream_intercept_errors(ngx_http_request_t *r,
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2060 ngx_http_upstream_t *u)
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2061 {
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2062 ngx_int_t status;
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2063 ngx_uint_t i;
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2064 ngx_table_elt_t *h;
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2065 ngx_http_err_page_t *err_page;
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2066 ngx_http_core_loc_conf_t *clcf;
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2067
2441 0c117a89f399 in miss case memcached module returned END instead of default 404 page body Igor Sysoev <igor@sysoev.ru> parents: 2422 diff changeset	2068 status = u->headers_in.status_n;
0c117a89f399 in miss case memcached module returned END instead of default 404 page body Igor Sysoev <igor@sysoev.ru> parents: 2422 diff changeset	2069
0c117a89f399 in miss case memcached module returned END instead of default 404 page body Igor Sysoev <igor@sysoev.ru> parents: 2422 diff changeset	2070 if (status == NGX_HTTP_NOT_FOUND && u->conf->intercept_404) {
0c117a89f399 in miss case memcached module returned END instead of default 404 page body Igor Sysoev <igor@sysoev.ru> parents: 2422 diff changeset	2071 ngx_http_upstream_finalize_request(r, u, NGX_HTTP_NOT_FOUND);
0c117a89f399 in miss case memcached module returned END instead of default 404 page body Igor Sysoev <igor@sysoev.ru> parents: 2422 diff changeset	2072 return NGX_OK;
0c117a89f399 in miss case memcached module returned END instead of default 404 page body Igor Sysoev <igor@sysoev.ru> parents: 2422 diff changeset	2073 }
0c117a89f399 in miss case memcached module returned END instead of default 404 page body Igor Sysoev <igor@sysoev.ru> parents: 2422 diff changeset	2074
2267 920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2075 if (!u->conf->intercept_errors) {
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2076 return NGX_DECLINED;
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2077 }
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2078
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2079 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2080
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2081 if (clcf->error_pages == NULL) {
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2082 return NGX_DECLINED;
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2083 }
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2084
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2085 err_page = clcf->error_pages->elts;
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2086 for (i = 0; i < clcf->error_pages->nelts; i++) {
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2087
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2088 if (err_page[i].status == status) {
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2089
2953 aa12525236da fix segfault if there is error_page 401, proxy_intercept_errors is on Igor Sysoev <igor@sysoev.ru> parents: 2952 diff changeset	2090 if (status == NGX_HTTP_UNAUTHORIZED
aa12525236da fix segfault if there is error_page 401, proxy_intercept_errors is on Igor Sysoev <igor@sysoev.ru> parents: 2952 diff changeset	2091 && u->headers_in.www_authenticate)
aa12525236da fix segfault if there is error_page 401, proxy_intercept_errors is on Igor Sysoev <igor@sysoev.ru> parents: 2952 diff changeset	2092 {
2267 920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2093 h = ngx_list_push(&r->headers_out.headers);
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2094
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2095 if (h == NULL) {
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2096 ngx_http_upstream_finalize_request(r, u,
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2097 NGX_HTTP_INTERNAL_SERVER_ERROR);
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2098 return NGX_OK;
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2099 }
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2100
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2101 h = u->headers_in.www_authenticate;
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2102
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2103 r->headers_out.www_authenticate = h;
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2104 }
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2105
3706 ea908f6ae499 an intercepted error code was not cached Igor Sysoev <igor@sysoev.ru> parents: 3705 diff changeset	2106 #if (NGX_HTTP_CACHE)
ea908f6ae499 an intercepted error code was not cached Igor Sysoev <igor@sysoev.ru> parents: 3705 diff changeset	2107
3709 64777690c697 fix r3707: cache node should be freed be a response is not cached Igor Sysoev <igor@sysoev.ru> parents: 3708 diff changeset	2108 if (r->cache) {
3706 ea908f6ae499 an intercepted error code was not cached Igor Sysoev <igor@sysoev.ru> parents: 3705 diff changeset	2109 time_t valid;
ea908f6ae499 an intercepted error code was not cached Igor Sysoev <igor@sysoev.ru> parents: 3705 diff changeset	2110
ea908f6ae499 an intercepted error code was not cached Igor Sysoev <igor@sysoev.ru> parents: 3705 diff changeset	2111 valid = ngx_http_file_cache_valid(u->conf->cache_valid, status);
ea908f6ae499 an intercepted error code was not cached Igor Sysoev <igor@sysoev.ru> parents: 3705 diff changeset	2112
ea908f6ae499 an intercepted error code was not cached Igor Sysoev <igor@sysoev.ru> parents: 3705 diff changeset	2113 if (valid) {
ea908f6ae499 an intercepted error code was not cached Igor Sysoev <igor@sysoev.ru> parents: 3705 diff changeset	2114 r->cache->valid_sec = ngx_time() + valid;
ea908f6ae499 an intercepted error code was not cached Igor Sysoev <igor@sysoev.ru> parents: 3705 diff changeset	2115 r->cache->error = status;
ea908f6ae499 an intercepted error code was not cached Igor Sysoev <igor@sysoev.ru> parents: 3705 diff changeset	2116 }
ea908f6ae499 an intercepted error code was not cached Igor Sysoev <igor@sysoev.ru> parents: 3705 diff changeset	2117
3711 ce6ba077c270 several changes in cache cleanup handling: Igor Sysoev <igor@sysoev.ru> parents: 3709 diff changeset	2118 ngx_http_file_cache_free(r->cache, u->pipe->temp_file);
3706 ea908f6ae499 an intercepted error code was not cached Igor Sysoev <igor@sysoev.ru> parents: 3705 diff changeset	2119 }
ea908f6ae499 an intercepted error code was not cached Igor Sysoev <igor@sysoev.ru> parents: 3705 diff changeset	2120 #endif
2267 920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2121 ngx_http_upstream_finalize_request(r, u, status);
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2122
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2123 return NGX_OK;
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2124 }
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2125 }
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2126
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2127 return NGX_DECLINED;
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2128 }
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2129
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2130
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2131 static ngx_int_t
1153 c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2132 ngx_http_upstream_test_connect(ngx_connection_t *c)
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2133 {
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2134 int err;
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2135 socklen_t len;
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2136
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2137 #if (NGX_HAVE_KQUEUE)
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2138
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2139 if (ngx_event_flags & NGX_USE_KQUEUE_EVENT) {
4915 e62219793beb Upstream: better detection of connect() failures with kqueue. Maxim Dounin <mdounin@mdounin.ru> parents: 4895 diff changeset	2140 if (c->write->pending_eof \|\| c->read->pending_eof) {
e62219793beb Upstream: better detection of connect() failures with kqueue. Maxim Dounin <mdounin@mdounin.ru> parents: 4895 diff changeset	2141 if (c->write->pending_eof) {
e62219793beb Upstream: better detection of connect() failures with kqueue. Maxim Dounin <mdounin@mdounin.ru> parents: 4895 diff changeset	2142 err = c->write->kq_errno;
e62219793beb Upstream: better detection of connect() failures with kqueue. Maxim Dounin <mdounin@mdounin.ru> parents: 4895 diff changeset	2143
e62219793beb Upstream: better detection of connect() failures with kqueue. Maxim Dounin <mdounin@mdounin.ru> parents: 4895 diff changeset	2144 } else {
e62219793beb Upstream: better detection of connect() failures with kqueue. Maxim Dounin <mdounin@mdounin.ru> parents: 4895 diff changeset	2145 err = c->read->kq_errno;
e62219793beb Upstream: better detection of connect() failures with kqueue. Maxim Dounin <mdounin@mdounin.ru> parents: 4895 diff changeset	2146 }
e62219793beb Upstream: better detection of connect() failures with kqueue. Maxim Dounin <mdounin@mdounin.ru> parents: 4895 diff changeset	2147
1469 0a269c464eaf connection error should be logged with "connecting to upstream" action, Igor Sysoev <igor@sysoev.ru> parents: 1468 diff changeset	2148 c->log->action = "connecting to upstream";
4916 79c8e87b1fcb Trailing whitespace fix. Maxim Dounin <mdounin@mdounin.ru> parents: 4915 diff changeset	2149 (void) ngx_connection_error(c, err,
1166 bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2150 "kevent() reported that connect() failed");
bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2151 return NGX_ERROR;
bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2152 }
1153 c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2153
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2154 } else
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2155 #endif
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2156 {
1166 bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2157 err = 0;
bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2158 len = sizeof(int);
bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2159
bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2160 /*
bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2161 * BSDs and Linux return 0 and set a pending error in err
bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2162 * Solaris returns -1 and sets errno
bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2163 */
bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2164
bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2165 if (getsockopt(c->fd, SOL_SOCKET, SO_ERROR, (void *) &err, &len)
bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2166 == -1)
bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2167 {
5557 188481078faf Use ngx_socket_errno where appropriate. Piotr Sikora <piotr@cloudflare.com> parents: 5546 diff changeset	2168 err = ngx_socket_errno;
1166 bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2169 }
bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2170
bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2171 if (err) {
1469 0a269c464eaf connection error should be logged with "connecting to upstream" action, Igor Sysoev <igor@sysoev.ru> parents: 1468 diff changeset	2172 c->log->action = "connecting to upstream";
1166 bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2173 (void) ngx_connection_error(c, err, "connect() failed");
bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2174 return NGX_ERROR;
bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2175 }
1153 c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2176 }
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2177
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2178 return NGX_OK;
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2179 }
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2180
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2181
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2182 static ngx_int_t
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2183 ngx_http_upstream_process_headers(ngx_http_request_t r, ngx_http_upstream_t u)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2184 {
5489 6d357b2a9d6e Upstream: keep $upstream_http_x_accel_redirect intact. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	2185 ngx_str_t uri, args;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2186 ngx_uint_t i, flags;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2187 ngx_list_part_t *part;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2188 ngx_table_elt_t *h;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2189 ngx_http_upstream_header_t *hh;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2190 ngx_http_upstream_main_conf_t *umcf;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2191
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2192 umcf = ngx_http_get_module_main_conf(r, ngx_http_upstream_module);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2193
2786 4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	2194 if (u->headers_in.x_accel_redirect
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	2195 && !(u->conf->ignore_headers & NGX_HTTP_UPSTREAM_IGN_XA_REDIRECT))
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	2196 {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2197 ngx_http_upstream_finalize_request(r, u, NGX_DECLINED);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2198
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2199 part = &u->headers_in.headers.part;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2200 h = part->elts;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2201
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2202 for (i = 0; /* void */; i++) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2203
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2204 if (i >= part->nelts) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2205 if (part->next == NULL) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2206 break;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2207 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2208
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2209 part = part->next;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2210 h = part->elts;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2211 i = 0;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2212 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2213
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2214 hh = ngx_hash_find(&umcf->headers_in_hash, h[i].hash,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2215 h[i].lowcase_key, h[i].key.len);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2216
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2217 if (hh && hh->redirect) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2218 if (hh->copy_handler(r, &h[i], hh->conf) != NGX_OK) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2219 ngx_http_finalize_request(r,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2220 NGX_HTTP_INTERNAL_SERVER_ERROR);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2221 return NGX_DONE;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2222 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2223 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2224 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2225
5489 6d357b2a9d6e Upstream: keep $upstream_http_x_accel_redirect intact. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	2226 uri = u->headers_in.x_accel_redirect->value;
5901 7d7eac6e31df Upstream: support named location for X-Accel-Redirect. Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp> parents: 5885 diff changeset	2227
7d7eac6e31df Upstream: support named location for X-Accel-Redirect. Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp> parents: 5885 diff changeset	2228 if (uri.data[0] == '@') {
7d7eac6e31df Upstream: support named location for X-Accel-Redirect. Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp> parents: 5885 diff changeset	2229 ngx_http_named_location(r, &uri);
7d7eac6e31df Upstream: support named location for X-Accel-Redirect. Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp> parents: 5885 diff changeset	2230
7d7eac6e31df Upstream: support named location for X-Accel-Redirect. Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp> parents: 5885 diff changeset	2231 } else {
7d7eac6e31df Upstream: support named location for X-Accel-Redirect. Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp> parents: 5885 diff changeset	2232 ngx_str_null(&args);
7d7eac6e31df Upstream: support named location for X-Accel-Redirect. Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp> parents: 5885 diff changeset	2233 flags = NGX_HTTP_LOG_UNSAFE;
7d7eac6e31df Upstream: support named location for X-Accel-Redirect. Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp> parents: 5885 diff changeset	2234
7d7eac6e31df Upstream: support named location for X-Accel-Redirect. Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp> parents: 5885 diff changeset	2235 if (ngx_http_parse_unsafe_uri(r, &uri, &args, &flags) != NGX_OK) {
7d7eac6e31df Upstream: support named location for X-Accel-Redirect. Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp> parents: 5885 diff changeset	2236 ngx_http_finalize_request(r, NGX_HTTP_NOT_FOUND);
7d7eac6e31df Upstream: support named location for X-Accel-Redirect. Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp> parents: 5885 diff changeset	2237 return NGX_DONE;
7d7eac6e31df Upstream: support named location for X-Accel-Redirect. Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp> parents: 5885 diff changeset	2238 }
7d7eac6e31df Upstream: support named location for X-Accel-Redirect. Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp> parents: 5885 diff changeset	2239
7d7eac6e31df Upstream: support named location for X-Accel-Redirect. Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp> parents: 5885 diff changeset	2240 if (r->method != NGX_HTTP_HEAD) {
7d7eac6e31df Upstream: support named location for X-Accel-Redirect. Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp> parents: 5885 diff changeset	2241 r->method = NGX_HTTP_GET;
7d7eac6e31df Upstream: support named location for X-Accel-Redirect. Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp> parents: 5885 diff changeset	2242 }
7d7eac6e31df Upstream: support named location for X-Accel-Redirect. Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp> parents: 5885 diff changeset	2243
7d7eac6e31df Upstream: support named location for X-Accel-Redirect. Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp> parents: 5885 diff changeset	2244 ngx_http_internal_redirect(r, &uri, &args);
7d7eac6e31df Upstream: support named location for X-Accel-Redirect. Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp> parents: 5885 diff changeset	2245 }
7d7eac6e31df Upstream: support named location for X-Accel-Redirect. Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp> parents: 5885 diff changeset	2246
3120 40b8b398dbbc fix request counter for X-Accel-Redirect, the bug was introduced in r3050 Igor Sysoev <igor@sysoev.ru> parents: 3112 diff changeset	2247 ngx_http_finalize_request(r, NGX_DONE);
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2248 return NGX_DONE;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2249 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2250
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2251 part = &u->headers_in.headers.part;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2252 h = part->elts;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2253
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2254 for (i = 0; /* void */; i++) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2255
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2256 if (i >= part->nelts) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2257 if (part->next == NULL) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2258 break;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2259 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2260
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2261 part = part->next;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2262 h = part->elts;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2263 i = 0;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2264 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2265
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2266 if (ngx_hash_find(&u->conf->hide_headers_hash, h[i].hash,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2267 h[i].lowcase_key, h[i].key.len))
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2268 {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2269 continue;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2270 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2271
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2272 hh = ngx_hash_find(&umcf->headers_in_hash, h[i].hash,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2273 h[i].lowcase_key, h[i].key.len);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2274
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2275 if (hh) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2276 if (hh->copy_handler(r, &h[i], hh->conf) != NGX_OK) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2277 ngx_http_upstream_finalize_request(r, u,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2278 NGX_HTTP_INTERNAL_SERVER_ERROR);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2279 return NGX_DONE;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2280 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2281
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2282 continue;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2283 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2284
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2285 if (ngx_http_upstream_copy_header_line(r, &h[i], 0) != NGX_OK) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2286 ngx_http_upstream_finalize_request(r, u,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2287 NGX_HTTP_INTERNAL_SERVER_ERROR);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2288 return NGX_DONE;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2289 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2290 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2291
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2292 if (r->headers_out.server && r->headers_out.server->value.data == NULL) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2293 r->headers_out.server->hash = 0;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2294 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2295
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2296 if (r->headers_out.date && r->headers_out.date->value.data == NULL) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2297 r->headers_out.date->hash = 0;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2298 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2299
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2300 r->headers_out.status = u->headers_in.status_n;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2301 r->headers_out.status_line = u->headers_in.status_line;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2302
4117 103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	2303 r->headers_out.content_length_n = u->headers_in.content_length_n;
103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	2304
5735 5fb1e57c758a Entity tags: explicit flag to skip not modified filter. Maxim Dounin <mdounin@mdounin.ru> parents: 5732 diff changeset	2305 r->disable_not_modified = !u->cacheable;
5fb1e57c758a Entity tags: explicit flag to skip not modified filter. Maxim Dounin <mdounin@mdounin.ru> parents: 5732 diff changeset	2306
5874 2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5869 diff changeset	2307 if (u->conf->force_ranges) {
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5869 diff changeset	2308 r->allow_ranges = 1;
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5869 diff changeset	2309 r->single_range = 1;
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5869 diff changeset	2310
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5869 diff changeset	2311 #if (NGX_HTTP_CACHE)
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5869 diff changeset	2312 if (r->cached) {
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5869 diff changeset	2313 r->single_range = 0;
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5869 diff changeset	2314 }
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5869 diff changeset	2315 #endif
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5869 diff changeset	2316 }
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5869 diff changeset	2317
5300 f538a67c9f77 Upstream: u->length now defaults to -1 (API change). Maxim Dounin <mdounin@mdounin.ru> parents: 5299 diff changeset	2318 u->length = -1;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2319
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2320 return NGX_OK;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2321 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2322
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2323
777 4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2324 static void
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2325 ngx_http_upstream_process_body_in_memory(ngx_http_request_t *r,
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2326 ngx_http_upstream_t *u)
777 4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2327 {
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2328 size_t size;
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2329 ssize_t n;
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2330 ngx_buf_t *b;
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2331 ngx_event_t *rev;
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2332 ngx_connection_t *c;
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2333
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2334 c = u->peer.connection;
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2335 rev = c->read;
777 4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2336
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2337 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2338 "http upstream process body on memory");
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2339
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2340 if (rev->timedout) {
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2341 ngx_connection_error(c, NGX_ETIMEDOUT, "upstream timed out");
5296 1ccdda1f37f3 Upstream: NGX_HTTP_GATEWAY_TIME_OUT after upstream timeouts. Maxim Dounin <mdounin@mdounin.ru> parents: 5295 diff changeset	2342 ngx_http_upstream_finalize_request(r, u, NGX_HTTP_GATEWAY_TIME_OUT);
777 4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2343 return;
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2344 }
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2345
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2346 b = &u->buffer;
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2347
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2348 for ( ;; ) {
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2349
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2350 size = b->end - b->last;
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2351
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2352 if (size == 0) {
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2353 ngx_log_error(NGX_LOG_ALERT, c->log, 0,
3708 c1385a3b8093 fix typo Igor Sysoev <igor@sysoev.ru> parents: 3706 diff changeset	2354 "upstream buffer is too small to read response");
777 4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2355 ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2356 return;
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2357 }
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2358
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2359 n = c->recv(c, b->last, size);
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2360
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2361 if (n == NGX_AGAIN) {
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2362 break;
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2363 }
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2364
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2365 if (n == 0 \|\| n == NGX_ERROR) {
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2366 ngx_http_upstream_finalize_request(r, u, n);
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2367 return;
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2368 }
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2369
2402 cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	2370 u->state->response_length += n;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	2371
777 4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2372 if (u->input_filter(u->input_filter_ctx, n) == NGX_ERROR) {
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2373 ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2374 return;
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2375 }
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2376
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2377 if (!rev->ready) {
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2378 break;
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2379 }
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2380 }
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2381
4120 42135dd1f0ea Upstream: keepalive flag. Maxim Dounin <mdounin@mdounin.ru> parents: 4119 diff changeset	2382 if (u->length == 0) {
42135dd1f0ea Upstream: keepalive flag. Maxim Dounin <mdounin@mdounin.ru> parents: 4119 diff changeset	2383 ngx_http_upstream_finalize_request(r, u, 0);
42135dd1f0ea Upstream: keepalive flag. Maxim Dounin <mdounin@mdounin.ru> parents: 4119 diff changeset	2384 return;
42135dd1f0ea Upstream: keepalive flag. Maxim Dounin <mdounin@mdounin.ru> parents: 4119 diff changeset	2385 }
42135dd1f0ea Upstream: keepalive flag. Maxim Dounin <mdounin@mdounin.ru> parents: 4119 diff changeset	2386
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2387 if (ngx_handle_read_event(rev, 0) != NGX_OK) {
777 4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2388 ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2389 return;
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2390 }
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2391
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2392 if (rev->active) {
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2393 ngx_add_timer(rev, u->conf->read_timeout);
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2394
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2395 } else if (rev->timer_set) {
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2396 ngx_del_timer(rev);
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2397 }
681 7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 675 diff changeset	2398 }
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 675 diff changeset	2399
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 675 diff changeset	2400
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 675 diff changeset	2401 static void
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 675 diff changeset	2402 ngx_http_upstream_send_response(ngx_http_request_t r, ngx_http_upstream_t u)
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 675 diff changeset	2403 {
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 675 diff changeset	2404 int tcp_nodelay;
2402 cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	2405 ssize_t n;
681 7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 675 diff changeset	2406 ngx_int_t rc;
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 675 diff changeset	2407 ngx_event_pipe_t *p;
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 675 diff changeset	2408 ngx_connection_t *c;
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 675 diff changeset	2409 ngx_http_core_loc_conf_t *clcf;
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 675 diff changeset	2410
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2411 rc = ngx_http_send_header(r);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2412
2701 756f73ca1e39 support HEAD in proxy cache Igor Sysoev <igor@sysoev.ru> parents: 2692 diff changeset	2413 if (rc == NGX_ERROR \|\| rc > NGX_OK \|\| r->post_action) {
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 483 diff changeset	2414 ngx_http_upstream_finalize_request(r, u, rc);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2415 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2416 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2417
5353 1608b1135a1d Upstream: setting u->header_sent before ngx_http_upstream_upgrade(). Maxim Dounin <mdounin@mdounin.ru> parents: 5340 diff changeset	2418 u->header_sent = 1;
1608b1135a1d Upstream: setting u->header_sent before ngx_http_upstream_upgrade(). Maxim Dounin <mdounin@mdounin.ru> parents: 5340 diff changeset	2419
5072 7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2420 if (u->upgrade) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2421 ngx_http_upstream_upgrade(r, u);
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2422 return;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2423 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2424
2704 ac1e2e199c9f shutdown client connection for cacheable header only responses Igor Sysoev <igor@sysoev.ru> parents: 2703 diff changeset	2425 c = r->connection;
ac1e2e199c9f shutdown client connection for cacheable header only responses Igor Sysoev <igor@sysoev.ru> parents: 2703 diff changeset	2426
2701 756f73ca1e39 support HEAD in proxy cache Igor Sysoev <igor@sysoev.ru> parents: 2692 diff changeset	2427 if (r->header_only) {
2704 ac1e2e199c9f shutdown client connection for cacheable header only responses Igor Sysoev <igor@sysoev.ru> parents: 2703 diff changeset	2428
5746 35990c69b3ac Upstream: p->downstream_error instead of closing connection. Maxim Dounin <mdounin@mdounin.ru> parents: 5745 diff changeset	2429 if (!u->buffering) {
2701 756f73ca1e39 support HEAD in proxy cache Igor Sysoev <igor@sysoev.ru> parents: 2692 diff changeset	2430 ngx_http_upstream_finalize_request(r, u, rc);
756f73ca1e39 support HEAD in proxy cache Igor Sysoev <igor@sysoev.ru> parents: 2692 diff changeset	2431 return;
756f73ca1e39 support HEAD in proxy cache Igor Sysoev <igor@sysoev.ru> parents: 2692 diff changeset	2432 }
5746 35990c69b3ac Upstream: p->downstream_error instead of closing connection. Maxim Dounin <mdounin@mdounin.ru> parents: 5745 diff changeset	2433
35990c69b3ac Upstream: p->downstream_error instead of closing connection. Maxim Dounin <mdounin@mdounin.ru> parents: 5745 diff changeset	2434 if (!u->cacheable && !u->store) {
35990c69b3ac Upstream: p->downstream_error instead of closing connection. Maxim Dounin <mdounin@mdounin.ru> parents: 5745 diff changeset	2435 ngx_http_upstream_finalize_request(r, u, rc);
35990c69b3ac Upstream: p->downstream_error instead of closing connection. Maxim Dounin <mdounin@mdounin.ru> parents: 5745 diff changeset	2436 return;
35990c69b3ac Upstream: p->downstream_error instead of closing connection. Maxim Dounin <mdounin@mdounin.ru> parents: 5745 diff changeset	2437 }
35990c69b3ac Upstream: p->downstream_error instead of closing connection. Maxim Dounin <mdounin@mdounin.ru> parents: 5745 diff changeset	2438
35990c69b3ac Upstream: p->downstream_error instead of closing connection. Maxim Dounin <mdounin@mdounin.ru> parents: 5745 diff changeset	2439 u->pipe->downstream_error = 1;
2701 756f73ca1e39 support HEAD in proxy cache Igor Sysoev <igor@sysoev.ru> parents: 2692 diff changeset	2440 }
756f73ca1e39 support HEAD in proxy cache Igor Sysoev <igor@sysoev.ru> parents: 2692 diff changeset	2441
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	2442 if (r->request_body && r->request_body->temp_file) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2443 ngx_pool_run_cleanup_file(r->pool, r->request_body->temp_file->file.fd);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2444 r->request_body->temp_file->file.fd = NGX_INVALID_FILE;
563 9c2f3ed7a247 nginx-0.3.3-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	2445 }
9c2f3ed7a247 nginx-0.3.3-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	2446
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2447 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2448
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	2449 if (!u->buffering) {
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2450
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2451 if (u->input_filter == NULL) {
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2452 u->input_filter_init = ngx_http_upstream_non_buffered_filter_init;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2453 u->input_filter = ngx_http_upstream_non_buffered_filter;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2454 u->input_filter_ctx = r;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2455 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2456
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	2457 u->read_event_handler = ngx_http_upstream_process_non_buffered_upstream;
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2458 r->write_event_handler =
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2459 ngx_http_upstream_process_non_buffered_downstream;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2460
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2461 r->limit_rate = 0;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2462
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2463 if (u->input_filter_init(u->input_filter_ctx) == NGX_ERROR) {
5295 a489c31c9783 Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5294 diff changeset	2464 ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2465 return;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2466 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2467
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	2468 if (clcf->tcp_nodelay && c->tcp_nodelay == NGX_TCP_NODELAY_UNSET) {
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	2469 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "tcp_nodelay");
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	2470
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	2471 tcp_nodelay = 1;
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	2472
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	2473 if (setsockopt(c->fd, IPPROTO_TCP, TCP_NODELAY,
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	2474 (const void *) &tcp_nodelay, sizeof(int)) == -1)
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	2475 {
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	2476 ngx_connection_error(c, ngx_socket_errno,
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	2477 "setsockopt(TCP_NODELAY) failed");
5295 a489c31c9783 Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5294 diff changeset	2478 ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	2479 return;
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	2480 }
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	2481
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	2482 c->tcp_nodelay = NGX_TCP_NODELAY_SET;
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	2483 }
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	2484
2402 cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	2485 n = u->buffer.last - u->buffer.pos;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	2486
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	2487 if (n) {
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2488 u->buffer.last = u->buffer.pos;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2489
2402 cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	2490 u->state->response_length += n;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	2491
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	2492 if (u->input_filter(u->input_filter_ctx, n) == NGX_ERROR) {
5295 a489c31c9783 Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5294 diff changeset	2493 ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2494 return;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2495 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2496
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	2497 ngx_http_upstream_process_non_buffered_downstream(r);
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2498
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2499 } else {
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2500 u->buffer.pos = u->buffer.start;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2501 u->buffer.last = u->buffer.start;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2502
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2503 if (ngx_http_send_special(r, NGX_HTTP_FLUSH) == NGX_ERROR) {
5295 a489c31c9783 Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5294 diff changeset	2504 ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2505 return;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2506 }
1468 491e5059ea19 read EOF of header only responses in non-buffered proxying Igor Sysoev <igor@sysoev.ru> parents: 1397 diff changeset	2507
4120 42135dd1f0ea Upstream: keepalive flag. Maxim Dounin <mdounin@mdounin.ru> parents: 4119 diff changeset	2508 if (u->peer.connection->read->ready \|\| u->length == 0) {
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2509 ngx_http_upstream_process_non_buffered_upstream(r, u);
1468 491e5059ea19 read EOF of header only responses in non-buffered proxying Igor Sysoev <igor@sysoev.ru> parents: 1397 diff changeset	2510 }
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2511 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2512
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2513 return;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2514 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2515
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2516 /* TODO: preallocate event_pipe bufs, look "Content-Length" */
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2517
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2518 #if (NGX_HTTP_CACHE)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2519
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2520 if (r->cache && r->cache->file.fd != NGX_INVALID_FILE) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2521 ngx_pool_run_cleanup_file(r->pool, r->cache->file.fd);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2522 r->cache->file.fd = NGX_INVALID_FILE;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2523 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2524
3699 b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	2525 switch (ngx_http_test_predicates(r, u->conf->no_cache)) {
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	2526
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	2527 case NGX_ERROR:
5295 a489c31c9783 Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5294 diff changeset	2528 ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
3699 b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	2529 return;
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	2530
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	2531 case NGX_DECLINED:
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	2532 u->cacheable = 0;
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	2533 break;
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	2534
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	2535 default: /* NGX_OK */
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	2536
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	2537 if (u->cache_status == NGX_HTTP_CACHE_BYPASS) {
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	2538
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	2539 r->cache->min_uses = u->conf->cache_min_uses;
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	2540 r->cache->body_start = u->conf->buffer_size;
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	2541 r->cache->file_cache = u->conf->cache->data;
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	2542
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	2543 if (ngx_http_file_cache_create(r) != NGX_OK) {
5295 a489c31c9783 Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5294 diff changeset	2544 ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
3699 b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	2545 return;
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	2546 }
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	2547 }
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	2548
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	2549 break;
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	2550 }
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	2551
1565 4c43e25d11ea fix English grammar Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	2552 if (u->cacheable) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2553 time_t now, valid;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2554
2663 09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	2555 now = ngx_time();
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	2556
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	2557 valid = r->cache->valid_sec;
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	2558
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	2559 if (valid == 0) {
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	2560 valid = ngx_http_file_cache_valid(u->conf->cache_valid,
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	2561 u->headers_in.status_n);
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	2562 if (valid) {
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	2563 r->cache->valid_sec = now + valid;
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	2564 }
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	2565 }
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	2566
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2567 if (valid) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2568 r->cache->date = now;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2569 r->cache->body_start = (u_short) (u->buffer.pos - u->buffer.start);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2570
5935 1573fc7875fa Cache: send conditional requests only for cached 200/206 responses. Piotr Sikora <piotr@cloudflare.com> parents: 5928 diff changeset	2571 if (u->headers_in.status_n == NGX_HTTP_OK
1573fc7875fa Cache: send conditional requests only for cached 200/206 responses. Piotr Sikora <piotr@cloudflare.com> parents: 5928 diff changeset	2572 \|\| u->headers_in.status_n == NGX_HTTP_PARTIAL_CONTENT)
1573fc7875fa Cache: send conditional requests only for cached 200/206 responses. Piotr Sikora <piotr@cloudflare.com> parents: 5928 diff changeset	2573 {
1573fc7875fa Cache: send conditional requests only for cached 200/206 responses. Piotr Sikora <piotr@cloudflare.com> parents: 5928 diff changeset	2574 r->cache->last_modified = u->headers_in.last_modified_time;
1573fc7875fa Cache: send conditional requests only for cached 200/206 responses. Piotr Sikora <piotr@cloudflare.com> parents: 5928 diff changeset	2575
1573fc7875fa Cache: send conditional requests only for cached 200/206 responses. Piotr Sikora <piotr@cloudflare.com> parents: 5928 diff changeset	2576 if (u->headers_in.etag) {
1573fc7875fa Cache: send conditional requests only for cached 200/206 responses. Piotr Sikora <piotr@cloudflare.com> parents: 5928 diff changeset	2577 r->cache->etag = u->headers_in.etag->value;
1573fc7875fa Cache: send conditional requests only for cached 200/206 responses. Piotr Sikora <piotr@cloudflare.com> parents: 5928 diff changeset	2578 }
5737 44b9ab7752e3 Cache: ETag now saved into cache header. Maxim Dounin <mdounin@mdounin.ru> parents: 5735 diff changeset	2579 }
44b9ab7752e3 Cache: ETag now saved into cache header. Maxim Dounin <mdounin@mdounin.ru> parents: 5735 diff changeset	2580
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2581 ngx_http_file_cache_set_header(r, u->buffer.start);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2582
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2583 } else {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2584 u->cacheable = 0;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2585 }
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2586 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2587
2690 d3cffe32b930 add debug logging Igor Sysoev <igor@sysoev.ru> parents: 2669 diff changeset	2588 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
d3cffe32b930 add debug logging Igor Sysoev <igor@sysoev.ru> parents: 2669 diff changeset	2589 "http cacheable: %d", u->cacheable);
d3cffe32b930 add debug logging Igor Sysoev <igor@sysoev.ru> parents: 2669 diff changeset	2590
3083 ffe8bfb38184 clean cache updating state if a response has uncacheable code or Igor Sysoev <igor@sysoev.ru> parents: 3056 diff changeset	2591 if (u->cacheable == 0 && r->cache) {
3711 ce6ba077c270 several changes in cache cleanup handling: Igor Sysoev <igor@sysoev.ru> parents: 3709 diff changeset	2592 ngx_http_file_cache_free(r->cache, u->pipe->temp_file);
3083 ffe8bfb38184 clean cache updating state if a response has uncacheable code or Igor Sysoev <igor@sysoev.ru> parents: 3056 diff changeset	2593 }
ffe8bfb38184 clean cache updating state if a response has uncacheable code or Igor Sysoev <igor@sysoev.ru> parents: 3056 diff changeset	2594
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2595 #endif
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2596
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2597 p = u->pipe;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2598
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2599 p->output_filter = (ngx_event_pipe_output_filter_pt) ngx_http_output_filter;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2600 p->output_ctx = r;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2601 p->tag = u->output.tag;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2602 p->bufs = u->conf->bufs;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2603 p->busy_size = u->conf->busy_buffers_size;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2604 p->upstream = u->peer.connection;
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	2605 p->downstream = c;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2606 p->pool = r->pool;
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	2607 p->log = c->log;
5883 973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	2608 p->limit_rate = u->conf->limit_rate;
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	2609 p->start_sec = ngx_time();
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2610
1565 4c43e25d11ea fix English grammar Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	2611 p->cacheable = u->cacheable \|\| u->store;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2612
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 487 diff changeset	2613 p->temp_file = ngx_pcalloc(r->pool, sizeof(ngx_temp_file_t));
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 487 diff changeset	2614 if (p->temp_file == NULL) {
5295 a489c31c9783 Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5294 diff changeset	2615 ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2616 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2617 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2618
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2619 p->temp_file->file.fd = NGX_INVALID_FILE;
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	2620 p->temp_file->file.log = c->log;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2621 p->temp_file->path = u->conf->temp_path;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2622 p->temp_file->pool = r->pool;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2623
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2624 if (p->cacheable) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2625 p->temp_file->persistent = 1;
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	2626
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2627 } else {
667 63a820b0bc6c nginx-0.3.55-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 665 diff changeset	2628 p->temp_file->log_level = NGX_LOG_WARN;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2629 p->temp_file->warn = "an upstream response is buffered "
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2630 "to a temporary file";
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2631 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2632
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2633 p->max_temp_file_size = u->conf->max_temp_file_size;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2634 p->temp_file_write_size = u->conf->temp_file_write_size;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2635
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 487 diff changeset	2636 p->preread_bufs = ngx_alloc_chain_link(r->pool);
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 487 diff changeset	2637 if (p->preread_bufs == NULL) {
5295 a489c31c9783 Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5294 diff changeset	2638 ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2639 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2640 }
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	2641
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2642 p->preread_bufs->buf = &u->buffer;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2643 p->preread_bufs->next = NULL;
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2644 u->buffer.recycled = 1;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2645
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2646 p->preread_size = u->buffer.last - u->buffer.pos;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2647
1565 4c43e25d11ea fix English grammar Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	2648 if (u->cacheable) {
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	2649
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2650 p->buf_to_file = ngx_calloc_buf(r->pool);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2651 if (p->buf_to_file == NULL) {
5295 a489c31c9783 Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5294 diff changeset	2652 ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2653 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2654 }
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	2655
4895 508e61393b6c Event pipe: fixed handling of buf_to_file data. Maxim Dounin <mdounin@mdounin.ru> parents: 4769 diff changeset	2656 p->buf_to_file->start = u->buffer.start;
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2657 p->buf_to_file->pos = u->buffer.start;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2658 p->buf_to_file->last = u->buffer.pos;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2659 p->buf_to_file->temporary = 1;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2660 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2661
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2662 if (ngx_event_flags & NGX_USE_AIO_EVENT) {
4499 778ef9c3fd2d Fixed spelling in single-line comments. Ruslan Ermilov <ru@nginx.com> parents: 4474 diff changeset	2663 /* the posted aio operation may corrupt a shadow buffer */
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2664 p->single_buf = 1;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2665 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2666
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2667 /* TODO: p->free_bufs = 0 if use ngx_create_chain_of_bufs() */
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2668 p->free_bufs = 1;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2669
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2670 /*
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2671 * event_pipe would do u->buffer.last += p->preread_size
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2672 * as though these bytes were read
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2673 */
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2674 u->buffer.last = u->buffer.pos;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2675
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2676 if (u->conf->cyclic_temp_file) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2677
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2678 /*
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2679 * we need to disable the use of sendfile() if we use cyclic temp file
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2680 * because the writing a new data may interfere with sendfile()
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2681 * that uses the same kernel file pages (at least on FreeBSD)
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2682 */
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2683
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2684 p->cyclic_temp_file = 1;
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	2685 c->sendfile = 0;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2686
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2687 } else {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2688 p->cyclic_temp_file = 0;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2689 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2690
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2691 p->read_timeout = u->conf->read_timeout;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2692 p->send_timeout = clcf->send_timeout;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2693 p->send_lowat = clcf->send_lowat;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2694
4119 b66712cde67d Upstream: pipe length and input_filter_init in buffered mode. Maxim Dounin <mdounin@mdounin.ru> parents: 4118 diff changeset	2695 p->length = -1;
b66712cde67d Upstream: pipe length and input_filter_init in buffered mode. Maxim Dounin <mdounin@mdounin.ru> parents: 4118 diff changeset	2696
b66712cde67d Upstream: pipe length and input_filter_init in buffered mode. Maxim Dounin <mdounin@mdounin.ru> parents: 4118 diff changeset	2697 if (u->input_filter_init
b66712cde67d Upstream: pipe length and input_filter_init in buffered mode. Maxim Dounin <mdounin@mdounin.ru> parents: 4118 diff changeset	2698 && u->input_filter_init(p->input_ctx) != NGX_OK)
b66712cde67d Upstream: pipe length and input_filter_init in buffered mode. Maxim Dounin <mdounin@mdounin.ru> parents: 4118 diff changeset	2699 {
5295 a489c31c9783 Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5294 diff changeset	2700 ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
4119 b66712cde67d Upstream: pipe length and input_filter_init in buffered mode. Maxim Dounin <mdounin@mdounin.ru> parents: 4118 diff changeset	2701 return;
b66712cde67d Upstream: pipe length and input_filter_init in buffered mode. Maxim Dounin <mdounin@mdounin.ru> parents: 4118 diff changeset	2702 }
b66712cde67d Upstream: pipe length and input_filter_init in buffered mode. Maxim Dounin <mdounin@mdounin.ru> parents: 4118 diff changeset	2703
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	2704 u->read_event_handler = ngx_http_upstream_process_upstream;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2705 r->write_event_handler = ngx_http_upstream_process_downstream;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2706
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2707 ngx_http_upstream_process_upstream(r, u);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2708 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2709
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2710
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	2711 static void
5072 7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2712 ngx_http_upstream_upgrade(ngx_http_request_t r, ngx_http_upstream_t u)
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2713 {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2714 int tcp_nodelay;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2715 ngx_connection_t *c;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2716 ngx_http_core_loc_conf_t *clcf;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2717
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2718 c = r->connection;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2719 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2720
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2721 /* TODO: prevent upgrade if not requested or not possible */
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2722
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2723 r->keepalive = 0;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2724 c->log->action = "proxying upgraded connection";
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2725
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2726 u->read_event_handler = ngx_http_upstream_upgraded_read_upstream;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2727 u->write_event_handler = ngx_http_upstream_upgraded_write_upstream;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2728 r->read_event_handler = ngx_http_upstream_upgraded_read_downstream;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2729 r->write_event_handler = ngx_http_upstream_upgraded_write_downstream;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2730
5142 afea5259e05c Upstream: fixed tcp_nodelay with connection upgrade (ticket #325). Maxim Dounin <mdounin@mdounin.ru> parents: 5132 diff changeset	2731 if (clcf->tcp_nodelay) {
5072 7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2732 tcp_nodelay = 1;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2733
5142 afea5259e05c Upstream: fixed tcp_nodelay with connection upgrade (ticket #325). Maxim Dounin <mdounin@mdounin.ru> parents: 5132 diff changeset	2734 if (c->tcp_nodelay == NGX_TCP_NODELAY_UNSET) {
afea5259e05c Upstream: fixed tcp_nodelay with connection upgrade (ticket #325). Maxim Dounin <mdounin@mdounin.ru> parents: 5132 diff changeset	2735 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "tcp_nodelay");
afea5259e05c Upstream: fixed tcp_nodelay with connection upgrade (ticket #325). Maxim Dounin <mdounin@mdounin.ru> parents: 5132 diff changeset	2736
afea5259e05c Upstream: fixed tcp_nodelay with connection upgrade (ticket #325). Maxim Dounin <mdounin@mdounin.ru> parents: 5132 diff changeset	2737 if (setsockopt(c->fd, IPPROTO_TCP, TCP_NODELAY,
afea5259e05c Upstream: fixed tcp_nodelay with connection upgrade (ticket #325). Maxim Dounin <mdounin@mdounin.ru> parents: 5132 diff changeset	2738 (const void *) &tcp_nodelay, sizeof(int)) == -1)
afea5259e05c Upstream: fixed tcp_nodelay with connection upgrade (ticket #325). Maxim Dounin <mdounin@mdounin.ru> parents: 5132 diff changeset	2739 {
afea5259e05c Upstream: fixed tcp_nodelay with connection upgrade (ticket #325). Maxim Dounin <mdounin@mdounin.ru> parents: 5132 diff changeset	2740 ngx_connection_error(c, ngx_socket_errno,
afea5259e05c Upstream: fixed tcp_nodelay with connection upgrade (ticket #325). Maxim Dounin <mdounin@mdounin.ru> parents: 5132 diff changeset	2741 "setsockopt(TCP_NODELAY) failed");
5295 a489c31c9783 Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5294 diff changeset	2742 ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
5142 afea5259e05c Upstream: fixed tcp_nodelay with connection upgrade (ticket #325). Maxim Dounin <mdounin@mdounin.ru> parents: 5132 diff changeset	2743 return;
afea5259e05c Upstream: fixed tcp_nodelay with connection upgrade (ticket #325). Maxim Dounin <mdounin@mdounin.ru> parents: 5132 diff changeset	2744 }
afea5259e05c Upstream: fixed tcp_nodelay with connection upgrade (ticket #325). Maxim Dounin <mdounin@mdounin.ru> parents: 5132 diff changeset	2745
afea5259e05c Upstream: fixed tcp_nodelay with connection upgrade (ticket #325). Maxim Dounin <mdounin@mdounin.ru> parents: 5132 diff changeset	2746 c->tcp_nodelay = NGX_TCP_NODELAY_SET;
5072 7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2747 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2748
5142 afea5259e05c Upstream: fixed tcp_nodelay with connection upgrade (ticket #325). Maxim Dounin <mdounin@mdounin.ru> parents: 5132 diff changeset	2749 if (u->peer.connection->tcp_nodelay == NGX_TCP_NODELAY_UNSET) {
afea5259e05c Upstream: fixed tcp_nodelay with connection upgrade (ticket #325). Maxim Dounin <mdounin@mdounin.ru> parents: 5132 diff changeset	2750 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, u->peer.connection->log, 0,
afea5259e05c Upstream: fixed tcp_nodelay with connection upgrade (ticket #325). Maxim Dounin <mdounin@mdounin.ru> parents: 5132 diff changeset	2751 "tcp_nodelay");
afea5259e05c Upstream: fixed tcp_nodelay with connection upgrade (ticket #325). Maxim Dounin <mdounin@mdounin.ru> parents: 5132 diff changeset	2752
afea5259e05c Upstream: fixed tcp_nodelay with connection upgrade (ticket #325). Maxim Dounin <mdounin@mdounin.ru> parents: 5132 diff changeset	2753 if (setsockopt(u->peer.connection->fd, IPPROTO_TCP, TCP_NODELAY,
afea5259e05c Upstream: fixed tcp_nodelay with connection upgrade (ticket #325). Maxim Dounin <mdounin@mdounin.ru> parents: 5132 diff changeset	2754 (const void *) &tcp_nodelay, sizeof(int)) == -1)
afea5259e05c Upstream: fixed tcp_nodelay with connection upgrade (ticket #325). Maxim Dounin <mdounin@mdounin.ru> parents: 5132 diff changeset	2755 {
afea5259e05c Upstream: fixed tcp_nodelay with connection upgrade (ticket #325). Maxim Dounin <mdounin@mdounin.ru> parents: 5132 diff changeset	2756 ngx_connection_error(u->peer.connection, ngx_socket_errno,
afea5259e05c Upstream: fixed tcp_nodelay with connection upgrade (ticket #325). Maxim Dounin <mdounin@mdounin.ru> parents: 5132 diff changeset	2757 "setsockopt(TCP_NODELAY) failed");
5295 a489c31c9783 Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5294 diff changeset	2758 ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
5142 afea5259e05c Upstream: fixed tcp_nodelay with connection upgrade (ticket #325). Maxim Dounin <mdounin@mdounin.ru> parents: 5132 diff changeset	2759 return;
afea5259e05c Upstream: fixed tcp_nodelay with connection upgrade (ticket #325). Maxim Dounin <mdounin@mdounin.ru> parents: 5132 diff changeset	2760 }
afea5259e05c Upstream: fixed tcp_nodelay with connection upgrade (ticket #325). Maxim Dounin <mdounin@mdounin.ru> parents: 5132 diff changeset	2761
afea5259e05c Upstream: fixed tcp_nodelay with connection upgrade (ticket #325). Maxim Dounin <mdounin@mdounin.ru> parents: 5132 diff changeset	2762 u->peer.connection->tcp_nodelay = NGX_TCP_NODELAY_SET;
5072 7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2763 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2764 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2765
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2766 if (ngx_http_send_special(r, NGX_HTTP_FLUSH) == NGX_ERROR) {
5295 a489c31c9783 Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5294 diff changeset	2767 ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
5072 7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2768 return;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2769 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2770
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2771 if (u->peer.connection->read->ready
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2772 \|\| u->buffer.pos != u->buffer.last)
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2773 {
5579 7586e7b2dbe9 Upstream: ngx_post_event() instead of upgraded call (ticket #503). Maxim Dounin <mdounin@mdounin.ru> parents: 5557 diff changeset	2774 ngx_post_event(c->read, &ngx_posted_events);
5073 52eb762c68a9 Proxy: fixed do_write handling in previous commit. Maxim Dounin <mdounin@mdounin.ru> parents: 5072 diff changeset	2775 ngx_http_upstream_process_upgraded(r, 1, 1);
5579 7586e7b2dbe9 Upstream: ngx_post_event() instead of upgraded call (ticket #503). Maxim Dounin <mdounin@mdounin.ru> parents: 5557 diff changeset	2776 return;
5072 7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2777 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2778
5532 17134d29782e Upstream: reading from a client after connection upgrade. Maxim Dounin <mdounin@mdounin.ru> parents: 5500 diff changeset	2779 ngx_http_upstream_process_upgraded(r, 0, 1);
5072 7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2780 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2781
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2782
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2783 static void
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2784 ngx_http_upstream_upgraded_read_downstream(ngx_http_request_t *r)
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2785 {
5073 52eb762c68a9 Proxy: fixed do_write handling in previous commit. Maxim Dounin <mdounin@mdounin.ru> parents: 5072 diff changeset	2786 ngx_http_upstream_process_upgraded(r, 0, 0);
5072 7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2787 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2788
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2789
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2790 static void
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2791 ngx_http_upstream_upgraded_write_downstream(ngx_http_request_t *r)
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2792 {
5073 52eb762c68a9 Proxy: fixed do_write handling in previous commit. Maxim Dounin <mdounin@mdounin.ru> parents: 5072 diff changeset	2793 ngx_http_upstream_process_upgraded(r, 1, 1);
5072 7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2794 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2795
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2796
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2797 static void
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2798 ngx_http_upstream_upgraded_read_upstream(ngx_http_request_t *r,
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2799 ngx_http_upstream_t *u)
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2800 {
5073 52eb762c68a9 Proxy: fixed do_write handling in previous commit. Maxim Dounin <mdounin@mdounin.ru> parents: 5072 diff changeset	2801 ngx_http_upstream_process_upgraded(r, 1, 0);
5072 7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2802 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2803
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2804
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2805 static void
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2806 ngx_http_upstream_upgraded_write_upstream(ngx_http_request_t *r,
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2807 ngx_http_upstream_t *u)
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2808 {
5073 52eb762c68a9 Proxy: fixed do_write handling in previous commit. Maxim Dounin <mdounin@mdounin.ru> parents: 5072 diff changeset	2809 ngx_http_upstream_process_upgraded(r, 0, 1);
5072 7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2810 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2811
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2812
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2813 static void
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2814 ngx_http_upstream_process_upgraded(ngx_http_request_t *r,
5073 52eb762c68a9 Proxy: fixed do_write handling in previous commit. Maxim Dounin <mdounin@mdounin.ru> parents: 5072 diff changeset	2815 ngx_uint_t from_upstream, ngx_uint_t do_write)
5072 7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2816 {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2817 size_t size;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2818 ssize_t n;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2819 ngx_buf_t *b;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2820 ngx_connection_t c, downstream, upstream, dst, *src;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2821 ngx_http_upstream_t *u;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2822 ngx_http_core_loc_conf_t *clcf;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2823
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2824 c = r->connection;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2825 u = r->upstream;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2826
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2827 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2828 "http upstream process upgraded, fu:%ui", from_upstream);
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2829
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2830 downstream = c;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2831 upstream = u->peer.connection;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2832
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2833 if (downstream->write->timedout) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2834 c->timedout = 1;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2835 ngx_connection_error(c, NGX_ETIMEDOUT, "client timed out");
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2836 ngx_http_upstream_finalize_request(r, u, NGX_HTTP_REQUEST_TIME_OUT);
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2837 return;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2838 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2839
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2840 if (upstream->read->timedout \|\| upstream->write->timedout) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2841 ngx_connection_error(c, NGX_ETIMEDOUT, "upstream timed out");
5296 1ccdda1f37f3 Upstream: NGX_HTTP_GATEWAY_TIME_OUT after upstream timeouts. Maxim Dounin <mdounin@mdounin.ru> parents: 5295 diff changeset	2842 ngx_http_upstream_finalize_request(r, u, NGX_HTTP_GATEWAY_TIME_OUT);
5072 7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2843 return;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2844 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2845
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2846 if (from_upstream) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2847 src = upstream;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2848 dst = downstream;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2849 b = &u->buffer;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2850
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2851 } else {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2852 src = downstream;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2853 dst = upstream;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2854 b = &u->from_client;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2855
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2856 if (r->header_in->last > r->header_in->pos) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2857 b = r->header_in;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2858 b->end = b->last;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2859 do_write = 1;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2860 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2861
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2862 if (b->start == NULL) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2863 b->start = ngx_palloc(r->pool, u->conf->buffer_size);
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2864 if (b->start == NULL) {
5295 a489c31c9783 Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5294 diff changeset	2865 ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
5072 7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2866 return;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2867 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2868
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2869 b->pos = b->start;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2870 b->last = b->start;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2871 b->end = b->start + u->conf->buffer_size;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2872 b->temporary = 1;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2873 b->tag = u->output.tag;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2874 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2875 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2876
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2877 for ( ;; ) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2878
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2879 if (do_write) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2880
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2881 size = b->last - b->pos;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2882
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2883 if (size && dst->write->ready) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2884
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2885 n = dst->send(dst, b->pos, size);
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2886
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2887 if (n == NGX_ERROR) {
5295 a489c31c9783 Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5294 diff changeset	2888 ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
5072 7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2889 return;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2890 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2891
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2892 if (n > 0) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2893 b->pos += n;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2894
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2895 if (b->pos == b->last) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2896 b->pos = b->start;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2897 b->last = b->start;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2898 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2899 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2900 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2901 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2902
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2903 size = b->end - b->last;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2904
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2905 if (size && src->read->ready) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2906
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2907 n = src->recv(src, b->last, size);
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2908
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2909 if (n == NGX_AGAIN \|\| n == 0) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2910 break;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2911 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2912
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2913 if (n > 0) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2914 do_write = 1;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2915 b->last += n;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2916
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2917 continue;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2918 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2919
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2920 if (n == NGX_ERROR) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2921 src->read->eof = 1;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2922 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2923 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2924
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2925 break;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2926 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2927
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2928 if ((upstream->read->eof && u->buffer.pos == u->buffer.last)
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2929 \|\| (downstream->read->eof && u->from_client.pos == u->from_client.last)
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2930 \|\| (downstream->read->eof && upstream->read->eof))
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2931 {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2932 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2933 "http upstream upgraded done");
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2934 ngx_http_upstream_finalize_request(r, u, 0);
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2935 return;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2936 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2937
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2938 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2939
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2940 if (ngx_handle_write_event(upstream->write, u->conf->send_lowat)
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2941 != NGX_OK)
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2942 {
5295 a489c31c9783 Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5294 diff changeset	2943 ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
5072 7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2944 return;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2945 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2946
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2947 if (upstream->write->active && !upstream->write->ready) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2948 ngx_add_timer(upstream->write, u->conf->send_timeout);
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2949
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2950 } else if (upstream->write->timer_set) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2951 ngx_del_timer(upstream->write);
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2952 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2953
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2954 if (ngx_handle_read_event(upstream->read, 0) != NGX_OK) {
5295 a489c31c9783 Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5294 diff changeset	2955 ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
5072 7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2956 return;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2957 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2958
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2959 if (upstream->read->active && !upstream->read->ready) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2960 ngx_add_timer(upstream->read, u->conf->read_timeout);
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2961
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2962 } else if (upstream->read->timer_set) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2963 ngx_del_timer(upstream->read);
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2964 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2965
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2966 if (ngx_handle_write_event(downstream->write, clcf->send_lowat)
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2967 != NGX_OK)
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2968 {
5295 a489c31c9783 Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5294 diff changeset	2969 ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
5072 7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2970 return;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2971 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2972
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2973 if (ngx_handle_read_event(downstream->read, 0) != NGX_OK) {
5295 a489c31c9783 Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5294 diff changeset	2974 ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
5072 7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2975 return;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2976 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2977
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2978 if (downstream->write->active && !downstream->write->ready) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2979 ngx_add_timer(downstream->write, clcf->send_timeout);
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2980
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2981 } else if (downstream->write->timer_set) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2982 ngx_del_timer(downstream->write);
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2983 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2984 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2985
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2986
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2987 static void
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2988 ngx_http_upstream_process_non_buffered_downstream(ngx_http_request_t *r)
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2989 {
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	2990 ngx_event_t *wev;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	2991 ngx_connection_t *c;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	2992 ngx_http_upstream_t *u;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	2993
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	2994 c = r->connection;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	2995 u = r->upstream;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	2996 wev = c->write;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	2997
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	2998 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	2999 "http upstream process non buffered downstream");
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3000
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3001 c->log->action = "sending to client";
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3002
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3003 if (wev->timedout) {
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3004 c->timedout = 1;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3005 ngx_connection_error(c, NGX_ETIMEDOUT, "client timed out");
3963 10fbb8f02a45 finalizing with rc == 0 in unbuffered proxy mode caused nginx to wait Igor Sysoev <igor@sysoev.ru> parents: 3944 diff changeset	3006 ngx_http_upstream_finalize_request(r, u, NGX_HTTP_REQUEST_TIME_OUT);
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3007 return;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3008 }
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3009
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3010 ngx_http_upstream_process_non_buffered_request(r, 1);
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3011 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3012
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3013
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3014 static void
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	3015 ngx_http_upstream_process_non_buffered_upstream(ngx_http_request_t *r,
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	3016 ngx_http_upstream_t *u)
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3017 {
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	3018 ngx_connection_t *c;
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	3019
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	3020 c = u->peer.connection;
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3021
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3022 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3023 "http upstream process non buffered upstream");
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3024
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3025 c->log->action = "reading upstream";
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3026
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	3027 if (c->read->timedout) {
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3028 ngx_connection_error(c, NGX_ETIMEDOUT, "upstream timed out");
5296 1ccdda1f37f3 Upstream: NGX_HTTP_GATEWAY_TIME_OUT after upstream timeouts. Maxim Dounin <mdounin@mdounin.ru> parents: 5295 diff changeset	3029 ngx_http_upstream_finalize_request(r, u, NGX_HTTP_GATEWAY_TIME_OUT);
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3030 return;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3031 }
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3032
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3033 ngx_http_upstream_process_non_buffered_request(r, 0);
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3034 }
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3035
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3036
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3037 static void
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3038 ngx_http_upstream_process_non_buffered_request(ngx_http_request_t *r,
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3039 ngx_uint_t do_write)
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3040 {
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3041 size_t size;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3042 ssize_t n;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3043 ngx_buf_t *b;
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	3044 ngx_int_t rc;
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3045 ngx_connection_t downstream, upstream;
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3046 ngx_http_upstream_t *u;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3047 ngx_http_core_loc_conf_t *clcf;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3048
756 d904b5cb3bba fix building introduced by previous commit Igor Sysoev <igor@sysoev.ru> parents: 755 diff changeset	3049 u = r->upstream;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3050 downstream = r->connection;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3051 upstream = u->peer.connection;
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3052
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3053 b = &u->buffer;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3054
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3055 do_write = do_write \|\| u->length == 0;
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3056
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3057 for ( ;; ) {
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3058
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3059 if (do_write) {
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3060
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3061 if (u->out_bufs \|\| u->busy_bufs) {
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	3062 rc = ngx_http_output_filter(r, u->out_bufs);
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	3063
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	3064 if (rc == NGX_ERROR) {
5295 a489c31c9783 Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5294 diff changeset	3065 ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3066 return;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3067 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3068
4114 5db098f97e0e API change: ngx_chain_update_chains() now requires pool. Maxim Dounin <mdounin@mdounin.ru> parents: 3976 diff changeset	3069 ngx_chain_update_chains(r->pool, &u->free_bufs, &u->busy_bufs,
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3070 &u->out_bufs, u->output.tag);
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3071 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3072
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3073 if (u->busy_bufs == NULL) {
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3074
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3075 if (u->length == 0
5301 a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3076 \|\| (upstream->read->eof && u->length == -1))
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3077 {
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3078 ngx_http_upstream_finalize_request(r, u, 0);
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3079 return;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3080 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3081
5301 a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3082 if (upstream->read->eof) {
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3083 ngx_log_error(NGX_LOG_ERR, upstream->log, 0,
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3084 "upstream prematurely closed connection");
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3085
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3086 ngx_http_upstream_finalize_request(r, u,
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3087 NGX_HTTP_BAD_GATEWAY);
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3088 return;
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3089 }
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3090
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3091 if (upstream->read->error) {
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3092 ngx_http_upstream_finalize_request(r, u,
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3093 NGX_HTTP_BAD_GATEWAY);
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3094 return;
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3095 }
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3096
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3097 b->pos = b->start;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3098 b->last = b->start;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3099 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3100 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3101
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3102 size = b->end - b->last;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3103
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3104 if (size && upstream->read->ready) {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3105
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3106 n = upstream->recv(upstream, b->last, size);
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3107
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3108 if (n == NGX_AGAIN) {
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3109 break;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3110 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3111
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3112 if (n > 0) {
2402 cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	3113 u->state->response_length += n;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	3114
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3115 if (u->input_filter(u->input_filter_ctx, n) == NGX_ERROR) {
5295 a489c31c9783 Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5294 diff changeset	3116 ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3117 return;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3118 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3119 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3120
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3121 do_write = 1;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3122
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3123 continue;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3124 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3125
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3126 break;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3127 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3128
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3129 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3130
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3131 if (downstream->data == r) {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3132 if (ngx_handle_write_event(downstream->write, clcf->send_lowat)
2377 87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	3133 != NGX_OK)
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	3134 {
5295 a489c31c9783 Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5294 diff changeset	3135 ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	3136 return;
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	3137 }
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3138 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3139
1063 e2a6ecc5a3ae a non-active client connection must not closed after send timeout Igor Sysoev <igor@sysoev.ru> parents: 1031 diff changeset	3140 if (downstream->write->active && !downstream->write->ready) {
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3141 ngx_add_timer(downstream->write, clcf->send_timeout);
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3142
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3143 } else if (downstream->write->timer_set) {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3144 ngx_del_timer(downstream->write);
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3145 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3146
2377 87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	3147 if (ngx_handle_read_event(upstream->read, 0) != NGX_OK) {
5295 a489c31c9783 Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5294 diff changeset	3148 ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3149 return;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3150 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3151
1063 e2a6ecc5a3ae a non-active client connection must not closed after send timeout Igor Sysoev <igor@sysoev.ru> parents: 1031 diff changeset	3152 if (upstream->read->active && !upstream->read->ready) {
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3153 ngx_add_timer(upstream->read, u->conf->read_timeout);
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3154
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3155 } else if (upstream->read->timer_set) {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3156 ngx_del_timer(upstream->read);
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3157 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3158 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3159
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3160
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3161 static ngx_int_t
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3162 ngx_http_upstream_non_buffered_filter_init(void *data)
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3163 {
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3164 return NGX_OK;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3165 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3166
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3167
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3168 static ngx_int_t
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3169 ngx_http_upstream_non_buffered_filter(void *data, ssize_t bytes)
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3170 {
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3171 ngx_http_request_t *r = data;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3172
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3173 ngx_buf_t *b;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3174 ngx_chain_t cl, *ll;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3175 ngx_http_upstream_t *u;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3176
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3177 u = r->upstream;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3178
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3179 for (cl = u->out_bufs, ll = &u->out_bufs; cl; cl = cl->next) {
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3180 ll = &cl->next;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3181 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3182
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3183 cl = ngx_chain_get_free_buf(r->pool, &u->free_bufs);
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3184 if (cl == NULL) {
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3185 return NGX_ERROR;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3186 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3187
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3188 *ll = cl;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3189
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3190 cl->buf->flush = 1;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3191 cl->buf->memory = 1;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3192
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3193 b = &u->buffer;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3194
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3195 cl->buf->pos = b->last;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3196 b->last += bytes;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3197 cl->buf->last = b->last;
1908 f2953601ed3c fix memory leak in long-lived non buffered connections Igor Sysoev <igor@sysoev.ru> parents: 1902 diff changeset	3198 cl->buf->tag = u->output.tag;
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3199
4118 dbddec65fdab Upstream: r->upstream->length type change to off_t. Maxim Dounin <mdounin@mdounin.ru> parents: 4117 diff changeset	3200 if (u->length == -1) {
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3201 return NGX_OK;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3202 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3203
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3204 u->length -= bytes;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3205
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3206 return NGX_OK;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3207 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3208
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3209
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3210 static void
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3211 ngx_http_upstream_process_downstream(ngx_http_request_t *r)
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3212 {
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3213 ngx_event_t *wev;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3214 ngx_connection_t *c;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3215 ngx_event_pipe_t *p;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3216 ngx_http_upstream_t *u;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3217
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3218 c = r->connection;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3219 u = r->upstream;
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3220 p = u->pipe;
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3221 wev = c->write;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3222
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3223 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3224 "http upstream process downstream");
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3225
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3226 c->log->action = "sending to client";
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3227
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3228 if (wev->timedout) {
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3229
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3230 if (wev->delayed) {
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3231
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3232 wev->timedout = 0;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3233 wev->delayed = 0;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3234
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3235 if (!wev->ready) {
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3236 ngx_add_timer(wev, p->send_timeout);
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3237
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3238 if (ngx_handle_write_event(wev, p->send_lowat) != NGX_OK) {
5295 a489c31c9783 Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5294 diff changeset	3239 ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3240 }
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3241
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3242 return;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3243 }
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3244
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3245 if (ngx_event_pipe(p, wev->write) == NGX_ABORT) {
5297 0ae9a2958886 Upstream: NGX_ERROR after pipe errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5296 diff changeset	3246 ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3247 return;
527 7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	3248 }
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3249
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3250 } else {
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3251 p->downstream_error = 1;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3252 c->timedout = 1;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3253 ngx_connection_error(c, NGX_ETIMEDOUT, "client timed out");
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3254 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3255
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3256 } else {
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3257
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3258 if (wev->delayed) {
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3259
527 7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	3260 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	3261 "http downstream delayed");
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	3262
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3263 if (ngx_handle_write_event(wev, p->send_lowat) != NGX_OK) {
5295 a489c31c9783 Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5294 diff changeset	3264 ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
527 7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	3265 }
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	3266
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	3267 return;
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	3268 }
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	3269
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3270 if (ngx_event_pipe(p, 1) == NGX_ABORT) {
5297 0ae9a2958886 Upstream: NGX_ERROR after pipe errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5296 diff changeset	3271 ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3272 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3273 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3274 }
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3275
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3276 ngx_http_upstream_process_request(r);
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3277 }
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3278
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3279
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3280 static void
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	3281 ngx_http_upstream_process_upstream(ngx_http_request_t *r,
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	3282 ngx_http_upstream_t *u)
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3283 {
5883 973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3284 ngx_event_t *rev;
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3285 ngx_event_pipe_t *p;
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	3286 ngx_connection_t *c;
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	3287
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	3288 c = u->peer.connection;
5883 973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3289 p = u->pipe;
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3290 rev = c->read;
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3291
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3292 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3293 "http upstream process upstream");
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3294
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3295 c->log->action = "reading upstream";
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3296
5883 973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3297 if (rev->timedout) {
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3298
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3299 if (rev->delayed) {
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3300
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3301 rev->timedout = 0;
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3302 rev->delayed = 0;
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3303
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3304 if (!rev->ready) {
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3305 ngx_add_timer(rev, p->read_timeout);
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3306
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3307 if (ngx_handle_read_event(rev, 0) != NGX_OK) {
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3308 ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3309 }
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3310
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3311 return;
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3312 }
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3313
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3314 if (ngx_event_pipe(p, 0) == NGX_ABORT) {
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3315 ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3316 return;
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3317 }
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3318
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3319 } else {
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3320 p->upstream_error = 1;
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3321 ngx_connection_error(c, NGX_ETIMEDOUT, "upstream timed out");
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3322 }
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3323
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3324 } else {
5883 973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3325
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3326 if (rev->delayed) {
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3327
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3328 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3329 "http upstream delayed");
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3330
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3331 if (ngx_handle_read_event(rev, 0) != NGX_OK) {
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3332 ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3333 }
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3334
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3335 return;
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3336 }
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3337
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3338 if (ngx_event_pipe(p, 0) == NGX_ABORT) {
5297 0ae9a2958886 Upstream: NGX_ERROR after pipe errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5296 diff changeset	3339 ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3340 return;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3341 }
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3342 }
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3343
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3344 ngx_http_upstream_process_request(r);
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3345 }
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3346
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3347
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3348 static void
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3349 ngx_http_upstream_process_request(ngx_http_request_t *r)
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3350 {
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3351 ngx_temp_file_t *tf;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3352 ngx_event_pipe_t *p;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3353 ngx_http_upstream_t *u;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3354
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3355 u = r->upstream;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3356 p = u->pipe;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3357
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3358 if (u->peer.connection) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3359
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3360 if (u->store) {
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3361
2463 4bc8ea10d62b fix fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 2445 diff changeset	3362 if (p->upstream_eof \|\| p->upstream_done) {
2445 3c6af1fb7586 proxy/fastcgi_store did not delete incomplete files Igor Sysoev <igor@sysoev.ru> parents: 2441 diff changeset	3363
5298 a7b2db9119e0 Upstream: replaced u->pipe->temp_file with p->temp_file. Maxim Dounin <mdounin@mdounin.ru> parents: 5297 diff changeset	3364 tf = p->temp_file;
4469 24c0dca04eb9 Fix for proxy_store leaving temporary files for subrequests. Maxim Dounin <mdounin@mdounin.ru> parents: 4464 diff changeset	3365
2445 3c6af1fb7586 proxy/fastcgi_store did not delete incomplete files Igor Sysoev <igor@sysoev.ru> parents: 2441 diff changeset	3366 if (u->headers_in.status_n == NGX_HTTP_OK
5299 b779728b180c Upstream: fixed store/cache of unfinished responses. Maxim Dounin <mdounin@mdounin.ru> parents: 5298 diff changeset	3367 && (p->upstream_done \|\| p->length == -1)
2445 3c6af1fb7586 proxy/fastcgi_store did not delete incomplete files Igor Sysoev <igor@sysoev.ru> parents: 2441 diff changeset	3368 && (u->headers_in.content_length_n == -1
5298 a7b2db9119e0 Upstream: replaced u->pipe->temp_file with p->temp_file. Maxim Dounin <mdounin@mdounin.ru> parents: 5297 diff changeset	3369 \|\| u->headers_in.content_length_n == tf->offset))
2445 3c6af1fb7586 proxy/fastcgi_store did not delete incomplete files Igor Sysoev <igor@sysoev.ru> parents: 2441 diff changeset	3370 {
3c6af1fb7586 proxy/fastcgi_store did not delete incomplete files Igor Sysoev <igor@sysoev.ru> parents: 2441 diff changeset	3371 ngx_http_upstream_store(r, u);
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3372 }
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3373 }
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3374 }
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3375
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	3376 #if (NGX_HTTP_CACHE)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	3377
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	3378 if (u->cacheable) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	3379
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	3380 if (p->upstream_done) {
5298 a7b2db9119e0 Upstream: replaced u->pipe->temp_file with p->temp_file. Maxim Dounin <mdounin@mdounin.ru> parents: 5297 diff changeset	3381 ngx_http_file_cache_update(r, p->temp_file);
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	3382
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	3383 } else if (p->upstream_eof) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	3384
5298 a7b2db9119e0 Upstream: replaced u->pipe->temp_file with p->temp_file. Maxim Dounin <mdounin@mdounin.ru> parents: 5297 diff changeset	3385 tf = p->temp_file;
4298 186f02886bed Upstream: don't cache unfinished responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4197 diff changeset	3386
5299 b779728b180c Upstream: fixed store/cache of unfinished responses. Maxim Dounin <mdounin@mdounin.ru> parents: 5298 diff changeset	3387 if (p->length == -1
b779728b180c Upstream: fixed store/cache of unfinished responses. Maxim Dounin <mdounin@mdounin.ru> parents: 5298 diff changeset	3388 && (u->headers_in.content_length_n == -1
b779728b180c Upstream: fixed store/cache of unfinished responses. Maxim Dounin <mdounin@mdounin.ru> parents: 5298 diff changeset	3389 \|\| u->headers_in.content_length_n
b779728b180c Upstream: fixed store/cache of unfinished responses. Maxim Dounin <mdounin@mdounin.ru> parents: 5298 diff changeset	3390 == tf->offset - (off_t) r->cache->body_start))
4298 186f02886bed Upstream: don't cache unfinished responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4197 diff changeset	3391 {
186f02886bed Upstream: don't cache unfinished responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4197 diff changeset	3392 ngx_http_file_cache_update(r, tf);
186f02886bed Upstream: don't cache unfinished responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4197 diff changeset	3393
186f02886bed Upstream: don't cache unfinished responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4197 diff changeset	3394 } else {
186f02886bed Upstream: don't cache unfinished responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4197 diff changeset	3395 ngx_http_file_cache_free(r->cache, tf);
186f02886bed Upstream: don't cache unfinished responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4197 diff changeset	3396 }
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	3397
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	3398 } else if (p->upstream_error) {
5298 a7b2db9119e0 Upstream: replaced u->pipe->temp_file with p->temp_file. Maxim Dounin <mdounin@mdounin.ru> parents: 5297 diff changeset	3399 ngx_http_file_cache_free(r->cache, p->temp_file);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3400 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3401 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3402
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3403 #endif
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3404
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3405 if (p->upstream_done \|\| p->upstream_eof \|\| p->upstream_error) {
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3406 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
483 621229427cba nginx-0.1.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	3407 "http upstream exit: %p", p->out);
5301 a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3408
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3409 if (p->upstream_done
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3410 \|\| (p->upstream_eof && p->length == -1))
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3411 {
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3412 ngx_http_upstream_finalize_request(r, u, 0);
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3413 return;
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3414 }
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3415
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3416 if (p->upstream_eof) {
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3417 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3418 "upstream prematurely closed connection");
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3419 }
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3420
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3421 ngx_http_upstream_finalize_request(r, u, NGX_HTTP_BAD_GATEWAY);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3422 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3423 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3424 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3425
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3426 if (p->downstream_error) {
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3427 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
483 621229427cba nginx-0.1.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	3428 "http upstream downstream error");
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3429
2757 9cc973b46af1 get a full response if the response is cacheable or storable even Igor Sysoev <igor@sysoev.ru> parents: 2708 diff changeset	3430 if (!u->cacheable && !u->store && u->peer.connection) {
5297 0ae9a2958886 Upstream: NGX_ERROR after pipe errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5296 diff changeset	3431 ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3432 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3433 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3434 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3435
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3436
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	3437 static void
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3438 ngx_http_upstream_store(ngx_http_request_t r, ngx_http_upstream_t u)
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3439 {
1947 94b03bbd328e use ngx_ext_rename_file() in proxy/fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1916 diff changeset	3440 size_t root;
94b03bbd328e use ngx_ext_rename_file() in proxy/fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1916 diff changeset	3441 time_t lm;
94b03bbd328e use ngx_ext_rename_file() in proxy/fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1916 diff changeset	3442 ngx_str_t path;
94b03bbd328e use ngx_ext_rename_file() in proxy/fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1916 diff changeset	3443 ngx_temp_file_t *tf;
94b03bbd328e use ngx_ext_rename_file() in proxy/fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1916 diff changeset	3444 ngx_ext_rename_file_t ext;
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3445
1777 edaea30d83be optimization Igor Sysoev <igor@sysoev.ru> parents: 1707 diff changeset	3446 tf = u->pipe->temp_file;
edaea30d83be optimization Igor Sysoev <igor@sysoev.ru> parents: 1707 diff changeset	3447
edaea30d83be optimization Igor Sysoev <igor@sysoev.ru> parents: 1707 diff changeset	3448 if (tf->file.fd == NGX_INVALID_FILE) {
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3449
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3450 /* create file for empty 200 response */
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3451
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3452 tf = ngx_pcalloc(r->pool, sizeof(ngx_temp_file_t));
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3453 if (tf == NULL) {
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3454 return;
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3455 }
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3456
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3457 tf->file.fd = NGX_INVALID_FILE;
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3458 tf->file.log = r->connection->log;
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3459 tf->path = u->conf->temp_path;
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3460 tf->pool = r->pool;
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3461 tf->persistent = 1;
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3462
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3463 if (ngx_create_temp_file(&tf->file, tf->path, tf->pool,
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3464 tf->persistent, tf->clean, tf->access)
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3465 != NGX_OK)
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3466 {
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3467 return;
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3468 }
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3469
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3470 u->pipe->temp_file = tf;
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3471 }
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3472
1947 94b03bbd328e use ngx_ext_rename_file() in proxy/fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1916 diff changeset	3473 ext.access = u->conf->store_access;
2394 dbe746851b31 use ngx_ext_rename_file() for single file MOVE Igor Sysoev <igor@sysoev.ru> parents: 2386 diff changeset	3474 ext.path_access = u->conf->store_access;
1947 94b03bbd328e use ngx_ext_rename_file() in proxy/fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1916 diff changeset	3475 ext.time = -1;
94b03bbd328e use ngx_ext_rename_file() in proxy/fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1916 diff changeset	3476 ext.create_path = 1;
94b03bbd328e use ngx_ext_rename_file() in proxy/fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1916 diff changeset	3477 ext.delete_file = 1;
94b03bbd328e use ngx_ext_rename_file() in proxy/fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1916 diff changeset	3478 ext.log = r->connection->log;
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3479
1705 d22095839d86 optimize r->upstream usage Igor Sysoev <igor@sysoev.ru> parents: 1701 diff changeset	3480 if (u->headers_in.last_modified) {
d22095839d86 optimize r->upstream usage Igor Sysoev <igor@sysoev.ru> parents: 1701 diff changeset	3481
1947 94b03bbd328e use ngx_ext_rename_file() in proxy/fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1916 diff changeset	3482 lm = ngx_http_parse_time(u->headers_in.last_modified->value.data,
94b03bbd328e use ngx_ext_rename_file() in proxy/fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1916 diff changeset	3483 u->headers_in.last_modified->value.len);
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3484
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3485 if (lm != NGX_ERROR) {
1947 94b03bbd328e use ngx_ext_rename_file() in proxy/fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1916 diff changeset	3486 ext.time = lm;
94b03bbd328e use ngx_ext_rename_file() in proxy/fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1916 diff changeset	3487 ext.fd = tf->file.fd;
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3488 }
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3489 }
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3490
1295 5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	3491 if (u->conf->store_lengths == NULL) {
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	3492
5770 9de5820bb3e0 Upstream: ngx_http_upstream_store() error handling fixes. Maxim Dounin <mdounin@mdounin.ru> parents: 5757 diff changeset	3493 if (ngx_http_map_uri_to_path(r, &path, &root, 0) == NULL) {
9de5820bb3e0 Upstream: ngx_http_upstream_store() error handling fixes. Maxim Dounin <mdounin@mdounin.ru> parents: 5757 diff changeset	3494 return;
9de5820bb3e0 Upstream: ngx_http_upstream_store() error handling fixes. Maxim Dounin <mdounin@mdounin.ru> parents: 5757 diff changeset	3495 }
1295 5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	3496
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	3497 } else {
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	3498 if (ngx_http_script_run(r, &path, u->conf->store_lengths->elts, 0,
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	3499 u->conf->store_values->elts)
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	3500 == NULL)
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	3501 {
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	3502 return;
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 }
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3505
3032 524ba56ba9f7 fix copy destination name length, introduced in r3025 Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	3506 path.len--;
524ba56ba9f7 fix copy destination name length, introduced in r3025 Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	3507
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3508 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
1947 94b03bbd328e use ngx_ext_rename_file() in proxy/fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1916 diff changeset	3509 "upstream stores \"%s\" to \"%s\"",
94b03bbd328e use ngx_ext_rename_file() in proxy/fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1916 diff changeset	3510 tf->file.name.data, path.data);
94b03bbd328e use ngx_ext_rename_file() in proxy/fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1916 diff changeset	3511
94b03bbd328e use ngx_ext_rename_file() in proxy/fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1916 diff changeset	3512 (void) ngx_ext_rename_file(&tf->file.name, &path, &ext);
5770 9de5820bb3e0 Upstream: ngx_http_upstream_store() error handling fixes. Maxim Dounin <mdounin@mdounin.ru> parents: 5757 diff changeset	3513
9de5820bb3e0 Upstream: ngx_http_upstream_store() error handling fixes. Maxim Dounin <mdounin@mdounin.ru> parents: 5757 diff changeset	3514 u->store = 0;
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3515 }
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3516
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3517
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3518 static void
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	3519 ngx_http_upstream_dummy_handler(ngx_http_request_t r, ngx_http_upstream_t u)
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3520 {
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	3521 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3522 "http upstream dummy handler");
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3523 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3524
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3525
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	3526 static void
31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	3527 ngx_http_upstream_next(ngx_http_request_t r, ngx_http_upstream_t u,
31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	3528 ngx_uint_t ft_type)
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3529 {
5832 d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5827 diff changeset	3530 ngx_msec_t timeout;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3531 ngx_uint_t status, state;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3532
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3533 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3534 "http next upstream, %xi", ft_type);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3535
5132 9bcf89ca78d2 Upstream: only call peer.free() if peer.get() selected a peer. Ruslan Ermilov <ru@nginx.com> parents: 5121 diff changeset	3536 if (u->peer.sockaddr) {
9bcf89ca78d2 Upstream: only call peer.free() if peer.get() selected a peer. Ruslan Ermilov <ru@nginx.com> parents: 5121 diff changeset	3537
5231 05c53652e7b4 Upstream: http_403 support in proxy_next_upstream (and friends). Maxim Dounin <mdounin@mdounin.ru> parents: 5217 diff changeset	3538 if (ft_type == NGX_HTTP_UPSTREAM_FT_HTTP_403
05c53652e7b4 Upstream: http_403 support in proxy_next_upstream (and friends). Maxim Dounin <mdounin@mdounin.ru> parents: 5217 diff changeset	3539 \|\| ft_type == NGX_HTTP_UPSTREAM_FT_HTTP_404)
05c53652e7b4 Upstream: http_403 support in proxy_next_upstream (and friends). Maxim Dounin <mdounin@mdounin.ru> parents: 5217 diff changeset	3540 {
5132 9bcf89ca78d2 Upstream: only call peer.free() if peer.get() selected a peer. Ruslan Ermilov <ru@nginx.com> parents: 5121 diff changeset	3541 state = NGX_PEER_NEXT;
5231 05c53652e7b4 Upstream: http_403 support in proxy_next_upstream (and friends). Maxim Dounin <mdounin@mdounin.ru> parents: 5217 diff changeset	3542
5132 9bcf89ca78d2 Upstream: only call peer.free() if peer.get() selected a peer. Ruslan Ermilov <ru@nginx.com> parents: 5121 diff changeset	3543 } else {
9bcf89ca78d2 Upstream: only call peer.free() if peer.get() selected a peer. Ruslan Ermilov <ru@nginx.com> parents: 5121 diff changeset	3544 state = NGX_PEER_FAILED;
9bcf89ca78d2 Upstream: only call peer.free() if peer.get() selected a peer. Ruslan Ermilov <ru@nginx.com> parents: 5121 diff changeset	3545 }
9bcf89ca78d2 Upstream: only call peer.free() if peer.get() selected a peer. Ruslan Ermilov <ru@nginx.com> parents: 5121 diff changeset	3546
1378 0be898896d1a backup upstream servers Igor Sysoev <igor@sysoev.ru> parents: 1340 diff changeset	3547 u->peer.free(&u->peer, u->peer.data, state);
5132 9bcf89ca78d2 Upstream: only call peer.free() if peer.get() selected a peer. Ruslan Ermilov <ru@nginx.com> parents: 5121 diff changeset	3548 u->peer.sockaddr = NULL;
1378 0be898896d1a backup upstream servers Igor Sysoev <igor@sysoev.ru> parents: 1340 diff changeset	3549 }
525 09b42134ac0c nginx-0.1.37-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 515 diff changeset	3550
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3551 if (ft_type == NGX_HTTP_UPSTREAM_FT_TIMEOUT) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3552 ngx_log_error(NGX_LOG_ERR, r->connection->log, NGX_ETIMEDOUT,
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3553 "upstream timed out");
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3554 }
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3555
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3556 if (u->peer.cached && ft_type == NGX_HTTP_UPSTREAM_FT_ERROR) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3557 status = 0;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3558
4115 70a45a504905 Workaround for cpu hog on errors with cached connections. Maxim Dounin <mdounin@mdounin.ru> parents: 4114 diff changeset	3559 /* TODO: inform balancer instead */
70a45a504905 Workaround for cpu hog on errors with cached connections. Maxim Dounin <mdounin@mdounin.ru> parents: 4114 diff changeset	3560
70a45a504905 Workaround for cpu hog on errors with cached connections. Maxim Dounin <mdounin@mdounin.ru> parents: 4114 diff changeset	3561 u->peer.tries++;
70a45a504905 Workaround for cpu hog on errors with cached connections. Maxim Dounin <mdounin@mdounin.ru> parents: 4114 diff changeset	3562
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3563 } else {
5757 c5ec6944de98 Style: add whitespace between control statement and parentheses. Piotr Sikora <piotr@cloudflare.com> parents: 5746 diff changeset	3564 switch (ft_type) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3565
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3566 case NGX_HTTP_UPSTREAM_FT_TIMEOUT:
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3567 status = NGX_HTTP_GATEWAY_TIME_OUT;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3568 break;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3569
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3570 case NGX_HTTP_UPSTREAM_FT_HTTP_500:
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3571 status = NGX_HTTP_INTERNAL_SERVER_ERROR;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3572 break;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3573
5231 05c53652e7b4 Upstream: http_403 support in proxy_next_upstream (and friends). Maxim Dounin <mdounin@mdounin.ru> parents: 5217 diff changeset	3574 case NGX_HTTP_UPSTREAM_FT_HTTP_403:
05c53652e7b4 Upstream: http_403 support in proxy_next_upstream (and friends). Maxim Dounin <mdounin@mdounin.ru> parents: 5217 diff changeset	3575 status = NGX_HTTP_FORBIDDEN;
05c53652e7b4 Upstream: http_403 support in proxy_next_upstream (and friends). Maxim Dounin <mdounin@mdounin.ru> parents: 5217 diff changeset	3576 break;
05c53652e7b4 Upstream: http_403 support in proxy_next_upstream (and friends). Maxim Dounin <mdounin@mdounin.ru> parents: 5217 diff changeset	3577
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3578 case NGX_HTTP_UPSTREAM_FT_HTTP_404:
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3579 status = NGX_HTTP_NOT_FOUND;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3580 break;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3581
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3582 /*
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3583 * NGX_HTTP_UPSTREAM_FT_BUSY_LOCK and NGX_HTTP_UPSTREAM_FT_MAX_WAITING
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3584 * never reach here
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3585 */
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3586
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3587 default:
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3588 status = NGX_HTTP_BAD_GATEWAY;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3589 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3590 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3591
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	3592 if (r->connection->error) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3593 ngx_http_upstream_finalize_request(r, u,
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3594 NGX_HTTP_CLIENT_CLOSED_REQUEST);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3595 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3596 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3597
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3598 if (status) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3599 u->state->status = status;
5832 d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5827 diff changeset	3600 timeout = u->conf->next_upstream_timeout;
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5827 diff changeset	3601
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5827 diff changeset	3602 if (u->peer.tries == 0
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5827 diff changeset	3603 \|\| !(u->conf->next_upstream & ft_type)
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5827 diff changeset	3604 \|\| (timeout && ngx_current_msec - u->peer.start_time >= timeout))
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5827 diff changeset	3605 {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3606 #if (NGX_HTTP_CACHE)
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3607
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	3608 if (u->cache_status == NGX_HTTP_CACHE_EXPIRED
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	3609 && (u->conf->cache_use_stale & ft_type))
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	3610 {
2805 60551422e150 reinit proxy/fastcgi header parser before ngx_http_upstream_cache_send() Igor Sysoev <igor@sysoev.ru> parents: 2804 diff changeset	3611 ngx_int_t rc;
60551422e150 reinit proxy/fastcgi header parser before ngx_http_upstream_cache_send() Igor Sysoev <igor@sysoev.ru> parents: 2804 diff changeset	3612
60551422e150 reinit proxy/fastcgi header parser before ngx_http_upstream_cache_send() Igor Sysoev <igor@sysoev.ru> parents: 2804 diff changeset	3613 rc = u->reinit_request(r);
60551422e150 reinit proxy/fastcgi header parser before ngx_http_upstream_cache_send() Igor Sysoev <igor@sysoev.ru> parents: 2804 diff changeset	3614
60551422e150 reinit proxy/fastcgi header parser before ngx_http_upstream_cache_send() Igor Sysoev <igor@sysoev.ru> parents: 2804 diff changeset	3615 if (rc == NGX_OK) {
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	3616 u->cache_status = NGX_HTTP_CACHE_STALE;
2805 60551422e150 reinit proxy/fastcgi header parser before ngx_http_upstream_cache_send() Igor Sysoev <igor@sysoev.ru> parents: 2804 diff changeset	3617 rc = ngx_http_upstream_cache_send(r, u);
60551422e150 reinit proxy/fastcgi header parser before ngx_http_upstream_cache_send() Igor Sysoev <igor@sysoev.ru> parents: 2804 diff changeset	3618 }
60551422e150 reinit proxy/fastcgi header parser before ngx_http_upstream_cache_send() Igor Sysoev <igor@sysoev.ru> parents: 2804 diff changeset	3619
60551422e150 reinit proxy/fastcgi header parser before ngx_http_upstream_cache_send() Igor Sysoev <igor@sysoev.ru> parents: 2804 diff changeset	3620 ngx_http_upstream_finalize_request(r, u, rc);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3621 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3622 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3623 #endif
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3624
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3625 ngx_http_upstream_finalize_request(r, u, status);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3626 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3627 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3628 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3629
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3630 if (u->peer.connection) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3631 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3632 "close http upstream connection: %d",
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3633 u->peer.connection->fd);
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3634 #if (NGX_HTTP_SSL)
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3635
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3636 if (u->peer.connection->ssl) {
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3637 u->peer.connection->ssl->no_wait_shutdown = 1;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3638 u->peer.connection->ssl->no_send_shutdown = 1;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3639
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3640 (void) ngx_ssl_shutdown(u->peer.connection);
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3641 }
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3642 #endif
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3643
4138 70e1ee2307f9 Fix of separate pool for upstream connections (r4117). Maxim Dounin <mdounin@mdounin.ru> parents: 4124 diff changeset	3644 if (u->peer.connection->pool) {
70e1ee2307f9 Fix of separate pool for upstream connections (r4117). Maxim Dounin <mdounin@mdounin.ru> parents: 4124 diff changeset	3645 ngx_destroy_pool(u->peer.connection->pool);
70e1ee2307f9 Fix of separate pool for upstream connections (r4117). Maxim Dounin <mdounin@mdounin.ru> parents: 4124 diff changeset	3646 }
70e1ee2307f9 Fix of separate pool for upstream connections (r4117). Maxim Dounin <mdounin@mdounin.ru> parents: 4124 diff changeset	3647
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3648 ngx_close_connection(u->peer.connection);
4143 114e3a7c3b8d Upstream: clearing of u->peer.connection on close. Maxim Dounin <mdounin@mdounin.ru> parents: 4138 diff changeset	3649 u->peer.connection = NULL;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3650 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3651
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3652 ngx_http_upstream_connect(r, u);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3653 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3654
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3655
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	3656 static void
569 174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	3657 ngx_http_upstream_cleanup(void *data)
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	3658 {
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	3659 ngx_http_request_t *r = data;
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	3660
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	3661 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	3662 "cleanup http upstream request: \"%V\"", &r->uri);
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	3663
5167 85ee9d858dcb Upstream: removed surplus ngx_resolve_name_done() call. Valentin Bartenev <vbart@nginx.com> parents: 5142 diff changeset	3664 ngx_http_upstream_finalize_request(r, r->upstream, NGX_DONE);
569 174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	3665 }
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	3666
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	3667
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	3668 static void
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	3669 ngx_http_upstream_finalize_request(ngx_http_request_t *r,
31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	3670 ngx_http_upstream_t *u, ngx_int_t rc)
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3671 {
5304 d3eab5e2df5f Upstream: no last buffer on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5303 diff changeset	3672 ngx_uint_t flush;
889 a9a7e4b1a72b the previous fix does not actually fix overflow Igor Sysoev <igor@sysoev.ru> parents: 888 diff changeset	3673 ngx_time_t *tp;
563 9c2f3ed7a247 nginx-0.3.3-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	3674
483 621229427cba nginx-0.1.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	3675 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
621229427cba nginx-0.1.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	3676 "finalize http upstream request: %i", rc);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3677
2413 89ac47d91fc1 fix segfault Igor Sysoev <igor@sysoev.ru> parents: 2402 diff changeset	3678 if (u->cleanup) {
89ac47d91fc1 fix segfault Igor Sysoev <igor@sysoev.ru> parents: 2402 diff changeset	3679 *u->cleanup = NULL;
3418 a076e1823737 delete u->cleanup mark, this fixes large values in $upstream_response_time, Igor Sysoev <igor@sysoev.ru> parents: 3401 diff changeset	3680 u->cleanup = NULL;
2413 89ac47d91fc1 fix segfault Igor Sysoev <igor@sysoev.ru> parents: 2402 diff changeset	3681 }
569 174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	3682
3169 b1013d768911 fix request counter in resolver handling, the bug was introduced in r3050 Igor Sysoev <igor@sysoev.ru> parents: 3161 diff changeset	3683 if (u->resolved && u->resolved->ctx) {
b1013d768911 fix request counter in resolver handling, the bug was introduced in r3050 Igor Sysoev <igor@sysoev.ru> parents: 3161 diff changeset	3684 ngx_resolve_name_done(u->resolved->ctx);
b1013d768911 fix request counter in resolver handling, the bug was introduced in r3050 Igor Sysoev <igor@sysoev.ru> parents: 3161 diff changeset	3685 u->resolved->ctx = NULL;
b1013d768911 fix request counter in resolver handling, the bug was introduced in r3050 Igor Sysoev <igor@sysoev.ru> parents: 3161 diff changeset	3686 }
b1013d768911 fix request counter in resolver handling, the bug was introduced in r3050 Igor Sysoev <igor@sysoev.ru> parents: 3161 diff changeset	3687
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	3688 if (u->state && u->state->response_sec) {
563 9c2f3ed7a247 nginx-0.3.3-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	3689 tp = ngx_timeofday();
889 a9a7e4b1a72b the previous fix does not actually fix overflow Igor Sysoev <igor@sysoev.ru> parents: 888 diff changeset	3690 u->state->response_sec = tp->sec - u->state->response_sec;
a9a7e4b1a72b the previous fix does not actually fix overflow Igor Sysoev <igor@sysoev.ru> parents: 888 diff changeset	3691 u->state->response_msec = tp->msec - u->state->response_msec;
2402 cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	3692
5169 f6bbe77794aa Upstream: fixed $upstream_response_length without buffering. Sergey Kandaurov <pluknet@nginx.com> parents: 5167 diff changeset	3693 if (u->pipe && u->pipe->read_length) {
2402 cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	3694 u->state->response_length = u->pipe->read_length;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	3695 }
563 9c2f3ed7a247 nginx-0.3.3-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	3696 }
9c2f3ed7a247 nginx-0.3.3-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	3697
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3698 u->finalize_request(r, rc);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3699
5132 9bcf89ca78d2 Upstream: only call peer.free() if peer.get() selected a peer. Ruslan Ermilov <ru@nginx.com> parents: 5121 diff changeset	3700 if (u->peer.free && u->peer.sockaddr) {
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	3701 u->peer.free(&u->peer, u->peer.data, 0);
5132 9bcf89ca78d2 Upstream: only call peer.free() if peer.get() selected a peer. Ruslan Ermilov <ru@nginx.com> parents: 5121 diff changeset	3702 u->peer.sockaddr = NULL;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	3703 }
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3704
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3705 if (u->peer.connection) {
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3706
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3707 #if (NGX_HTTP_SSL)
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3708
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3709 /* TODO: do not shutdown persistent connection */
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3710
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3711 if (u->peer.connection->ssl) {
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3712
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3713 /*
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3714 * We send the "close notify" shutdown alert to the upstream only
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3715 * and do not wait its "close notify" shutdown alert.
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3716 * It is acceptable according to the TLS standard.
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3717 */
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3718
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3719 u->peer.connection->ssl->no_wait_shutdown = 1;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3720
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3721 (void) ngx_ssl_shutdown(u->peer.connection);
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3722 }
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3723 #endif
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3724
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3725 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3726 "close http upstream connection: %d",
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3727 u->peer.connection->fd);
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3728
4138 70e1ee2307f9 Fix of separate pool for upstream connections (r4117). Maxim Dounin <mdounin@mdounin.ru> parents: 4124 diff changeset	3729 if (u->peer.connection->pool) {
70e1ee2307f9 Fix of separate pool for upstream connections (r4117). Maxim Dounin <mdounin@mdounin.ru> parents: 4124 diff changeset	3730 ngx_destroy_pool(u->peer.connection->pool);
70e1ee2307f9 Fix of separate pool for upstream connections (r4117). Maxim Dounin <mdounin@mdounin.ru> parents: 4124 diff changeset	3731 }
70e1ee2307f9 Fix of separate pool for upstream connections (r4117). Maxim Dounin <mdounin@mdounin.ru> parents: 4124 diff changeset	3732
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3733 ngx_close_connection(u->peer.connection);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3734 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3735
483 621229427cba nginx-0.1.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	3736 u->peer.connection = NULL;
621229427cba nginx-0.1.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	3737
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3738 if (u->pipe && u->pipe->temp_file) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3739 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3740 "http upstream temp fd: %d",
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3741 u->pipe->temp_file->file.fd);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3742 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3743
4469 24c0dca04eb9 Fix for proxy_store leaving temporary files for subrequests. Maxim Dounin <mdounin@mdounin.ru> parents: 4464 diff changeset	3744 if (u->store && u->pipe && u->pipe->temp_file
24c0dca04eb9 Fix for proxy_store leaving temporary files for subrequests. Maxim Dounin <mdounin@mdounin.ru> parents: 4464 diff changeset	3745 && u->pipe->temp_file->file.fd != NGX_INVALID_FILE)
24c0dca04eb9 Fix for proxy_store leaving temporary files for subrequests. Maxim Dounin <mdounin@mdounin.ru> parents: 4464 diff changeset	3746 {
24c0dca04eb9 Fix for proxy_store leaving temporary files for subrequests. Maxim Dounin <mdounin@mdounin.ru> parents: 4464 diff changeset	3747 if (ngx_delete_file(u->pipe->temp_file->file.name.data)
24c0dca04eb9 Fix for proxy_store leaving temporary files for subrequests. Maxim Dounin <mdounin@mdounin.ru> parents: 4464 diff changeset	3748 == NGX_FILE_ERROR)
24c0dca04eb9 Fix for proxy_store leaving temporary files for subrequests. Maxim Dounin <mdounin@mdounin.ru> parents: 4464 diff changeset	3749 {
24c0dca04eb9 Fix for proxy_store leaving temporary files for subrequests. Maxim Dounin <mdounin@mdounin.ru> parents: 4464 diff changeset	3750 ngx_log_error(NGX_LOG_CRIT, r->connection->log, ngx_errno,
24c0dca04eb9 Fix for proxy_store leaving temporary files for subrequests. Maxim Dounin <mdounin@mdounin.ru> parents: 4464 diff changeset	3751 ngx_delete_file_n " \"%s\" failed",
24c0dca04eb9 Fix for proxy_store leaving temporary files for subrequests. Maxim Dounin <mdounin@mdounin.ru> parents: 4464 diff changeset	3752 u->pipe->temp_file->file.name.data);
24c0dca04eb9 Fix for proxy_store leaving temporary files for subrequests. Maxim Dounin <mdounin@mdounin.ru> parents: 4464 diff changeset	3753 }
24c0dca04eb9 Fix for proxy_store leaving temporary files for subrequests. Maxim Dounin <mdounin@mdounin.ru> parents: 4464 diff changeset	3754 }
24c0dca04eb9 Fix for proxy_store leaving temporary files for subrequests. Maxim Dounin <mdounin@mdounin.ru> parents: 4464 diff changeset	3755
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	3756 #if (NGX_HTTP_CACHE)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	3757
3940 22f3e9197096 revert r3935 and fix "stalled cache updating" alert Igor Sysoev <igor@sysoev.ru> parents: 3934 diff changeset	3758 if (r->cache) {
22f3e9197096 revert r3935 and fix "stalled cache updating" alert Igor Sysoev <igor@sysoev.ru> parents: 3934 diff changeset	3759
22f3e9197096 revert r3935 and fix "stalled cache updating" alert Igor Sysoev <igor@sysoev.ru> parents: 3934 diff changeset	3760 if (u->cacheable) {
22f3e9197096 revert r3935 and fix "stalled cache updating" alert Igor Sysoev <igor@sysoev.ru> parents: 3934 diff changeset	3761
22f3e9197096 revert r3935 and fix "stalled cache updating" alert Igor Sysoev <igor@sysoev.ru> parents: 3934 diff changeset	3762 if (rc == NGX_HTTP_BAD_GATEWAY \|\| rc == NGX_HTTP_GATEWAY_TIME_OUT) {
22f3e9197096 revert r3935 and fix "stalled cache updating" alert Igor Sysoev <igor@sysoev.ru> parents: 3934 diff changeset	3763 time_t valid;
22f3e9197096 revert r3935 and fix "stalled cache updating" alert Igor Sysoev <igor@sysoev.ru> parents: 3934 diff changeset	3764
22f3e9197096 revert r3935 and fix "stalled cache updating" alert Igor Sysoev <igor@sysoev.ru> parents: 3934 diff changeset	3765 valid = ngx_http_file_cache_valid(u->conf->cache_valid, rc);
22f3e9197096 revert r3935 and fix "stalled cache updating" alert Igor Sysoev <igor@sysoev.ru> parents: 3934 diff changeset	3766
22f3e9197096 revert r3935 and fix "stalled cache updating" alert Igor Sysoev <igor@sysoev.ru> parents: 3934 diff changeset	3767 if (valid) {
22f3e9197096 revert r3935 and fix "stalled cache updating" alert Igor Sysoev <igor@sysoev.ru> parents: 3934 diff changeset	3768 r->cache->valid_sec = ngx_time() + valid;
22f3e9197096 revert r3935 and fix "stalled cache updating" alert Igor Sysoev <igor@sysoev.ru> parents: 3934 diff changeset	3769 r->cache->error = rc;
22f3e9197096 revert r3935 and fix "stalled cache updating" alert Igor Sysoev <igor@sysoev.ru> parents: 3934 diff changeset	3770 }
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	3771 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	3772 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	3773
3711 ce6ba077c270 several changes in cache cleanup handling: Igor Sysoev <igor@sysoev.ru> parents: 3709 diff changeset	3774 ngx_http_file_cache_free(r->cache, u->pipe->temp_file);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3775 }
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	3776
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3777 #endif
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3778
5392 f1caf7b8ae1d Upstream: subrequest_in_memory fix. Maxim Dounin <mdounin@mdounin.ru> parents: 5373 diff changeset	3779 if (r->subrequest_in_memory
f1caf7b8ae1d Upstream: subrequest_in_memory fix. Maxim Dounin <mdounin@mdounin.ru> parents: 5373 diff changeset	3780 && u->headers_in.status_n >= NGX_HTTP_SPECIAL_RESPONSE)
f1caf7b8ae1d Upstream: subrequest_in_memory fix. Maxim Dounin <mdounin@mdounin.ru> parents: 5373 diff changeset	3781 {
f1caf7b8ae1d Upstream: subrequest_in_memory fix. Maxim Dounin <mdounin@mdounin.ru> parents: 5373 diff changeset	3782 u->buffer.last = u->buffer.pos;
f1caf7b8ae1d Upstream: subrequest_in_memory fix. Maxim Dounin <mdounin@mdounin.ru> parents: 5373 diff changeset	3783 }
f1caf7b8ae1d Upstream: subrequest_in_memory fix. Maxim Dounin <mdounin@mdounin.ru> parents: 5373 diff changeset	3784
515 417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	3785 if (rc == NGX_DECLINED) {
417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	3786 return;
417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	3787 }
417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	3788
483 621229427cba nginx-0.1.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	3789 r->connection->log->action = "sending to client";
621229427cba nginx-0.1.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	3790
5303 0fb714d80909 Upstream: request finalization rework. Maxim Dounin <mdounin@mdounin.ru> parents: 5302 diff changeset	3791 if (!u->header_sent
0fb714d80909 Upstream: request finalization rework. Maxim Dounin <mdounin@mdounin.ru> parents: 5302 diff changeset	3792 \|\| rc == NGX_HTTP_REQUEST_TIME_OUT
0fb714d80909 Upstream: request finalization rework. Maxim Dounin <mdounin@mdounin.ru> parents: 5302 diff changeset	3793 \|\| rc == NGX_HTTP_CLIENT_CLOSED_REQUEST)
4151 3549db8ceaf2 Cache: fix for sending of stale responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4143 diff changeset	3794 {
5303 0fb714d80909 Upstream: request finalization rework. Maxim Dounin <mdounin@mdounin.ru> parents: 5302 diff changeset	3795 ngx_http_finalize_request(r, rc);
0fb714d80909 Upstream: request finalization rework. Maxim Dounin <mdounin@mdounin.ru> parents: 5302 diff changeset	3796 return;
0fb714d80909 Upstream: request finalization rework. Maxim Dounin <mdounin@mdounin.ru> parents: 5302 diff changeset	3797 }
0fb714d80909 Upstream: request finalization rework. Maxim Dounin <mdounin@mdounin.ru> parents: 5302 diff changeset	3798
5304 d3eab5e2df5f Upstream: no last buffer on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5303 diff changeset	3799 flush = 0;
d3eab5e2df5f Upstream: no last buffer on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5303 diff changeset	3800
d3eab5e2df5f Upstream: no last buffer on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5303 diff changeset	3801 if (rc >= NGX_HTTP_SPECIAL_RESPONSE) {
d3eab5e2df5f Upstream: no last buffer on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5303 diff changeset	3802 rc = NGX_ERROR;
d3eab5e2df5f Upstream: no last buffer on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5303 diff changeset	3803 flush = 1;
5303 0fb714d80909 Upstream: request finalization rework. Maxim Dounin <mdounin@mdounin.ru> parents: 5302 diff changeset	3804 }
0fb714d80909 Upstream: request finalization rework. Maxim Dounin <mdounin@mdounin.ru> parents: 5302 diff changeset	3805
0fb714d80909 Upstream: request finalization rework. Maxim Dounin <mdounin@mdounin.ru> parents: 5302 diff changeset	3806 if (r->header_only) {
0fb714d80909 Upstream: request finalization rework. Maxim Dounin <mdounin@mdounin.ru> parents: 5302 diff changeset	3807 ngx_http_finalize_request(r, rc);
0fb714d80909 Upstream: request finalization rework. Maxim Dounin <mdounin@mdounin.ru> parents: 5302 diff changeset	3808 return;
0fb714d80909 Upstream: request finalization rework. Maxim Dounin <mdounin@mdounin.ru> parents: 5302 diff changeset	3809 }
0fb714d80909 Upstream: request finalization rework. Maxim Dounin <mdounin@mdounin.ru> parents: 5302 diff changeset	3810
0fb714d80909 Upstream: request finalization rework. Maxim Dounin <mdounin@mdounin.ru> parents: 5302 diff changeset	3811 if (rc == 0) {
2377 87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	3812 rc = ngx_http_send_special(r, NGX_HTTP_LAST);
5304 d3eab5e2df5f Upstream: no last buffer on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5303 diff changeset	3813
d3eab5e2df5f Upstream: no last buffer on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5303 diff changeset	3814 } else if (flush) {
d3eab5e2df5f Upstream: no last buffer on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5303 diff changeset	3815 r->keepalive = 0;
d3eab5e2df5f Upstream: no last buffer on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5303 diff changeset	3816 rc = ngx_http_send_special(r, NGX_HTTP_FLUSH);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3817 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3818
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3819 ngx_http_finalize_request(r, rc);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3820 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3821
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3822
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3823 static ngx_int_t
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3824 ngx_http_upstream_process_header_line(ngx_http_request_t r, ngx_table_elt_t h,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3825 ngx_uint_t offset)
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3826 {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3827 ngx_table_elt_t **ph;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3828
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3829 ph = (ngx_table_elt_t *) ((char ) &r->upstream->headers_in + offset);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3830
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3831 if (*ph == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3832 *ph = h;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3833 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3834
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3835 return NGX_OK;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3836 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3837
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3838
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3839 static ngx_int_t
2669 5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3840 ngx_http_upstream_ignore_header_line(ngx_http_request_t r, ngx_table_elt_t h,
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3841 ngx_uint_t offset)
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3842 {
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3843 return NGX_OK;
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3844 }
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3845
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3846
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3847 static ngx_int_t
4117 103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	3848 ngx_http_upstream_process_content_length(ngx_http_request_t *r,
103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	3849 ngx_table_elt_t *h, ngx_uint_t offset)
103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	3850 {
103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	3851 ngx_http_upstream_t *u;
103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	3852
103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	3853 u = r->upstream;
103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	3854
103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	3855 u->headers_in.content_length = h;
103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	3856 u->headers_in.content_length_n = ngx_atoof(h->value.data, h->value.len);
103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	3857
103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	3858 return NGX_OK;
103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	3859 }
103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	3860
103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	3861
103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	3862 static ngx_int_t
5732 d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	3863 ngx_http_upstream_process_last_modified(ngx_http_request_t *r,
d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	3864 ngx_table_elt_t *h, ngx_uint_t offset)
d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	3865 {
d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	3866 ngx_http_upstream_t *u;
d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	3867
d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	3868 u = r->upstream;
d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	3869
d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	3870 u->headers_in.last_modified = h;
d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	3871
d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	3872 #if (NGX_HTTP_CACHE)
d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	3873
d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	3874 if (u->cacheable) {
d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	3875 u->headers_in.last_modified_time = ngx_http_parse_time(h->value.data,
d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	3876 h->value.len);
d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	3877 }
d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	3878
d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	3879 #endif
d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	3880
d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	3881 return NGX_OK;
d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	3882 }
d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	3883
d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	3884
d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	3885 static ngx_int_t
3669 1f5841b1fcd7 treat Set-Cookie as a header that forbids caching Igor Sysoev <igor@sysoev.ru> parents: 3667 diff changeset	3886 ngx_http_upstream_process_set_cookie(ngx_http_request_t r, ngx_table_elt_t h,
1f5841b1fcd7 treat Set-Cookie as a header that forbids caching Igor Sysoev <igor@sysoev.ru> parents: 3667 diff changeset	3887 ngx_uint_t offset)
1f5841b1fcd7 treat Set-Cookie as a header that forbids caching Igor Sysoev <igor@sysoev.ru> parents: 3667 diff changeset	3888 {
5677 3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	3889 ngx_array_t *pa;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	3890 ngx_table_elt_t **ph;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	3891 ngx_http_upstream_t *u;
3669 1f5841b1fcd7 treat Set-Cookie as a header that forbids caching Igor Sysoev <igor@sysoev.ru> parents: 3667 diff changeset	3892
1f5841b1fcd7 treat Set-Cookie as a header that forbids caching Igor Sysoev <igor@sysoev.ru> parents: 3667 diff changeset	3893 u = r->upstream;
5677 3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	3894 pa = &u->headers_in.cookies;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	3895
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	3896 if (pa->elts == NULL) {
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	3897 if (ngx_array_init(pa, r->pool, 1, sizeof(ngx_table_elt_t *)) != NGX_OK)
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	3898 {
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	3899 return NGX_ERROR;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	3900 }
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	3901 }
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	3902
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	3903 ph = ngx_array_push(pa);
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	3904 if (ph == NULL) {
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	3905 return NGX_ERROR;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	3906 }
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	3907
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	3908 *ph = h;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	3909
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	3910 #if (NGX_HTTP_CACHE)
3669 1f5841b1fcd7 treat Set-Cookie as a header that forbids caching Igor Sysoev <igor@sysoev.ru> parents: 3667 diff changeset	3911 if (!(u->conf->ignore_headers & NGX_HTTP_UPSTREAM_IGN_SET_COOKIE)) {
1f5841b1fcd7 treat Set-Cookie as a header that forbids caching Igor Sysoev <igor@sysoev.ru> parents: 3667 diff changeset	3912 u->cacheable = 0;
1f5841b1fcd7 treat Set-Cookie as a header that forbids caching Igor Sysoev <igor@sysoev.ru> parents: 3667 diff changeset	3913 }
1f5841b1fcd7 treat Set-Cookie as a header that forbids caching Igor Sysoev <igor@sysoev.ru> parents: 3667 diff changeset	3914 #endif
1f5841b1fcd7 treat Set-Cookie as a header that forbids caching Igor Sysoev <igor@sysoev.ru> parents: 3667 diff changeset	3915
1f5841b1fcd7 treat Set-Cookie as a header that forbids caching Igor Sysoev <igor@sysoev.ru> parents: 3667 diff changeset	3916 return NGX_OK;
1f5841b1fcd7 treat Set-Cookie as a header that forbids caching Igor Sysoev <igor@sysoev.ru> parents: 3667 diff changeset	3917 }
1f5841b1fcd7 treat Set-Cookie as a header that forbids caching Igor Sysoev <igor@sysoev.ru> parents: 3667 diff changeset	3918
1f5841b1fcd7 treat Set-Cookie as a header that forbids caching Igor Sysoev <igor@sysoev.ru> parents: 3667 diff changeset	3919
1f5841b1fcd7 treat Set-Cookie as a header that forbids caching Igor Sysoev <igor@sysoev.ru> parents: 3667 diff changeset	3920 static ngx_int_t
2669 5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3921 ngx_http_upstream_process_cache_control(ngx_http_request_t *r,
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3922 ngx_table_elt_t *h, ngx_uint_t offset)
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3923 {
2786 4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	3924 ngx_array_t *pa;
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	3925 ngx_table_elt_t **ph;
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	3926 ngx_http_upstream_t *u;
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	3927
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	3928 u = r->upstream;
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	3929 pa = &u->headers_in.cache_control;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3930
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3931 if (pa->elts == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3932 if (ngx_array_init(pa, r->pool, 2, sizeof(ngx_table_elt_t *)) != NGX_OK)
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3933 {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3934 return NGX_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3935 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3936 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3937
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3938 ph = ngx_array_push(pa);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3939 if (ph == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3940 return NGX_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3941 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3942
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3943 *ph = h;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3944
2708 4c658be4ab63 fix building --without-http-cache, introduced in r2664 and later Igor Sysoev <igor@sysoev.ru> parents: 2704 diff changeset	3945 #if (NGX_HTTP_CACHE)
4c658be4ab63 fix building --without-http-cache, introduced in r2664 and later Igor Sysoev <igor@sysoev.ru> parents: 2704 diff changeset	3946 {
5911 88d55e5934f7 Cache: add support for Cache-Control's s-maxage response directive. Piotr Sikora <piotr@cloudflare.com> parents: 5905 diff changeset	3947 u_char p, start, *last;
2708 4c658be4ab63 fix building --without-http-cache, introduced in r2664 and later Igor Sysoev <igor@sysoev.ru> parents: 2704 diff changeset	3948 ngx_int_t n;
4c658be4ab63 fix building --without-http-cache, introduced in r2664 and later Igor Sysoev <igor@sysoev.ru> parents: 2704 diff changeset	3949
2786 4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	3950 if (u->conf->ignore_headers & NGX_HTTP_UPSTREAM_IGN_CACHE_CONTROL) {
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	3951 return NGX_OK;
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	3952 }
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	3953
2669 5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3954 if (r->cache == NULL) {
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3955 return NGX_OK;
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3956 }
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3957
5500 6a3ab6fdd70f Upstream: Cache-Control preferred over Expires. Maxim Dounin <mdounin@mdounin.ru> parents: 5489 diff changeset	3958 if (r->cache->valid_sec != 0 && u->headers_in.x_accel_expires != NULL) {
2669 5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3959 return NGX_OK;
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3960 }
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3961
5911 88d55e5934f7 Cache: add support for Cache-Control's s-maxage response directive. Piotr Sikora <piotr@cloudflare.com> parents: 5905 diff changeset	3962 start = h->value.data;
88d55e5934f7 Cache: add support for Cache-Control's s-maxage response directive. Piotr Sikora <piotr@cloudflare.com> parents: 5905 diff changeset	3963 last = start + h->value.len;
88d55e5934f7 Cache: add support for Cache-Control's s-maxage response directive. Piotr Sikora <piotr@cloudflare.com> parents: 5905 diff changeset	3964
88d55e5934f7 Cache: add support for Cache-Control's s-maxage response directive. Piotr Sikora <piotr@cloudflare.com> parents: 5905 diff changeset	3965 if (ngx_strlcasestrn(start, last, (u_char *) "no-cache", 8 - 1) != NULL
88d55e5934f7 Cache: add support for Cache-Control's s-maxage response directive. Piotr Sikora <piotr@cloudflare.com> parents: 5905 diff changeset	3966 \|\| ngx_strlcasestrn(start, last, (u_char *) "no-store", 8 - 1) != NULL
88d55e5934f7 Cache: add support for Cache-Control's s-maxage response directive. Piotr Sikora <piotr@cloudflare.com> parents: 5905 diff changeset	3967 \|\| ngx_strlcasestrn(start, last, (u_char *) "private", 7 - 1) != NULL)
2669 5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3968 {
2786 4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	3969 u->cacheable = 0;
2669 5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3970 return NGX_OK;
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3971 }
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3972
5911 88d55e5934f7 Cache: add support for Cache-Control's s-maxage response directive. Piotr Sikora <piotr@cloudflare.com> parents: 5905 diff changeset	3973 p = ngx_strlcasestrn(start, last, (u_char *) "s-maxage=", 9 - 1);
88d55e5934f7 Cache: add support for Cache-Control's s-maxage response directive. Piotr Sikora <piotr@cloudflare.com> parents: 5905 diff changeset	3974 offset = 9;
88d55e5934f7 Cache: add support for Cache-Control's s-maxage response directive. Piotr Sikora <piotr@cloudflare.com> parents: 5905 diff changeset	3975
88d55e5934f7 Cache: add support for Cache-Control's s-maxage response directive. Piotr Sikora <piotr@cloudflare.com> parents: 5905 diff changeset	3976 if (p == NULL) {
88d55e5934f7 Cache: add support for Cache-Control's s-maxage response directive. Piotr Sikora <piotr@cloudflare.com> parents: 5905 diff changeset	3977 p = ngx_strlcasestrn(start, last, (u_char *) "max-age=", 8 - 1);
88d55e5934f7 Cache: add support for Cache-Control's s-maxage response directive. Piotr Sikora <piotr@cloudflare.com> parents: 5905 diff changeset	3978 offset = 8;
88d55e5934f7 Cache: add support for Cache-Control's s-maxage response directive. Piotr Sikora <piotr@cloudflare.com> parents: 5905 diff changeset	3979 }
2669 5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3980
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3981 if (p == NULL) {
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3982 return NGX_OK;
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3983 }
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3984
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3985 n = 0;
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3986
5911 88d55e5934f7 Cache: add support for Cache-Control's s-maxage response directive. Piotr Sikora <piotr@cloudflare.com> parents: 5905 diff changeset	3987 for (p += offset; p < last; p++) {
3198 48bfb7dc981b test comma separator in "Cache-Control" Igor Sysoev <igor@sysoev.ru> parents: 3195 diff changeset	3988 if (p == ',' \|\| p == ';' \|\| *p == ' ') {
2669 5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3989 break;
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3990 }
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3991
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3992 if (p >= '0' && p <= '9') {
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3993 n = n * 10 + *p - '0';
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3994 continue;
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3995 }
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3996
2786 4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	3997 u->cacheable = 0;
2669 5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3998 return NGX_OK;
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3999 }
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	4000
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	4001 if (n == 0) {
2786 4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	4002 u->cacheable = 0;
2669 5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	4003 return NGX_OK;
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	4004 }
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	4005
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	4006 r->cache->valid_sec = ngx_time() + n;
2708 4c658be4ab63 fix building --without-http-cache, introduced in r2664 and later Igor Sysoev <igor@sysoev.ru> parents: 2704 diff changeset	4007 }
4c658be4ab63 fix building --without-http-cache, introduced in r2664 and later Igor Sysoev <igor@sysoev.ru> parents: 2704 diff changeset	4008 #endif
4c658be4ab63 fix building --without-http-cache, introduced in r2664 and later Igor Sysoev <igor@sysoev.ru> parents: 2704 diff changeset	4009
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4010 return NGX_OK;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4011 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4012
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4013
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4014 static ngx_int_t
2666 81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	4015 ngx_http_upstream_process_expires(ngx_http_request_t r, ngx_table_elt_t h,
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	4016 ngx_uint_t offset)
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	4017 {
2786 4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	4018 ngx_http_upstream_t *u;
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	4019
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	4020 u = r->upstream;
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	4021 u->headers_in.expires = h;
2708 4c658be4ab63 fix building --without-http-cache, introduced in r2664 and later Igor Sysoev <igor@sysoev.ru> parents: 2704 diff changeset	4022
4c658be4ab63 fix building --without-http-cache, introduced in r2664 and later Igor Sysoev <igor@sysoev.ru> parents: 2704 diff changeset	4023 #if (NGX_HTTP_CACHE)
4c658be4ab63 fix building --without-http-cache, introduced in r2664 and later Igor Sysoev <igor@sysoev.ru> parents: 2704 diff changeset	4024 {
2666 81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	4025 time_t expires;
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	4026
2786 4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	4027 if (u->conf->ignore_headers & NGX_HTTP_UPSTREAM_IGN_EXPIRES) {
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	4028 return NGX_OK;
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	4029 }
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	4030
2666 81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	4031 if (r->cache == NULL) {
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	4032 return NGX_OK;
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	4033 }
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	4034
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	4035 if (r->cache->valid_sec != 0) {
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	4036 return NGX_OK;
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	4037 }
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	4038
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	4039 expires = ngx_http_parse_time(h->value.data, h->value.len);
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	4040
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	4041 if (expires == NGX_ERROR \|\| expires < ngx_time()) {
2786 4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	4042 u->cacheable = 0;
2666 81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	4043 return NGX_OK;
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	4044 }
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	4045
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	4046 r->cache->valid_sec = expires;
2708 4c658be4ab63 fix building --without-http-cache, introduced in r2664 and later Igor Sysoev <igor@sysoev.ru> parents: 2704 diff changeset	4047 }
4c658be4ab63 fix building --without-http-cache, introduced in r2664 and later Igor Sysoev <igor@sysoev.ru> parents: 2704 diff changeset	4048 #endif
2666 81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	4049
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	4050 return NGX_OK;
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	4051 }
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	4052
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	4053
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	4054 static ngx_int_t
2663 09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	4055 ngx_http_upstream_process_accel_expires(ngx_http_request_t *r,
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	4056 ngx_table_elt_t *h, ngx_uint_t offset)
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	4057 {
2786 4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	4058 ngx_http_upstream_t *u;
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	4059
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	4060 u = r->upstream;
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	4061 u->headers_in.x_accel_expires = h;
2708 4c658be4ab63 fix building --without-http-cache, introduced in r2664 and later Igor Sysoev <igor@sysoev.ru> parents: 2704 diff changeset	4062
4c658be4ab63 fix building --without-http-cache, introduced in r2664 and later Igor Sysoev <igor@sysoev.ru> parents: 2704 diff changeset	4063 #if (NGX_HTTP_CACHE)
4c658be4ab63 fix building --without-http-cache, introduced in r2664 and later Igor Sysoev <igor@sysoev.ru> parents: 2704 diff changeset	4064 {
2663 09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	4065 u_char *p;
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	4066 size_t len;
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	4067 ngx_int_t n;
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	4068
2786 4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	4069 if (u->conf->ignore_headers & NGX_HTTP_UPSTREAM_IGN_XA_EXPIRES) {
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	4070 return NGX_OK;
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	4071 }
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	4072
2663 09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	4073 if (r->cache == NULL) {
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	4074 return NGX_OK;
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	4075 }
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	4076
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	4077 len = h->value.len;
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	4078 p = h->value.data;
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	4079
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	4080 if (p[0] != '@') {
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	4081 n = ngx_atoi(p, len);
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	4082
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	4083 switch (n) {
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	4084 case 0:
2786 4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	4085 u->cacheable = 0;
4546 4988fa232629 For the sake of case/switch code readability, 'fall through' Maxim Konovalov <maxim@nginx.com> parents: 4499 diff changeset	4086 /* fall through */
4988fa232629 For the sake of case/switch code readability, 'fall through' Maxim Konovalov <maxim@nginx.com> parents: 4499 diff changeset	4087
2663 09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	4088 case NGX_ERROR:
2667 c1ac00c2bc75 update r2664 Igor Sysoev <igor@sysoev.ru> parents: 2666 diff changeset	4089 return NGX_OK;
2663 09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	4090
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	4091 default:
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	4092 r->cache->valid_sec = ngx_time() + n;
2667 c1ac00c2bc75 update r2664 Igor Sysoev <igor@sysoev.ru> parents: 2666 diff changeset	4093 return NGX_OK;
2663 09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	4094 }
2667 c1ac00c2bc75 update r2664 Igor Sysoev <igor@sysoev.ru> parents: 2666 diff changeset	4095 }
c1ac00c2bc75 update r2664 Igor Sysoev <igor@sysoev.ru> parents: 2666 diff changeset	4096
c1ac00c2bc75 update r2664 Igor Sysoev <igor@sysoev.ru> parents: 2666 diff changeset	4097 p++;
c1ac00c2bc75 update r2664 Igor Sysoev <igor@sysoev.ru> parents: 2666 diff changeset	4098 len--;
c1ac00c2bc75 update r2664 Igor Sysoev <igor@sysoev.ru> parents: 2666 diff changeset	4099
c1ac00c2bc75 update r2664 Igor Sysoev <igor@sysoev.ru> parents: 2666 diff changeset	4100 n = ngx_atoi(p, len);
c1ac00c2bc75 update r2664 Igor Sysoev <igor@sysoev.ru> parents: 2666 diff changeset	4101
c1ac00c2bc75 update r2664 Igor Sysoev <igor@sysoev.ru> parents: 2666 diff changeset	4102 if (n != NGX_ERROR) {
c1ac00c2bc75 update r2664 Igor Sysoev <igor@sysoev.ru> parents: 2666 diff changeset	4103 r->cache->valid_sec = n;
2663 09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	4104 }
2708 4c658be4ab63 fix building --without-http-cache, introduced in r2664 and later Igor Sysoev <igor@sysoev.ru> parents: 2704 diff changeset	4105 }
4c658be4ab63 fix building --without-http-cache, introduced in r2664 and later Igor Sysoev <igor@sysoev.ru> parents: 2704 diff changeset	4106 #endif
2663 09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	4107
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	4108 return NGX_OK;
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	4109 }
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	4110
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	4111
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	4112 static ngx_int_t
527 7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	4113 ngx_http_upstream_process_limit_rate(ngx_http_request_t r, ngx_table_elt_t h,
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	4114 ngx_uint_t offset)
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	4115 {
4197 cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	4116 ngx_int_t n;
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	4117 ngx_http_upstream_t *u;
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	4118
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	4119 u = r->upstream;
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	4120 u->headers_in.x_accel_limit_rate = h;
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	4121
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	4122 if (u->conf->ignore_headers & NGX_HTTP_UPSTREAM_IGN_XA_LIMIT_RATE) {
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	4123 return NGX_OK;
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	4124 }
527 7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	4125
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	4126 n = ngx_atoi(h->value.data, h->value.len);
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	4127
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	4128 if (n != NGX_ERROR) {
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	4129 r->limit_rate = (size_t) n;
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	4130 }
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	4131
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	4132 return NGX_OK;
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	4133 }
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	4134
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	4135
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	4136 static ngx_int_t
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4137 ngx_http_upstream_process_buffering(ngx_http_request_t r, ngx_table_elt_t h,
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4138 ngx_uint_t offset)
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4139 {
4197 cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	4140 u_char c0, c1, c2;
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	4141 ngx_http_upstream_t *u;
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	4142
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	4143 u = r->upstream;
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	4144
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	4145 if (u->conf->ignore_headers & NGX_HTTP_UPSTREAM_IGN_XA_BUFFERING) {
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	4146 return NGX_OK;
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	4147 }
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	4148
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	4149 if (u->conf->change_buffering) {
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4150
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4151 if (h->value.len == 2) {
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4152 c0 = ngx_tolower(h->value.data[0]);
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4153 c1 = ngx_tolower(h->value.data[1]);
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4154
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4155 if (c0 == 'n' && c1 == 'o') {
4197 cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	4156 u->buffering = 0;
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4157 }
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4158
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4159 } else if (h->value.len == 3) {
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4160 c0 = ngx_tolower(h->value.data[0]);
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4161 c1 = ngx_tolower(h->value.data[1]);
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4162 c2 = ngx_tolower(h->value.data[2]);
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4163
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4164 if (c0 == 'y' && c1 == 'e' && c2 == 's') {
4197 cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	4165 u->buffering = 1;
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4166 }
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4167 }
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4168 }
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4169
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4170 return NGX_OK;
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4171 }
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4172
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4173
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4174 static ngx_int_t
657 400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4175 ngx_http_upstream_process_charset(ngx_http_request_t r, ngx_table_elt_t h,
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4176 ngx_uint_t offset)
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4177 {
4197 cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	4178 if (r->upstream->conf->ignore_headers & NGX_HTTP_UPSTREAM_IGN_XA_CHARSET) {
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	4179 return NGX_OK;
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	4180 }
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	4181
657 400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4182 r->headers_out.override_charset = &h->value;
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4183
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4184 return NGX_OK;
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4185 }
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4186
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4187
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4188 static ngx_int_t
4124 0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	4189 ngx_http_upstream_process_connection(ngx_http_request_t r, ngx_table_elt_t h,
0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	4190 ngx_uint_t offset)
0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	4191 {
0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	4192 r->upstream->headers_in.connection = h;
0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	4193
0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	4194 if (ngx_strlcasestrn(h->value.data, h->value.data + h->value.len,
0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	4195 (u_char *) "close", 5 - 1)
0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	4196 != NULL)
0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	4197 {
0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	4198 r->upstream->headers_in.connection_close = 1;
0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	4199 }
0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	4200
0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	4201 return NGX_OK;
0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	4202 }
0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	4203
0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	4204
0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	4205 static ngx_int_t
4123 0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	4206 ngx_http_upstream_process_transfer_encoding(ngx_http_request_t *r,
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	4207 ngx_table_elt_t *h, ngx_uint_t offset)
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	4208 {
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	4209 r->upstream->headers_in.transfer_encoding = h;
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	4210
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	4211 if (ngx_strlcasestrn(h->value.data, h->value.data + h->value.len,
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	4212 (u_char *) "chunked", 7 - 1)
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	4213 != NULL)
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	4214 {
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	4215 r->upstream->headers_in.chunked = 1;
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	4216 }
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	4217
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	4218 return NGX_OK;
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	4219 }
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	4220
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	4221
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	4222 static ngx_int_t
5877 60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	4223 ngx_http_upstream_process_vary(ngx_http_request_t *r,
60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	4224 ngx_table_elt_t *h, ngx_uint_t offset)
60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	4225 {
60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	4226 ngx_http_upstream_t *u;
60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	4227
60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	4228 u = r->upstream;
60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	4229 u->headers_in.vary = h;
60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	4230
60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	4231 #if (NGX_HTTP_CACHE)
60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	4232
60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	4233 if (u->conf->ignore_headers & NGX_HTTP_UPSTREAM_IGN_VARY) {
60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	4234 return NGX_OK;
60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	4235 }
60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	4236
5878 2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5877 diff changeset	4237 if (r->cache == NULL) {
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5877 diff changeset	4238 return NGX_OK;
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5877 diff changeset	4239 }
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5877 diff changeset	4240
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5877 diff changeset	4241 if (h->value.len > NGX_HTTP_CACHE_VARY_LEN
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5877 diff changeset	4242 \|\| (h->value.len == 1 && h->value.data[0] == '*'))
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5877 diff changeset	4243 {
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5877 diff changeset	4244 u->cacheable = 0;
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5877 diff changeset	4245 }
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5877 diff changeset	4246
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5877 diff changeset	4247 r->cache->vary = h->value;
5877 60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	4248
60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	4249 #endif
60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	4250
60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	4251 return NGX_OK;
60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	4252 }
60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	4253
60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	4254
60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	4255 static ngx_int_t
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4256 ngx_http_upstream_copy_header_line(ngx_http_request_t r, ngx_table_elt_t h,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4257 ngx_uint_t offset)
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4258 {
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4259 ngx_table_elt_t ho, *ph;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4260
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4261 ho = ngx_list_push(&r->headers_out.headers);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4262 if (ho == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4263 return NGX_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4264 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4265
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4266 ho = h;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4267
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4268 if (offset) {
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4269 ph = (ngx_table_elt_t *) ((char ) &r->headers_out + offset);
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4270 *ph = ho;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4271 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4272
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4273 return NGX_OK;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4274 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4275
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4276
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4277 static ngx_int_t
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4278 ngx_http_upstream_copy_multi_header_lines(ngx_http_request_t *r,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4279 ngx_table_elt_t *h, ngx_uint_t offset)
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4280 {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4281 ngx_array_t *pa;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4282 ngx_table_elt_t ho, *ph;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4283
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4284 pa = (ngx_array_t ) ((char ) &r->headers_out + offset);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4285
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4286 if (pa->elts == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4287 if (ngx_array_init(pa, r->pool, 2, sizeof(ngx_table_elt_t *)) != NGX_OK)
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4288 {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4289 return NGX_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4290 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4291 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4292
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4293 ph = ngx_array_push(pa);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4294 if (ph == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4295 return NGX_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4296 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4297
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4298 ho = ngx_list_push(&r->headers_out.headers);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4299 if (ho == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4300 return NGX_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4301 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4302
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4303 ho = h;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4304 *ph = ho;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4305
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4306 return NGX_OK;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4307 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4308
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4309
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4310 static ngx_int_t
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4311 ngx_http_upstream_copy_content_type(ngx_http_request_t r, ngx_table_elt_t h,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4312 ngx_uint_t offset)
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4313 {
657 400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4314 u_char p, last;
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4315
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4316 r->headers_out.content_type_len = h->value.len;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4317 r->headers_out.content_type = h->value;
2882 896db5a09bd2 reset content_type hash value, this fixes a bug when XSLT responses Igor Sysoev <igor@sysoev.ru> parents: 2875 diff changeset	4318 r->headers_out.content_type_lowcase = NULL;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4319
657 400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4320 for (p = h->value.data; *p; p++) {
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4321
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4322 if (*p != ';') {
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4323 continue;
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4324 }
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4325
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4326 last = p;
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4327
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4328 while (++p == ' ') { / void */ }
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4329
1968 3c540ad3021f fix segfault Igor Sysoev <igor@sysoev.ru> parents: 1959 diff changeset	4330 if (*p == '\0') {
3c540ad3021f fix segfault Igor Sysoev <igor@sysoev.ru> parents: 1959 diff changeset	4331 return NGX_OK;
3c540ad3021f fix segfault Igor Sysoev <igor@sysoev.ru> parents: 1959 diff changeset	4332 }
3c540ad3021f fix segfault Igor Sysoev <igor@sysoev.ru> parents: 1959 diff changeset	4333
1107 db7c468c447d ngx_strcasecmp()/ngx_strncasecmp() Igor Sysoev <igor@sysoev.ru> parents: 1098 diff changeset	4334 if (ngx_strncasecmp(p, (u_char *) "charset=", 8) != 0) {
657 400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4335 continue;
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4336 }
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4337
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4338 p += 8;
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4339
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4340 r->headers_out.content_type_len = last - h->value.data;
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4341
2244 f5a9f35e8344 strip charset name quotes Igor Sysoev <igor@sysoev.ru> parents: 2184 diff changeset	4342 if (*p == '"') {
f5a9f35e8344 strip charset name quotes Igor Sysoev <igor@sysoev.ru> parents: 2184 diff changeset	4343 p++;
f5a9f35e8344 strip charset name quotes Igor Sysoev <igor@sysoev.ru> parents: 2184 diff changeset	4344 }
f5a9f35e8344 strip charset name quotes Igor Sysoev <igor@sysoev.ru> parents: 2184 diff changeset	4345
f5a9f35e8344 strip charset name quotes Igor Sysoev <igor@sysoev.ru> parents: 2184 diff changeset	4346 last = h->value.data + h->value.len;
f5a9f35e8344 strip charset name quotes Igor Sysoev <igor@sysoev.ru> parents: 2184 diff changeset	4347
f5a9f35e8344 strip charset name quotes Igor Sysoev <igor@sysoev.ru> parents: 2184 diff changeset	4348 if (*(last - 1) == '"') {
f5a9f35e8344 strip charset name quotes Igor Sysoev <igor@sysoev.ru> parents: 2184 diff changeset	4349 last--;
f5a9f35e8344 strip charset name quotes Igor Sysoev <igor@sysoev.ru> parents: 2184 diff changeset	4350 }
f5a9f35e8344 strip charset name quotes Igor Sysoev <igor@sysoev.ru> parents: 2184 diff changeset	4351
f5a9f35e8344 strip charset name quotes Igor Sysoev <igor@sysoev.ru> parents: 2184 diff changeset	4352 r->headers_out.charset.len = last - p;
657 400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4353 r->headers_out.charset.data = p;
1143 c6c42497106c fix segfault if upstream sends trailing ";" in "charset=" Igor Sysoev <igor@sysoev.ru> parents: 1109 diff changeset	4354
c6c42497106c fix segfault if upstream sends trailing ";" in "charset=" Igor Sysoev <igor@sysoev.ru> parents: 1109 diff changeset	4355 return NGX_OK;
657 400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4356 }
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4357
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4358 return NGX_OK;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4359 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4360
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4361
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4362 static ngx_int_t
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4363 ngx_http_upstream_copy_last_modified(ngx_http_request_t r, ngx_table_elt_t h,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4364 ngx_uint_t offset)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4365 {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4366 ngx_table_elt_t *ho;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4367
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4368 ho = ngx_list_push(&r->headers_out.headers);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4369 if (ho == NULL) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4370 return NGX_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4371 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4372
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4373 ho = h;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4374
3004 4121acaf7a04 fix handling "Last-Modified" and "Accept-Ranges" for upstream responses Igor Sysoev <igor@sysoev.ru> parents: 3003 diff changeset	4375 r->headers_out.last_modified = ho;
4121acaf7a04 fix handling "Last-Modified" and "Accept-Ranges" for upstream responses Igor Sysoev <igor@sysoev.ru> parents: 3003 diff changeset	4376
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4377 #if (NGX_HTTP_CACHE)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4378
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	4379 if (r->upstream->cacheable) {
5732 d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	4380 r->headers_out.last_modified_time =
d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	4381 r->upstream->headers_in.last_modified_time;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4382 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4383
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4384 #endif
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4385
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4386 return NGX_OK;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4387 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4388
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4389
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4390 static ngx_int_t
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4391 ngx_http_upstream_rewrite_location(ngx_http_request_t r, ngx_table_elt_t h,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4392 ngx_uint_t offset)
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4393 {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4394 ngx_int_t rc;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4395 ngx_table_elt_t *ho;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4396
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4397 ho = ngx_list_push(&r->headers_out.headers);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4398 if (ho == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4399 return NGX_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4400 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4401
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4402 ho = h;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4403
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4404 if (r->upstream->rewrite_redirect) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4405 rc = r->upstream->rewrite_redirect(r, ho, 0);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4406
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	4407 if (rc == NGX_DECLINED) {
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	4408 return NGX_OK;
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	4409 }
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	4410
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4411 if (rc == NGX_OK) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4412 r->headers_out.location = ho;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4413
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4414 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4415 "rewritten location: \"%V\"", &ho->value);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4416 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4417
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4418 return rc;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4419 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4420
1653 ea681a6a0c61 set r->headers_out.location for non-local redirects Igor Sysoev <igor@sysoev.ru> parents: 1640 diff changeset	4421 if (ho->value.data[0] != '/') {
ea681a6a0c61 set r->headers_out.location for non-local redirects Igor Sysoev <igor@sysoev.ru> parents: 1640 diff changeset	4422 r->headers_out.location = ho;
ea681a6a0c61 set r->headers_out.location for non-local redirects Igor Sysoev <igor@sysoev.ru> parents: 1640 diff changeset	4423 }
ea681a6a0c61 set r->headers_out.location for non-local redirects Igor Sysoev <igor@sysoev.ru> parents: 1640 diff changeset	4424
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4425 /*
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4426 * we do not set r->headers_out.location here to avoid the handling
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4427 * the local redirects without a host name by ngx_http_header_filter()
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4428 */
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4429
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4430 return NGX_OK;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4431 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4432
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4433
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4434 static ngx_int_t
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4435 ngx_http_upstream_rewrite_refresh(ngx_http_request_t r, ngx_table_elt_t h,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4436 ngx_uint_t offset)
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4437 {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4438 u_char *p;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4439 ngx_int_t rc;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4440 ngx_table_elt_t *ho;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4441
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4442 ho = ngx_list_push(&r->headers_out.headers);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4443 if (ho == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4444 return NGX_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4445 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4446
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4447 ho = h;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4448
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4449 if (r->upstream->rewrite_redirect) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4450
1549 099d8470e6c3 pass length clearly Igor Sysoev <igor@sysoev.ru> parents: 1543 diff changeset	4451 p = ngx_strcasestrn(ho->value.data, "url=", 4 - 1);
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4452
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4453 if (p) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4454 rc = r->upstream->rewrite_redirect(r, ho, p + 4 - ho->value.data);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4455
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4456 } else {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4457 return NGX_OK;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4458 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4459
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	4460 if (rc == NGX_DECLINED) {
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	4461 return NGX_OK;
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	4462 }
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	4463
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4464 if (rc == NGX_OK) {
1654 e5c547a225bd r->headers_out.refresh Igor Sysoev <igor@sysoev.ru> parents: 1653 diff changeset	4465 r->headers_out.refresh = ho;
e5c547a225bd r->headers_out.refresh Igor Sysoev <igor@sysoev.ru> parents: 1653 diff changeset	4466
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4467 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4468 "rewritten refresh: \"%V\"", &ho->value);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4469 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4470
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4471 return rc;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4472 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4473
1654 e5c547a225bd r->headers_out.refresh Igor Sysoev <igor@sysoev.ru> parents: 1653 diff changeset	4474 r->headers_out.refresh = ho;
e5c547a225bd r->headers_out.refresh Igor Sysoev <igor@sysoev.ru> parents: 1653 diff changeset	4475
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4476 return NGX_OK;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4477 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4478
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4479
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4480 static ngx_int_t
4464 7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	4481 ngx_http_upstream_rewrite_set_cookie(ngx_http_request_t r, ngx_table_elt_t h,
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	4482 ngx_uint_t offset)
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	4483 {
4650 b38fea6f9a15 Fixed returned value handling from the cookie rewrite handler. Valentin Bartenev <vbart@nginx.com> parents: 4572 diff changeset	4484 ngx_int_t rc;
4464 7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	4485 ngx_table_elt_t *ho;
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	4486
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	4487 ho = ngx_list_push(&r->headers_out.headers);
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	4488 if (ho == NULL) {
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	4489 return NGX_ERROR;
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	4490 }
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	4491
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	4492 ho = h;
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	4493
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	4494 if (r->upstream->rewrite_cookie) {
4650 b38fea6f9a15 Fixed returned value handling from the cookie rewrite handler. Valentin Bartenev <vbart@nginx.com> parents: 4572 diff changeset	4495 rc = r->upstream->rewrite_cookie(r, ho);
b38fea6f9a15 Fixed returned value handling from the cookie rewrite handler. Valentin Bartenev <vbart@nginx.com> parents: 4572 diff changeset	4496
b38fea6f9a15 Fixed returned value handling from the cookie rewrite handler. Valentin Bartenev <vbart@nginx.com> parents: 4572 diff changeset	4497 if (rc == NGX_DECLINED) {
b38fea6f9a15 Fixed returned value handling from the cookie rewrite handler. Valentin Bartenev <vbart@nginx.com> parents: 4572 diff changeset	4498 return NGX_OK;
b38fea6f9a15 Fixed returned value handling from the cookie rewrite handler. Valentin Bartenev <vbart@nginx.com> parents: 4572 diff changeset	4499 }
b38fea6f9a15 Fixed returned value handling from the cookie rewrite handler. Valentin Bartenev <vbart@nginx.com> parents: 4572 diff changeset	4500
b38fea6f9a15 Fixed returned value handling from the cookie rewrite handler. Valentin Bartenev <vbart@nginx.com> parents: 4572 diff changeset	4501 #if (NGX_DEBUG)
b38fea6f9a15 Fixed returned value handling from the cookie rewrite handler. Valentin Bartenev <vbart@nginx.com> parents: 4572 diff changeset	4502 if (rc == NGX_OK) {
b38fea6f9a15 Fixed returned value handling from the cookie rewrite handler. Valentin Bartenev <vbart@nginx.com> parents: 4572 diff changeset	4503 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
b38fea6f9a15 Fixed returned value handling from the cookie rewrite handler. Valentin Bartenev <vbart@nginx.com> parents: 4572 diff changeset	4504 "rewritten cookie: \"%V\"", &ho->value);
b38fea6f9a15 Fixed returned value handling from the cookie rewrite handler. Valentin Bartenev <vbart@nginx.com> parents: 4572 diff changeset	4505 }
b38fea6f9a15 Fixed returned value handling from the cookie rewrite handler. Valentin Bartenev <vbart@nginx.com> parents: 4572 diff changeset	4506 #endif
b38fea6f9a15 Fixed returned value handling from the cookie rewrite handler. Valentin Bartenev <vbart@nginx.com> parents: 4572 diff changeset	4507
b38fea6f9a15 Fixed returned value handling from the cookie rewrite handler. Valentin Bartenev <vbart@nginx.com> parents: 4572 diff changeset	4508 return rc;
4464 7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	4509 }
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	4510
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	4511 return NGX_OK;
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	4512 }
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	4513
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	4514
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	4515 static ngx_int_t
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4516 ngx_http_upstream_copy_allow_ranges(ngx_http_request_t *r,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4517 ngx_table_elt_t *h, ngx_uint_t offset)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4518 {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4519 ngx_table_elt_t *ho;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4520
5874 2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5869 diff changeset	4521 if (r->upstream->conf->force_ranges) {
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5869 diff changeset	4522 return NGX_OK;
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5869 diff changeset	4523 }
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5869 diff changeset	4524
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4525 #if (NGX_HTTP_CACHE)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4526
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4527 if (r->cached) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4528 r->allow_ranges = 1;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4529 return NGX_OK;
5621 345e4fd4bb64 Range filter: single_range flag in request. Maxim Dounin <mdounin@mdounin.ru> parents: 5581 diff changeset	4530 }
345e4fd4bb64 Range filter: single_range flag in request. Maxim Dounin <mdounin@mdounin.ru> parents: 5581 diff changeset	4531
345e4fd4bb64 Range filter: single_range flag in request. Maxim Dounin <mdounin@mdounin.ru> parents: 5581 diff changeset	4532 if (r->upstream->cacheable) {
345e4fd4bb64 Range filter: single_range flag in request. Maxim Dounin <mdounin@mdounin.ru> parents: 5581 diff changeset	4533 r->allow_ranges = 1;
345e4fd4bb64 Range filter: single_range flag in request. Maxim Dounin <mdounin@mdounin.ru> parents: 5581 diff changeset	4534 r->single_range = 1;
345e4fd4bb64 Range filter: single_range flag in request. Maxim Dounin <mdounin@mdounin.ru> parents: 5581 diff changeset	4535 return NGX_OK;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4536 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4537
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4538 #endif
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4539
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4540 ho = ngx_list_push(&r->headers_out.headers);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4541 if (ho == NULL) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4542 return NGX_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4543 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4544
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4545 ho = h;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4546
3004 4121acaf7a04 fix handling "Last-Modified" and "Accept-Ranges" for upstream responses Igor Sysoev <igor@sysoev.ru> parents: 3003 diff changeset	4547 r->headers_out.accept_ranges = ho;
4121acaf7a04 fix handling "Last-Modified" and "Accept-Ranges" for upstream responses Igor Sysoev <igor@sysoev.ru> parents: 3003 diff changeset	4548
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4549 return NGX_OK;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4550 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4551
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4552
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4553 #if (NGX_HTTP_GZIP)
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4554
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4555 static ngx_int_t
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4556 ngx_http_upstream_copy_content_encoding(ngx_http_request_t *r,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4557 ngx_table_elt_t *h, ngx_uint_t offset)
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4558 {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4559 ngx_table_elt_t *ho;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4560
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4561 ho = ngx_list_push(&r->headers_out.headers);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4562 if (ho == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4563 return NGX_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4564 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4565
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4566 ho = h;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4567
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4568 r->headers_out.content_encoding = ho;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4569
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4570 return NGX_OK;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4571 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4572
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4573 #endif
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4574
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4575
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	4576 static ngx_int_t
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4577 ngx_http_upstream_add_variables(ngx_conf_t *cf)
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4578 {
880 3b763d36e055 axe old % log format Igor Sysoev <igor@sysoev.ru> parents: 850 diff changeset	4579 ngx_http_variable_t var, v;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4580
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4581 for (v = ngx_http_upstream_vars; v->name.len; v++) {
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4582 var = ngx_http_add_variable(cf, &v->name, v->flags);
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4583 if (var == NULL) {
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4584 return NGX_ERROR;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4585 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4586
637 e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 629 diff changeset	4587 var->get_handler = v->get_handler;
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4588 var->data = v->data;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4589 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4590
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4591 return NGX_OK;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4592 }
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4593
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4594
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4595 static ngx_int_t
1181 ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4596 ngx_http_upstream_addr_variable(ngx_http_request_t *r,
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4597 ngx_http_variable_value_t *v, uintptr_t data)
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4598 {
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4599 u_char *p;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4600 size_t len;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4601 ngx_uint_t i;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4602 ngx_http_upstream_state_t *state;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4603
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4604 v->valid = 1;
1565 4c43e25d11ea fix English grammar Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	4605 v->no_cacheable = 0;
1181 ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4606 v->not_found = 0;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4607
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4608 if (r->upstream_states == NULL \|\| r->upstream_states->nelts == 0) {
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4609 v->not_found = 1;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4610 return NGX_OK;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4611 }
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4612
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4613 len = 0;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4614 state = r->upstream_states->elts;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4615
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4616 for (i = 0; i < r->upstream_states->nelts; i++) {
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4617 if (state[i].peer) {
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4618 len += state[i].peer->len + 2;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4619
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4620 } else {
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4621 len += 3;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4622 }
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4623 }
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4624
2049 2a92804f4109 ) back out r2040 Igor Sysoev <igor@sysoev.ru>* parents: 1973 diff changeset	4625 p = ngx_pnalloc(r->pool, len);
1181 ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4626 if (p == NULL) {
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4627 return NGX_ERROR;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4628 }
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4629
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4630 v->data = p;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4631
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4632 i = 0;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4633
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4634 for ( ;; ) {
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4635 if (state[i].peer) {
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4636 p = ngx_cpymem(p, state[i].peer->data, state[i].peer->len);
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4637 }
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4638
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4639 if (++i == r->upstream_states->nelts) {
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4640 break;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4641 }
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4642
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4643 if (state[i].peer) {
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4644 *p++ = ',';
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4645 *p++ = ' ';
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4646
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4647 } else {
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4648 *p++ = ' ';
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4649 *p++ = ':';
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4650 *p++ = ' ';
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4651
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4652 if (++i == r->upstream_states->nelts) {
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4653 break;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4654 }
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4655
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4656 continue;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4657 }
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4658 }
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4659
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4660 v->len = p - v->data;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4661
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4662 return NGX_OK;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4663 }
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4664
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4665
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4666 static ngx_int_t
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4667 ngx_http_upstream_status_variable(ngx_http_request_t *r,
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4668 ngx_http_variable_value_t *v, uintptr_t data)
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4669 {
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4670 u_char *p;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4671 size_t len;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4672 ngx_uint_t i;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4673 ngx_http_upstream_state_t *state;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4674
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4675 v->valid = 1;
1565 4c43e25d11ea fix English grammar Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	4676 v->no_cacheable = 0;
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4677 v->not_found = 0;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4678
1168 4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4679 if (r->upstream_states == NULL \|\| r->upstream_states->nelts == 0) {
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4680 v->not_found = 1;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4681 return NGX_OK;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4682 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4683
1168 4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4684 len = r->upstream_states->nelts * (3 + 2);
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4685
2049 2a92804f4109 ) back out r2040 Igor Sysoev <igor@sysoev.ru>* parents: 1973 diff changeset	4686 p = ngx_pnalloc(r->pool, len);
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4687 if (p == NULL) {
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4688 return NGX_ERROR;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4689 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4690
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4691 v->data = p;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4692
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4693 i = 0;
1168 4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4694 state = r->upstream_states->elts;
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4695
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4696 for ( ;; ) {
1168 4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4697 if (state[i].status) {
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4698 p = ngx_sprintf(p, "%ui", state[i].status);
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4699
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4700 } else {
1168 4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4701 *p++ = '-';
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4702 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4703
1168 4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4704 if (++i == r->upstream_states->nelts) {
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4705 break;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4706 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4707
1168 4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4708 if (state[i].peer) {
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4709 *p++ = ',';
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4710 *p++ = ' ';
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4711
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4712 } else {
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4713 *p++ = ' ';
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4714 *p++ = ':';
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4715 *p++ = ' ';
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4716
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4717 if (++i == r->upstream_states->nelts) {
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4718 break;
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4719 }
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4720
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4721 continue;
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4722 }
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4723 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4724
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4725 v->len = p - v->data;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4726
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4727 return NGX_OK;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4728 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4729
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4730
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4731 static ngx_int_t
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4732 ngx_http_upstream_response_time_variable(ngx_http_request_t *r,
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4733 ngx_http_variable_value_t *v, uintptr_t data)
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4734 {
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4735 u_char *p;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4736 size_t len;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4737 ngx_uint_t i;
889 a9a7e4b1a72b the previous fix does not actually fix overflow Igor Sysoev <igor@sysoev.ru> parents: 888 diff changeset	4738 ngx_msec_int_t ms;
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4739 ngx_http_upstream_state_t *state;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4740
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4741 v->valid = 1;
1565 4c43e25d11ea fix English grammar Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	4742 v->no_cacheable = 0;
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4743 v->not_found = 0;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4744
1168 4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4745 if (r->upstream_states == NULL \|\| r->upstream_states->nelts == 0) {
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4746 v->not_found = 1;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4747 return NGX_OK;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4748 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4749
1168 4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4750 len = r->upstream_states->nelts * (NGX_TIME_T_LEN + 4 + 2);
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4751
2049 2a92804f4109 ) back out r2040 Igor Sysoev <igor@sysoev.ru>* parents: 1973 diff changeset	4752 p = ngx_pnalloc(r->pool, len);
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4753 if (p == NULL) {
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4754 return NGX_ERROR;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4755 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4756
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4757 v->data = p;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4758
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4759 i = 0;
1168 4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4760 state = r->upstream_states->elts;
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4761
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4762 for ( ;; ) {
1168 4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4763 if (state[i].status) {
1640 02a22cd5282a 64-bit time_t compatibility Igor Sysoev <igor@sysoev.ru> parents: 1565 diff changeset	4764 ms = (ngx_msec_int_t)
02a22cd5282a 64-bit time_t compatibility Igor Sysoev <igor@sysoev.ru> parents: 1565 diff changeset	4765 (state[i].response_sec * 1000 + state[i].response_msec);
3515 76d252724db5 use ngx_min() and ngx_max() Igor Sysoev <igor@sysoev.ru> parents: 3514 diff changeset	4766 ms = ngx_max(ms, 0);
5368 cd46297325bd Upstream: fixed $upstream_response_time format specifiers. Maxim Dounin <mdounin@mdounin.ru> parents: 5353 diff changeset	4767 p = ngx_sprintf(p, "%T.%03M", (time_t) ms / 1000, ms % 1000);
1168 4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4768
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4769 } else {
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4770 *p++ = '-';
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4771 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4772
1168 4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4773 if (++i == r->upstream_states->nelts) {
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4774 break;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4775 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4776
1168 4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4777 if (state[i].peer) {
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4778 *p++ = ',';
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4779 *p++ = ' ';
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4780
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4781 } else {
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4782 *p++ = ' ';
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4783 *p++ = ':';
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4784 *p++ = ' ';
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4785
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4786 if (++i == r->upstream_states->nelts) {
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4787 break;
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4788 }
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4789
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4790 continue;
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4791 }
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4792 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4793
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4794 v->len = p - v->data;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4795
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4796 return NGX_OK;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4797 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4798
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4799
2402 cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4800 static ngx_int_t
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4801 ngx_http_upstream_response_length_variable(ngx_http_request_t *r,
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4802 ngx_http_variable_value_t *v, uintptr_t data)
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4803 {
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4804 u_char *p;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4805 size_t len;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4806 ngx_uint_t i;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4807 ngx_http_upstream_state_t *state;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4808
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4809 v->valid = 1;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4810 v->no_cacheable = 0;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4811 v->not_found = 0;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4812
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4813 if (r->upstream_states == NULL \|\| r->upstream_states->nelts == 0) {
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4814 v->not_found = 1;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4815 return NGX_OK;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4816 }
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4817
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4818 len = r->upstream_states->nelts * (NGX_OFF_T_LEN + 2);
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4819
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4820 p = ngx_pnalloc(r->pool, len);
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4821 if (p == NULL) {
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4822 return NGX_ERROR;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4823 }
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4824
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4825 v->data = p;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4826
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4827 i = 0;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4828 state = r->upstream_states->elts;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4829
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4830 for ( ;; ) {
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4831 p = ngx_sprintf(p, "%O", state[i].response_length);
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4832
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4833 if (++i == r->upstream_states->nelts) {
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4834 break;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4835 }
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4836
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4837 if (state[i].peer) {
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4838 *p++ = ',';
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4839 *p++ = ' ';
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4840
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4841 } else {
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4842 *p++ = ' ';
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4843 *p++ = ':';
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4844 *p++ = ' ';
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4845
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4846 if (++i == r->upstream_states->nelts) {
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4847 break;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4848 }
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4849
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4850 continue;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4851 }
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4852 }
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4853
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4854 v->len = p - v->data;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4855
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4856 return NGX_OK;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4857 }
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4858
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4859
1162 f59d15404269 $upstream_http_... variables Igor Sysoev <igor@sysoev.ru> parents: 1153 diff changeset	4860 ngx_int_t
f59d15404269 $upstream_http_... variables Igor Sysoev <igor@sysoev.ru> parents: 1153 diff changeset	4861 ngx_http_upstream_header_variable(ngx_http_request_t *r,
f59d15404269 $upstream_http_... variables Igor Sysoev <igor@sysoev.ru> parents: 1153 diff changeset	4862 ngx_http_variable_value_t *v, uintptr_t data)
f59d15404269 $upstream_http_... variables Igor Sysoev <igor@sysoev.ru> parents: 1153 diff changeset	4863 {
f59d15404269 $upstream_http_... variables Igor Sysoev <igor@sysoev.ru> parents: 1153 diff changeset	4864 if (r->upstream == NULL) {
f59d15404269 $upstream_http_... variables Igor Sysoev <igor@sysoev.ru> parents: 1153 diff changeset	4865 v->not_found = 1;
f59d15404269 $upstream_http_... variables Igor Sysoev <igor@sysoev.ru> parents: 1153 diff changeset	4866 return NGX_OK;
f59d15404269 $upstream_http_... variables Igor Sysoev <igor@sysoev.ru> parents: 1153 diff changeset	4867 }
f59d15404269 $upstream_http_... variables Igor Sysoev <igor@sysoev.ru> parents: 1153 diff changeset	4868
f59d15404269 $upstream_http_... variables Igor Sysoev <igor@sysoev.ru> parents: 1153 diff changeset	4869 return ngx_http_variable_unknown_header(v, (ngx_str_t *) data,
f59d15404269 $upstream_http_... variables Igor Sysoev <igor@sysoev.ru> parents: 1153 diff changeset	4870 &r->upstream->headers_in.headers.part,
f59d15404269 $upstream_http_... variables Igor Sysoev <igor@sysoev.ru> parents: 1153 diff changeset	4871 sizeof("upstream_http_") - 1);
f59d15404269 $upstream_http_... variables Igor Sysoev <igor@sysoev.ru> parents: 1153 diff changeset	4872 }
f59d15404269 $upstream_http_... variables Igor Sysoev <igor@sysoev.ru> parents: 1153 diff changeset	4873
f59d15404269 $upstream_http_... variables Igor Sysoev <igor@sysoev.ru> parents: 1153 diff changeset	4874
5677 3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4875 ngx_int_t
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4876 ngx_http_upstream_cookie_variable(ngx_http_request_t *r,
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4877 ngx_http_variable_value_t *v, uintptr_t data)
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4878 {
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4879 ngx_str_t name = (ngx_str_t ) data;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4880
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4881 ngx_str_t cookie, s;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4882
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4883 if (r->upstream == NULL) {
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4884 v->not_found = 1;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4885 return NGX_OK;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4886 }
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4887
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4888 s.len = name->len - (sizeof("upstream_cookie_") - 1);
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4889 s.data = name->data + sizeof("upstream_cookie_") - 1;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4890
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4891 if (ngx_http_parse_set_cookie_lines(&r->upstream->headers_in.cookies,
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4892 &s, &cookie)
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4893 == NGX_DECLINED)
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4894 {
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4895 v->not_found = 1;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4896 return NGX_OK;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4897 }
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4898
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4899 v->len = cookie.len;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4900 v->valid = 1;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4901 v->no_cacheable = 0;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4902 v->not_found = 0;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4903 v->data = cookie.data;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4904
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4905 return NGX_OK;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4906 }
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4907
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4908
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	4909 #if (NGX_HTTP_CACHE)
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	4910
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	4911 ngx_int_t
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	4912 ngx_http_upstream_cache_status(ngx_http_request_t *r,
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	4913 ngx_http_variable_value_t *v, uintptr_t data)
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	4914 {
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	4915 ngx_uint_t n;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	4916
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	4917 if (r->upstream == NULL \|\| r->upstream->cache_status == 0) {
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	4918 v->not_found = 1;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	4919 return NGX_OK;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	4920 }
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	4921
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	4922 n = r->upstream->cache_status - 1;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	4923
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	4924 v->valid = 1;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	4925 v->no_cacheable = 0;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	4926 v->not_found = 0;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	4927 v->len = ngx_http_cache_status[n].len;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	4928 v->data = ngx_http_cache_status[n].data;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	4929
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	4930 return NGX_OK;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	4931 }
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	4932
5441 43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	4933
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	4934 static ngx_int_t
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	4935 ngx_http_upstream_cache_last_modified(ngx_http_request_t *r,
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	4936 ngx_http_variable_value_t *v, uintptr_t data)
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	4937 {
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	4938 u_char *p;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	4939
5453 b7b8e2fa7ebd Fixed null pointer dereference with $upstream_cache_last_modified. Ruslan Ermilov <ru@nginx.com> parents: 5441 diff changeset	4940 if (r->upstream == NULL
b7b8e2fa7ebd Fixed null pointer dereference with $upstream_cache_last_modified. Ruslan Ermilov <ru@nginx.com> parents: 5441 diff changeset	4941 \|\| !r->upstream->conf->cache_revalidate
5441 43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	4942 \|\| r->upstream->cache_status != NGX_HTTP_CACHE_EXPIRED
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	4943 \|\| r->cache->last_modified == -1)
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	4944 {
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	4945 v->not_found = 1;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	4946 return NGX_OK;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	4947 }
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	4948
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	4949 p = ngx_pnalloc(r->pool, sizeof("Mon, 28 Sep 1970 06:00:00 GMT") - 1);
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	4950 if (p == NULL) {
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	4951 return NGX_ERROR;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	4952 }
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	4953
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	4954 v->len = ngx_http_time(p, r->cache->last_modified) - p;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	4955 v->valid = 1;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	4956 v->no_cacheable = 0;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	4957 v->not_found = 0;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	4958 v->data = p;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	4959
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	4960 return NGX_OK;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	4961 }
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	4962
5738 c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	4963
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	4964 static ngx_int_t
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	4965 ngx_http_upstream_cache_etag(ngx_http_request_t *r,
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	4966 ngx_http_variable_value_t *v, uintptr_t data)
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	4967 {
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	4968 if (r->upstream == NULL
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	4969 \|\| !r->upstream->conf->cache_revalidate
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	4970 \|\| r->upstream->cache_status != NGX_HTTP_CACHE_EXPIRED
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	4971 \|\| r->cache->etag.len == 0)
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	4972 {
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	4973 v->not_found = 1;
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	4974 return NGX_OK;
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	4975 }
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	4976
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	4977 v->valid = 1;
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	4978 v->no_cacheable = 0;
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	4979 v->not_found = 0;
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	4980 v->len = r->cache->etag.len;
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	4981 v->data = r->cache->etag.data;
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	4982
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	4983 return NGX_OK;
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	4984 }
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	4985
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	4986 #endif
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	4987
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	4988
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4989 static char *
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4990 ngx_http_upstream(ngx_conf_t cf, ngx_command_t cmd, void *dummy)
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4991 {
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4992 char *rv;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4993 void *mconf;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4994 ngx_str_t *value;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4995 ngx_url_t u;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4996 ngx_uint_t m;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4997 ngx_conf_t pcf;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4998 ngx_http_module_t *module;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4999 ngx_http_conf_ctx_t ctx, http_ctx;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5000 ngx_http_upstream_srv_conf_t *uscf;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5001
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5002 ngx_memzero(&u, sizeof(ngx_url_t));
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5003
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5004 value = cf->args->elts;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5005 u.host = value[1];
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5006 u.no_resolve = 1;
5005 c9059bd5445b Fixed "proxy_pass" with IP address and no port (ticket #276). Ruslan Ermilov <ru@nginx.com> parents: 4990 diff changeset	5007 u.no_port = 1;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5008
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5009 uscf = ngx_http_upstream_add(cf, &u, NGX_HTTP_UPSTREAM_CREATE
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5010 \|NGX_HTTP_UPSTREAM_WEIGHT
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5011 \|NGX_HTTP_UPSTREAM_MAX_FAILS
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5012 \|NGX_HTTP_UPSTREAM_FAIL_TIMEOUT
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5013 \|NGX_HTTP_UPSTREAM_DOWN
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5014 \|NGX_HTTP_UPSTREAM_BACKUP);
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5015 if (uscf == NULL) {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5016 return NGX_CONF_ERROR;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5017 }
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5018
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5019
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5020 ctx = ngx_pcalloc(cf->pool, sizeof(ngx_http_conf_ctx_t));
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5021 if (ctx == NULL) {
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5022 return NGX_CONF_ERROR;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5023 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5024
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5025 http_ctx = cf->ctx;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5026 ctx->main_conf = http_ctx->main_conf;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5027
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5028 /* the upstream{}'s srv_conf */
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5029
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5030 ctx->srv_conf = ngx_pcalloc(cf->pool, sizeof(void ) ngx_http_max_module);
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5031 if (ctx->srv_conf == NULL) {
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5032 return NGX_CONF_ERROR;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5033 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5034
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5035 ctx->srv_conf[ngx_http_upstream_module.ctx_index] = uscf;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5036
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5037 uscf->srv_conf = ctx->srv_conf;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5038
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5039
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5040 /* the upstream{}'s loc_conf */
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5041
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5042 ctx->loc_conf = ngx_pcalloc(cf->pool, sizeof(void ) ngx_http_max_module);
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5043 if (ctx->loc_conf == NULL) {
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5044 return NGX_CONF_ERROR;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5045 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5046
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5047 for (m = 0; ngx_modules[m]; m++) {
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5048 if (ngx_modules[m]->type != NGX_HTTP_MODULE) {
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5049 continue;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5050 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5051
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5052 module = ngx_modules[m]->ctx;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5053
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5054 if (module->create_srv_conf) {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5055 mconf = module->create_srv_conf(cf);
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5056 if (mconf == NULL) {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5057 return NGX_CONF_ERROR;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5058 }
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5059
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5060 ctx->srv_conf[ngx_modules[m]->ctx_index] = mconf;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5061 }
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5062
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5063 if (module->create_loc_conf) {
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5064 mconf = module->create_loc_conf(cf);
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5065 if (mconf == NULL) {
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5066 return NGX_CONF_ERROR;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5067 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5068
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5069 ctx->loc_conf[ngx_modules[m]->ctx_index] = mconf;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5070 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5071 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5072
5728 63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	5073 uscf->servers = ngx_array_create(cf->pool, 4,
63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	5074 sizeof(ngx_http_upstream_server_t));
63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	5075 if (uscf->servers == NULL) {
63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	5076 return NGX_CONF_ERROR;
63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	5077 }
63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	5078
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5079
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5080 /* parse inside upstream{} */
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5081
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5082 pcf = *cf;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5083 cf->ctx = ctx;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5084 cf->cmd_type = NGX_HTTP_UPS_CONF;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5085
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5086 rv = ngx_conf_parse(cf, NULL);
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5087
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5088 *cf = pcf;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5089
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5090 if (rv != NGX_CONF_OK) {
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5091 return rv;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5092 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5093
5728 63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	5094 if (uscf->servers->nelts == 0) {
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5095 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5096 "no servers are inside upstream");
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5097 return NGX_CONF_ERROR;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5098 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5099
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5100 return rv;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5101 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5102
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5103
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5104 static char *
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5105 ngx_http_upstream_server(ngx_conf_t cf, ngx_command_t cmd, void *conf)
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5106 {
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5107 ngx_http_upstream_srv_conf_t *uscf = conf;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5108
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5109 time_t fail_timeout;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5110 ngx_str_t *value, s;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5111 ngx_url_t u;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5112 ngx_int_t weight, max_fails;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5113 ngx_uint_t i;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5114 ngx_http_upstream_server_t *us;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5115
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5116 us = ngx_array_push(uscf->servers);
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5117 if (us == NULL) {
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5118 return NGX_CONF_ERROR;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5119 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5120
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5121 ngx_memzero(us, sizeof(ngx_http_upstream_server_t));
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5122
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5123 value = cf->args->elts;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5124
663 6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 659 diff changeset	5125 weight = 1;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5126 max_fails = 1;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5127 fail_timeout = 10;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5128
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5129 for (i = 2; i < cf->args->nelts; i++) {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5130
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5131 if (ngx_strncmp(value[i].data, "weight=", 7) == 0) {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5132
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5133 if (!(uscf->flags & NGX_HTTP_UPSTREAM_WEIGHT)) {
5818 fe8bafab5b49 Upstream: improved configuration parser diagnostics. Ruslan Ermilov <ru@nginx.com> parents: 5774 diff changeset	5134 goto not_supported;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5135 }
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5136
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5137 weight = ngx_atoi(&value[i].data[7], value[i].len - 7);
663 6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 659 diff changeset	5138
6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 659 diff changeset	5139 if (weight == NGX_ERROR \|\| weight == 0) {
6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 659 diff changeset	5140 goto invalid;
6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 659 diff changeset	5141 }
6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 659 diff changeset	5142
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5143 continue;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5144 }
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5145
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5146 if (ngx_strncmp(value[i].data, "max_fails=", 10) == 0) {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5147
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5148 if (!(uscf->flags & NGX_HTTP_UPSTREAM_MAX_FAILS)) {
5818 fe8bafab5b49 Upstream: improved configuration parser diagnostics. Ruslan Ermilov <ru@nginx.com> parents: 5774 diff changeset	5149 goto not_supported;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5150 }
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5151
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5152 max_fails = ngx_atoi(&value[i].data[10], value[i].len - 10);
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5153
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5154 if (max_fails == NGX_ERROR) {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5155 goto invalid;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5156 }
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5157
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5158 continue;
663 6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 659 diff changeset	5159 }
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5160
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5161 if (ngx_strncmp(value[i].data, "fail_timeout=", 13) == 0) {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5162
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5163 if (!(uscf->flags & NGX_HTTP_UPSTREAM_FAIL_TIMEOUT)) {
5818 fe8bafab5b49 Upstream: improved configuration parser diagnostics. Ruslan Ermilov <ru@nginx.com> parents: 5774 diff changeset	5164 goto not_supported;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5165 }
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5166
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5167 s.len = value[i].len - 13;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5168 s.data = &value[i].data[13];
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5169
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5170 fail_timeout = ngx_parse_time(&s, 1);
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5171
4474 41f640a693de Time parsing cleanup. Maxim Dounin <mdounin@mdounin.ru> parents: 4469 diff changeset	5172 if (fail_timeout == (time_t) NGX_ERROR) {
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5173 goto invalid;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5174 }
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5175
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5176 continue;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5177 }
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5178
5410 16b68c724438 Upstream: fixed "down" and "backup" parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 5392 diff changeset	5179 if (ngx_strcmp(value[i].data, "backup") == 0) {
1378 0be898896d1a backup upstream servers Igor Sysoev <igor@sysoev.ru> parents: 1340 diff changeset	5180
0be898896d1a backup upstream servers Igor Sysoev <igor@sysoev.ru> parents: 1340 diff changeset	5181 if (!(uscf->flags & NGX_HTTP_UPSTREAM_BACKUP)) {
5818 fe8bafab5b49 Upstream: improved configuration parser diagnostics. Ruslan Ermilov <ru@nginx.com> parents: 5774 diff changeset	5182 goto not_supported;
1378 0be898896d1a backup upstream servers Igor Sysoev <igor@sysoev.ru> parents: 1340 diff changeset	5183 }
0be898896d1a backup upstream servers Igor Sysoev <igor@sysoev.ru> parents: 1340 diff changeset	5184
0be898896d1a backup upstream servers Igor Sysoev <igor@sysoev.ru> parents: 1340 diff changeset	5185 us->backup = 1;
0be898896d1a backup upstream servers Igor Sysoev <igor@sysoev.ru> parents: 1340 diff changeset	5186
0be898896d1a backup upstream servers Igor Sysoev <igor@sysoev.ru> parents: 1340 diff changeset	5187 continue;
0be898896d1a backup upstream servers Igor Sysoev <igor@sysoev.ru> parents: 1340 diff changeset	5188 }
0be898896d1a backup upstream servers Igor Sysoev <igor@sysoev.ru> parents: 1340 diff changeset	5189
5410 16b68c724438 Upstream: fixed "down" and "backup" parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 5392 diff changeset	5190 if (ngx_strcmp(value[i].data, "down") == 0) {
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5191
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5192 if (!(uscf->flags & NGX_HTTP_UPSTREAM_DOWN)) {
5818 fe8bafab5b49 Upstream: improved configuration parser diagnostics. Ruslan Ermilov <ru@nginx.com> parents: 5774 diff changeset	5193 goto not_supported;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5194 }
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5195
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5196 us->down = 1;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5197
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5198 continue;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5199 }
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5200
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5201 goto invalid;
663 6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 659 diff changeset	5202 }
6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 659 diff changeset	5203
5728 63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	5204 ngx_memzero(&u, sizeof(ngx_url_t));
63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	5205
63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	5206 u.url = value[1];
63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	5207 u.default_port = 80;
63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	5208
63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	5209 if (ngx_parse_url(cf->pool, &u) != NGX_OK) {
63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	5210 if (u.err) {
63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	5211 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	5212 "%s in upstream \"%V\"", u.err, &u.url);
63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	5213 }
63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	5214
63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	5215 return NGX_CONF_ERROR;
63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	5216 }
63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	5217
5717 efc84a5723b3 Upstream: generic hash module. Roman Arutyunyan <arut@nginx.com> parents: 5682 diff changeset	5218 us->name = u.url;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5219 us->addrs = u.addrs;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5220 us->naddrs = u.naddrs;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5221 us->weight = weight;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5222 us->max_fails = max_fails;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5223 us->fail_timeout = fail_timeout;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5224
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5225 return NGX_CONF_OK;
663 6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 659 diff changeset	5226
6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 659 diff changeset	5227 invalid:
6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 659 diff changeset	5228
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5229 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5230 "invalid parameter \"%V\"", &value[i]);
663 6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 659 diff changeset	5231
6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 659 diff changeset	5232 return NGX_CONF_ERROR;
5818 fe8bafab5b49 Upstream: improved configuration parser diagnostics. Ruslan Ermilov <ru@nginx.com> parents: 5774 diff changeset	5233
fe8bafab5b49 Upstream: improved configuration parser diagnostics. Ruslan Ermilov <ru@nginx.com> parents: 5774 diff changeset	5234 not_supported:
fe8bafab5b49 Upstream: improved configuration parser diagnostics. Ruslan Ermilov <ru@nginx.com> parents: 5774 diff changeset	5235
fe8bafab5b49 Upstream: improved configuration parser diagnostics. Ruslan Ermilov <ru@nginx.com> parents: 5774 diff changeset	5236 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
fe8bafab5b49 Upstream: improved configuration parser diagnostics. Ruslan Ermilov <ru@nginx.com> parents: 5774 diff changeset	5237 "balancing method does not support parameter \"%V\"",
fe8bafab5b49 Upstream: improved configuration parser diagnostics. Ruslan Ermilov <ru@nginx.com> parents: 5774 diff changeset	5238 &value[i]);
fe8bafab5b49 Upstream: improved configuration parser diagnostics. Ruslan Ermilov <ru@nginx.com> parents: 5774 diff changeset	5239
fe8bafab5b49 Upstream: improved configuration parser diagnostics. Ruslan Ermilov <ru@nginx.com> parents: 5774 diff changeset	5240 return NGX_CONF_ERROR;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5241 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5242
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5243
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5244 ngx_http_upstream_srv_conf_t *
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5245 ngx_http_upstream_add(ngx_conf_t cf, ngx_url_t u, ngx_uint_t flags)
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5246 {
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5247 ngx_uint_t i;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5248 ngx_http_upstream_server_t *us;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5249 ngx_http_upstream_srv_conf_t uscf, *uscfp;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5250 ngx_http_upstream_main_conf_t *umcf;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5251
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5252 if (!(flags & NGX_HTTP_UPSTREAM_CREATE)) {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5253
1559 fe11e2a3946d use pool instead of ngx_conf_t Igor Sysoev <igor@sysoev.ru> parents: 1558 diff changeset	5254 if (ngx_parse_url(cf->pool, u) != NGX_OK) {
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5255 if (u->err) {
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5256 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5257 "%s in upstream \"%V\"", u->err, &u->url);
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5258 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5259
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5260 return NULL;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5261 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5262 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5263
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5264 umcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_upstream_module);
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5265
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5266 uscfp = umcf->upstreams.elts;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5267
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5268 for (i = 0; i < umcf->upstreams.nelts; i++) {
906 a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	5269
a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	5270 if (uscfp[i]->host.len != u->host.len
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5271 \|\| ngx_strncasecmp(uscfp[i]->host.data, u->host.data, u->host.len)
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5272 != 0)
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5273 {
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5274 continue;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5275 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5276
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5277 if ((flags & NGX_HTTP_UPSTREAM_CREATE)
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5278 && (uscfp[i]->flags & NGX_HTTP_UPSTREAM_CREATE))
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5279 {
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5280 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5281 "duplicate upstream \"%V\"", &u->host);
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5282 return NULL;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5283 }
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5284
5005 c9059bd5445b Fixed "proxy_pass" with IP address and no port (ticket #276). Ruslan Ermilov <ru@nginx.com> parents: 4990 diff changeset	5285 if ((uscfp[i]->flags & NGX_HTTP_UPSTREAM_CREATE) && !u->no_port) {
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5286 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
906 a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	5287 "upstream \"%V\" may not have port %d",
a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	5288 &u->host, u->port);
a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	5289 return NULL;
a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	5290 }
a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	5291
5005 c9059bd5445b Fixed "proxy_pass" with IP address and no port (ticket #276). Ruslan Ermilov <ru@nginx.com> parents: 4990 diff changeset	5292 if ((flags & NGX_HTTP_UPSTREAM_CREATE) && !uscfp[i]->no_port) {
906 a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	5293 ngx_log_error(NGX_LOG_WARN, cf->log, 0,
a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	5294 "upstream \"%V\" may not have port %d in %s:%ui",
a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	5295 &u->host, uscfp[i]->port,
1489 56f1ea5baabb u_char* is enough to keep file name Igor Sysoev <igor@sysoev.ru> parents: 1469 diff changeset	5296 uscfp[i]->file_name, uscfp[i]->line);
906 a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	5297 return NULL;
a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	5298 }
a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	5299
5005 c9059bd5445b Fixed "proxy_pass" with IP address and no port (ticket #276). Ruslan Ermilov <ru@nginx.com> parents: 4990 diff changeset	5300 if (uscfp[i]->port && u->port
c9059bd5445b Fixed "proxy_pass" with IP address and no port (ticket #276). Ruslan Ermilov <ru@nginx.com> parents: 4990 diff changeset	5301 && uscfp[i]->port != u->port)
c9059bd5445b Fixed "proxy_pass" with IP address and no port (ticket #276). Ruslan Ermilov <ru@nginx.com> parents: 4990 diff changeset	5302 {
906 a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	5303 continue;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5304 }
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5305
1340 32cdba6f2ec1 fix case when two directives Igor Sysoev <igor@sysoev.ru> parents: 1295 diff changeset	5306 if (uscfp[i]->default_port && u->default_port
32cdba6f2ec1 fix case when two directives Igor Sysoev <igor@sysoev.ru> parents: 1295 diff changeset	5307 && uscfp[i]->default_port != u->default_port)
32cdba6f2ec1 fix case when two directives Igor Sysoev <igor@sysoev.ru> parents: 1295 diff changeset	5308 {
32cdba6f2ec1 fix case when two directives Igor Sysoev <igor@sysoev.ru> parents: 1295 diff changeset	5309 continue;
32cdba6f2ec1 fix case when two directives Igor Sysoev <igor@sysoev.ru> parents: 1295 diff changeset	5310 }
32cdba6f2ec1 fix case when two directives Igor Sysoev <igor@sysoev.ru> parents: 1295 diff changeset	5311
4152 65c1c241d70e Better handling of late upstream creation. Maxim Dounin <mdounin@mdounin.ru> parents: 4151 diff changeset	5312 if (flags & NGX_HTTP_UPSTREAM_CREATE) {
65c1c241d70e Better handling of late upstream creation. Maxim Dounin <mdounin@mdounin.ru> parents: 4151 diff changeset	5313 uscfp[i]->flags = flags;
65c1c241d70e Better handling of late upstream creation. Maxim Dounin <mdounin@mdounin.ru> parents: 4151 diff changeset	5314 }
65c1c241d70e Better handling of late upstream creation. Maxim Dounin <mdounin@mdounin.ru> parents: 4151 diff changeset	5315
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5316 return uscfp[i];
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5317 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5318
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5319 uscf = ngx_pcalloc(cf->pool, sizeof(ngx_http_upstream_srv_conf_t));
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5320 if (uscf == NULL) {
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5321 return NULL;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5322 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5323
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5324 uscf->flags = flags;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5325 uscf->host = u->host;
1489 56f1ea5baabb u_char* is enough to keep file name Igor Sysoev <igor@sysoev.ru> parents: 1469 diff changeset	5326 uscf->file_name = cf->conf_file->file.name.data;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5327 uscf->line = cf->conf_file->line;
906 a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	5328 uscf->port = u->port;
a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	5329 uscf->default_port = u->default_port;
5005 c9059bd5445b Fixed "proxy_pass" with IP address and no port (ticket #276). Ruslan Ermilov <ru@nginx.com> parents: 4990 diff changeset	5330 uscf->no_port = u->no_port;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5331
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5332 if (u->naddrs == 1) {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5333 uscf->servers = ngx_array_create(cf->pool, 1,
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5334 sizeof(ngx_http_upstream_server_t));
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5335 if (uscf->servers == NULL) {
4765 c48902a053d6 ngx_http_upstream_add() should return NULL if an error occurs. Ruslan Ermilov <ru@nginx.com> parents: 4650 diff changeset	5336 return NULL;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5337 }
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5338
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5339 us = ngx_array_push(uscf->servers);
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5340 if (us == NULL) {
4765 c48902a053d6 ngx_http_upstream_add() should return NULL if an error occurs. Ruslan Ermilov <ru@nginx.com> parents: 4650 diff changeset	5341 return NULL;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5342 }
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5343
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5344 ngx_memzero(us, sizeof(ngx_http_upstream_server_t));
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5345
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5346 us->addrs = u->addrs;
4766 284cb8fb0741 Slight optimization in ngx_http_upstream_add(): replaced an expression Ruslan Ermilov <ru@nginx.com> parents: 4765 diff changeset	5347 us->naddrs = 1;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5348 }
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5349
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5350 uscfp = ngx_array_push(&umcf->upstreams);
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5351 if (uscfp == NULL) {
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5352 return NULL;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5353 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5354
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5355 *uscfp = uscf;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5356
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5357 return uscf;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5358 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5359
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5360
3271 fcd98af88df3 proxy_bind, fastcgi_bind, and memcached_bind Igor Sysoev <igor@sysoev.ru> parents: 3198 diff changeset	5361 char *
3399 ac9c0380337d fix typo Igor Sysoev <igor@sysoev.ru> parents: 3369 diff changeset	5362 ngx_http_upstream_bind_set_slot(ngx_conf_t cf, ngx_command_t cmd,
3271 fcd98af88df3 proxy_bind, fastcgi_bind, and memcached_bind Igor Sysoev <igor@sysoev.ru> parents: 3198 diff changeset	5363 void *conf)
fcd98af88df3 proxy_bind, fastcgi_bind, and memcached_bind Igor Sysoev <igor@sysoev.ru> parents: 3198 diff changeset	5364 {
fcd98af88df3 proxy_bind, fastcgi_bind, and memcached_bind Igor Sysoev <igor@sysoev.ru> parents: 3198 diff changeset	5365 char *p = conf;
fcd98af88df3 proxy_bind, fastcgi_bind, and memcached_bind Igor Sysoev <igor@sysoev.ru> parents: 3198 diff changeset	5366
5008 fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5367 ngx_int_t rc;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5368 ngx_str_t *value;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5369 ngx_http_complex_value_t cv;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5370 ngx_http_upstream_local_t *plocal, local;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5371 ngx_http_compile_complex_value_t ccv;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5372
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5373 plocal = (ngx_http_upstream_local_t **) (p + cmd->offset);
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5374
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5375 if (*plocal != NGX_CONF_UNSET_PTR) {
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5376 return "is duplicate";
3271 fcd98af88df3 proxy_bind, fastcgi_bind, and memcached_bind Igor Sysoev <igor@sysoev.ru> parents: 3198 diff changeset	5377 }
fcd98af88df3 proxy_bind, fastcgi_bind, and memcached_bind Igor Sysoev <igor@sysoev.ru> parents: 3198 diff changeset	5378
3272 98f49b2bcae8 change ngx_parse_addr() interface Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	5379 value = cf->args->elts;
98f49b2bcae8 change ngx_parse_addr() interface Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	5380
5008 fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5381 if (ngx_strcmp(value[1].data, "off") == 0) {
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5382 *plocal = NULL;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5383 return NGX_CONF_OK;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5384 }
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5385
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5386 ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5387
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5388 ccv.cf = cf;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5389 ccv.value = &value[1];
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5390 ccv.complex_value = &cv;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5391
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5392 if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5393 return NGX_CONF_ERROR;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5394 }
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5395
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5396 local = ngx_pcalloc(cf->pool, sizeof(ngx_http_upstream_local_t));
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5397 if (local == NULL) {
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5398 return NGX_CONF_ERROR;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5399 }
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5400
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5401 *plocal = local;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5402
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5403 if (cv.lengths) {
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5404 local->value = ngx_palloc(cf->pool, sizeof(ngx_http_complex_value_t));
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5405 if (local->value == NULL) {
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5406 return NGX_CONF_ERROR;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5407 }
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5408
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5409 *local->value = cv;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5410
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5411 return NGX_CONF_OK;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5412 }
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5413
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5414 local->addr = ngx_palloc(cf->pool, sizeof(ngx_addr_t));
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5415 if (local->addr == NULL) {
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5416 return NGX_CONF_ERROR;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5417 }
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5418
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5419 rc = ngx_parse_addr(cf->pool, local->addr, value[1].data, value[1].len);
3272 98f49b2bcae8 change ngx_parse_addr() interface Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	5420
98f49b2bcae8 change ngx_parse_addr() interface Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	5421 switch (rc) {
98f49b2bcae8 change ngx_parse_addr() interface Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	5422 case NGX_OK:
5008 fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5423 local->addr->name = value[1];
3272 98f49b2bcae8 change ngx_parse_addr() interface Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	5424 return NGX_CONF_OK;
98f49b2bcae8 change ngx_parse_addr() interface Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	5425
98f49b2bcae8 change ngx_parse_addr() interface Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	5426 case NGX_DECLINED:
98f49b2bcae8 change ngx_parse_addr() interface Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	5427 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
98f49b2bcae8 change ngx_parse_addr() interface Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	5428 "invalid address \"%V\"", &value[1]);
4546 4988fa232629 For the sake of case/switch code readability, 'fall through' Maxim Konovalov <maxim@nginx.com> parents: 4499 diff changeset	5429 /* fall through */
4988fa232629 For the sake of case/switch code readability, 'fall through' Maxim Konovalov <maxim@nginx.com> parents: 4499 diff changeset	5430
3272 98f49b2bcae8 change ngx_parse_addr() interface Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	5431 default:
98f49b2bcae8 change ngx_parse_addr() interface Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	5432 return NGX_CONF_ERROR;
98f49b2bcae8 change ngx_parse_addr() interface Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	5433 }
3271 fcd98af88df3 proxy_bind, fastcgi_bind, and memcached_bind Igor Sysoev <igor@sysoev.ru> parents: 3198 diff changeset	5434 }
fcd98af88df3 proxy_bind, fastcgi_bind, and memcached_bind Igor Sysoev <igor@sysoev.ru> parents: 3198 diff changeset	5435
fcd98af88df3 proxy_bind, fastcgi_bind, and memcached_bind Igor Sysoev <igor@sysoev.ru> parents: 3198 diff changeset	5436
5008 fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5437 static ngx_addr_t *
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5438 ngx_http_upstream_get_local(ngx_http_request_t *r,
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5439 ngx_http_upstream_local_t *local)
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5440 {
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5441 ngx_int_t rc;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5442 ngx_str_t val;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5443 ngx_addr_t *addr;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5444
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5445 if (local == NULL) {
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5446 return NULL;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5447 }
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5448
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5449 if (local->value == NULL) {
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5450 return local->addr;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5451 }
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5452
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5453 if (ngx_http_complex_value(r, local->value, &val) != NGX_OK) {
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5454 return NULL;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5455 }
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5456
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5457 if (val.len == 0) {
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5458 return NULL;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5459 }
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5460
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5461 addr = ngx_palloc(r->pool, sizeof(ngx_addr_t));
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5462 if (addr == NULL) {
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5463 return NULL;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5464 }
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5465
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5466 rc = ngx_parse_addr(r->pool, addr, val.data, val.len);
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5467
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5468 switch (rc) {
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5469 case NGX_OK:
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5470 addr->name = val;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5471 return addr;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5472
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5473 case NGX_DECLINED:
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5474 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5475 "invalid local address \"%V\"", &val);
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5476 /* fall through */
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5477
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5478 default:
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5479 return NULL;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5480 }
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5481 }
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5482
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5483
4328 d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5484 char *
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5485 ngx_http_upstream_param_set_slot(ngx_conf_t cf, ngx_command_t cmd,
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5486 void *conf)
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5487 {
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5488 char *p = conf;
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5489
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5490 ngx_str_t *value;
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5491 ngx_array_t **a;
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5492 ngx_http_upstream_param_t *param;
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5493
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5494 a = (ngx_array_t **) (p + cmd->offset);
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5495
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5496 if (*a == NULL) {
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5497 *a = ngx_array_create(cf->pool, 4, sizeof(ngx_http_upstream_param_t));
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5498 if (*a == NULL) {
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5499 return NGX_CONF_ERROR;
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5500 }
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5501 }
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5502
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5503 param = ngx_array_push(*a);
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5504 if (param == NULL) {
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5505 return NGX_CONF_ERROR;
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5506 }
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5507
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5508 value = cf->args->elts;
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5509
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5510 param->key = value[1];
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5511 param->value = value[2];
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5512 param->skip_empty = 0;
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5513
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5514 if (cf->args->nelts == 4) {
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5515 if (ngx_strcmp(value[3].data, "if_not_empty") != 0) {
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5516 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5517 "invalid parameter \"%V\"", &value[3]);
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5518 return NGX_CONF_ERROR;
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5519 }
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5520
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5521 param->skip_empty = 1;
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5522 }
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5523
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5524 return NGX_CONF_OK;
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5525 }
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5526
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5527
1701 40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5528 ngx_int_t
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5529 ngx_http_upstream_hide_headers_hash(ngx_conf_t *cf,
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5530 ngx_http_upstream_conf_t conf, ngx_http_upstream_conf_t prev,
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5531 ngx_str_t default_hide_headers, ngx_hash_init_t hash)
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5532 {
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5533 ngx_str_t *h;
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5534 ngx_uint_t i, j;
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5535 ngx_array_t hide_headers;
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5536 ngx_hash_key_t *hk;
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5537
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5538 if (conf->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	5539 && conf->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	5540 {
4769 f88555d76886 Upstream: hide_headers/pass_headers inheritance fix. Maxim Dounin <mdounin@mdounin.ru> parents: 4766 diff changeset	5541 conf->hide_headers = prev->hide_headers;
f88555d76886 Upstream: hide_headers/pass_headers inheritance fix. Maxim Dounin <mdounin@mdounin.ru> parents: 4766 diff changeset	5542 conf->pass_headers = prev->pass_headers;
f88555d76886 Upstream: hide_headers/pass_headers inheritance fix. Maxim Dounin <mdounin@mdounin.ru> parents: 4766 diff changeset	5543
1701 40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5544 conf->hide_headers_hash = prev->hide_headers_hash;
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5545
2929 37b7cd336fdf inherit proxy_set_header, proxy_hide_header, and fastcgi_hide_header Igor Sysoev <igor@sysoev.ru> parents: 2927 diff changeset	5546 if (conf->hide_headers_hash.buckets
2949 fe484c0be7c0 fix building --without-http-cache, broken in r2930 Igor Sysoev <igor@sysoev.ru> parents: 2929 diff changeset	5547 #if (NGX_HTTP_CACHE)
fe484c0be7c0 fix building --without-http-cache, broken in r2930 Igor Sysoev <igor@sysoev.ru> parents: 2929 diff changeset	5548 && ((conf->cache == NULL) == (prev->cache == NULL))
fe484c0be7c0 fix building --without-http-cache, broken in r2930 Igor Sysoev <igor@sysoev.ru> parents: 2929 diff changeset	5549 #endif
fe484c0be7c0 fix building --without-http-cache, broken in r2930 Igor Sysoev <igor@sysoev.ru> parents: 2929 diff changeset	5550 )
2929 37b7cd336fdf inherit proxy_set_header, proxy_hide_header, and fastcgi_hide_header Igor Sysoev <igor@sysoev.ru> parents: 2927 diff changeset	5551 {
1701 40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5552 return NGX_OK;
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5553 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5554
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5555 } else {
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5556 if (conf->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	5557 conf->hide_headers = prev->hide_headers;
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5558 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5559
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5560 if (conf->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	5561 conf->pass_headers = prev->pass_headers;
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5562 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5563 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5564
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5565 if (ngx_array_init(&hide_headers, cf->temp_pool, 4, sizeof(ngx_hash_key_t))
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5566 != NGX_OK)
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5567 {
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5568 return NGX_ERROR;
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5569 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5570
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5571 for (h = default_hide_headers; h->len; h++) {
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5572 hk = ngx_array_push(&hide_headers);
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5573 if (hk == NULL) {
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5574 return NGX_ERROR;
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5575 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5576
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5577 hk->key = *h;
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5578 hk->key_hash = ngx_hash_key_lc(h->data, h->len);
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5579 hk->value = (void *) 1;
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5580 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5581
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5582 if (conf->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	5583
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5584 h = conf->hide_headers->elts;
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5585
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5586 for (i = 0; i < conf->hide_headers->nelts; i++) {
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5587
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5588 hk = hide_headers.elts;
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5589
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5590 for (j = 0; j < hide_headers.nelts; j++) {
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5591 if (ngx_strcasecmp(h[i].data, hk[j].key.data) == 0) {
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5592 goto exist;
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5593 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5594 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5595
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5596 hk = ngx_array_push(&hide_headers);
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5597 if (hk == NULL) {
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5598 return NGX_ERROR;
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5599 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5600
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5601 hk->key = h[i];
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5602 hk->key_hash = ngx_hash_key_lc(h[i].data, h[i].len);
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5603 hk->value = (void *) 1;
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5604
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5605 exist:
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5606
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5607 continue;
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5608 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5609 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5610
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5611 if (conf->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	5612
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5613 h = conf->pass_headers->elts;
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5614 hk = hide_headers.elts;
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5615
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5616 for (i = 0; i < conf->pass_headers->nelts; i++) {
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5617 for (j = 0; j < hide_headers.nelts; j++) {
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5618
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5619 if (hk[j].key.data == NULL) {
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5620 continue;
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5621 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5622
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5623 if (ngx_strcasecmp(h[i].data, hk[j].key.data) == 0) {
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5624 hk[j].key.data = NULL;
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5625 break;
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5626 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5627 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5628 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5629 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5630
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5631 hash->hash = &conf->hide_headers_hash;
1706 9242e21d2f8d style fix: remove trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 1705 diff changeset	5632 hash->key = ngx_hash_key_lc;
1701 40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5633 hash->pool = cf->pool;
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5634 hash->temp_pool = NULL;
1706 9242e21d2f8d style fix: remove trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 1705 diff changeset	5635
1701 40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5636 return ngx_hash_init(hash, hide_headers.elts, hide_headers.nelts);
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5637 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5638
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5639
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5640 static void *
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5641 ngx_http_upstream_create_main_conf(ngx_conf_t *cf)
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5642 {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5643 ngx_http_upstream_main_conf_t *umcf;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5644
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5645 umcf = ngx_pcalloc(cf->pool, sizeof(ngx_http_upstream_main_conf_t));
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5646 if (umcf == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5647 return NULL;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5648 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5649
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5650 if (ngx_array_init(&umcf->upstreams, cf->pool, 4,
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5651 sizeof(ngx_http_upstream_srv_conf_t *))
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5652 != NGX_OK)
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5653 {
2912 c7d57b539248 return NULL instead of NGX_CONF_ERROR on a create conf failure Igor Sysoev <igor@sysoev.ru> parents: 2882 diff changeset	5654 return NULL;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5655 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5656
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5657 return umcf;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5658 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5659
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5660
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5661 static char *
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5662 ngx_http_upstream_init_main_conf(ngx_conf_t cf, void conf)
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5663 {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5664 ngx_http_upstream_main_conf_t *umcf = conf;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5665
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5666 ngx_uint_t i;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5667 ngx_array_t headers_in;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5668 ngx_hash_key_t *hk;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5669 ngx_hash_init_t hash;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5670 ngx_http_upstream_init_pt init;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5671 ngx_http_upstream_header_t *header;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5672 ngx_http_upstream_srv_conf_t **uscfp;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5673
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5674 uscfp = umcf->upstreams.elts;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5675
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5676 for (i = 0; i < umcf->upstreams.nelts; i++) {
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5677
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5678 init = uscfp[i]->peer.init_upstream ? uscfp[i]->peer.init_upstream:
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5679 ngx_http_upstream_init_round_robin;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5680
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5681 if (init(cf, uscfp[i]) != NGX_OK) {
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5682 return NGX_CONF_ERROR;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5683 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5684 }
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5685
663 6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 659 diff changeset	5686
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5687 /* upstream_headers_in_hash */
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5688
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5689 if (ngx_array_init(&headers_in, cf->temp_pool, 32, sizeof(ngx_hash_key_t))
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5690 != NGX_OK)
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5691 {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5692 return NGX_CONF_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5693 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5694
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5695 for (header = ngx_http_upstream_headers_in; header->name.len; header++) {
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5696 hk = ngx_array_push(&headers_in);
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5697 if (hk == NULL) {
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5698 return NGX_CONF_ERROR;
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5699 }
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5700
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5701 hk->key = header->name;
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5702 hk->key_hash = ngx_hash_key_lc(header->name.data, header->name.len);
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5703 hk->value = header;
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5704 }
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5705
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5706 hash.hash = &umcf->headers_in_hash;
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5707 hash.key = ngx_hash_key_lc;
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5708 hash.max_size = 512;
751 bae59a740c40 align hash bucket size to cache line Igor Sysoev <igor@sysoev.ru> parents: 750 diff changeset	5709 hash.bucket_size = ngx_align(64, ngx_cacheline_size);
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5710 hash.name = "upstream_headers_in_hash";
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5711 hash.pool = cf->pool;
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5712 hash.temp_pool = NULL;
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5713
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5714 if (ngx_hash_init(&hash, headers_in.elts, headers_in.nelts) != NGX_OK) {
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5715 return NGX_CONF_ERROR;
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5716 }
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5717
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5718 return NGX_CONF_OK;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5719 }

Mercurial > hg > nginx-quic

annotate src/http/ngx_http_upstream.c @ 5937:5b9f711dc819