nginx: src/http/ngx_http_upstream.c annotate

annotate src/http/ngx_http_upstream.c @ 6292:f72d3129cd35

HTTP/2: fixed handling of output HEADERS frames. The HEADERS frame is always represented by more than one buffer since b930e598a199, but the handling code hasn't been adjusted. Only the first buffer of HEADERS frame was checked and if it had been sent while others had not, the rest of the frame was dropped, resulting in broken connection. Before b930e598a199, the problem could only be seen in case of HEADERS frame with CONTINUATION.

author	Valentin Bartenev <vbart@nginx.com>
date	Fri, 13 Nov 2015 20:10:50 +0300
parents	4d5ac1a31d44
children	a93345ee8f52

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);
5951 610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	16 static ngx_int_t ngx_http_upstream_cache_get(ngx_http_request_t *r,
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	17 ngx_http_upstream_t u, ngx_http_file_cache_t *cache);
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	18 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	19 ngx_http_upstream_t *u);
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	20 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	21 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	22 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	23 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	24 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	25 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	26 #endif
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	27
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	28 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	29 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	30 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	31 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	32 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	33 ngx_event_t *ev);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	34 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	35 ngx_http_upstream_t *u);
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	36 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	37 ngx_http_upstream_t *u);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	38 static void ngx_http_upstream_send_request(ngx_http_request_t *r,
6050 a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	39 ngx_http_upstream_t *u, ngx_uint_t do_write);
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	40 static ngx_int_t ngx_http_upstream_send_request_body(ngx_http_request_t *r,
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	41 ngx_http_upstream_t *u, ngx_uint_t do_write);
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	42 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	43 ngx_http_upstream_t *u);
6050 a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	44 static void ngx_http_upstream_read_request_handler(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	45 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	46 ngx_http_upstream_t *u);
2268 33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	47 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	48 ngx_http_upstream_t *u);
2267 920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	49 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	50 ngx_http_upstream_t *u);
1153 c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	51 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	52 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	53 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	54 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	55 ngx_http_upstream_t *u);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	56 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	57 ngx_http_upstream_t *u);
5072 7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	58 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	59 ngx_http_upstream_t *u);
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	60 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	61 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	62 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	63 ngx_http_upstream_t *u);
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	64 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	65 ngx_http_upstream_t *u);
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	66 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	67 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	68 static void
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	69 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	70 static void
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	71 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	72 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	73 static void
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	74 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	75 ngx_uint_t do_write);
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	76 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	77 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	78 ssize_t bytes);
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	79 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	80 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	81 ngx_http_upstream_t *u);
5995 5f179f344096 Upstream: upstream argument in ngx_http_upstream_process_request(). Maxim Dounin <mdounin@mdounin.ru> parents: 5994 diff changeset	82 static void ngx_http_upstream_process_request(ngx_http_request_t *r,
5f179f344096 Upstream: upstream argument in ngx_http_upstream_process_request(). Maxim Dounin <mdounin@mdounin.ru> parents: 5994 diff changeset	83 ngx_http_upstream_t *u);
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	84 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	85 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	86 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	87 ngx_http_upstream_t *u);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	88 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	89 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	90 static void ngx_http_upstream_cleanup(void *data);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	91 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	92 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	93
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	94 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	95 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	96 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	97 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	98 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	99 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	100 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	101 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	102 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	103 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	104 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	105 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	106 ngx_table_elt_t *h, ngx_uint_t offset);
2666 81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	107 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	108 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	109 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	110 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	111 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	112 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	113 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	114 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	115 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	116 ngx_table_elt_t *h, ngx_uint_t offset);
4124 0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	117 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	118 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	119 static ngx_int_t
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	120 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	121 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	122 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	123 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	124 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	125 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	126 static ngx_int_t
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	127 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	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_copy_content_type(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);
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	131 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	132 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	133 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	134 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	135 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	136 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	137 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	138 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	139 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	140 ngx_table_elt_t *h, ngx_uint_t offset);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	141
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	142 #if (NGX_HTTP_GZIP)
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	143 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	144 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	145 #endif
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	146
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	147 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	148 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	149 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 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	151 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	152 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	153 ngx_http_variable_value_t *v, uintptr_t data);
2402 cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	154 static ngx_int_t ngx_http_upstream_response_length_variable(
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	155 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	156
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	157 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	158 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	159 void *conf);
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	160
5008 fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	161 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	162 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	163
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	164 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	165 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	166
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	167 #if (NGX_HTTP_SSL)
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	168 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	169 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	170 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	171 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	172 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	173 #endif
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	174
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	175
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	176 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	177
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	178 { ngx_string("Status"),
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	179 ngx_http_upstream_process_header_line,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	180 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	181 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	182
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	183 { ngx_string("Content-Type"),
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	184 ngx_http_upstream_process_header_line,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	185 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	186 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	187
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	188 { ngx_string("Content-Length"),
5731 02674312be45 Upstream: removed unused offset to content_length. Maxim Dounin <mdounin@mdounin.ru> parents: 5730 diff changeset	189 ngx_http_upstream_process_content_length, 0,
4117 103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	190 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	191
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	192 { ngx_string("Date"),
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	193 ngx_http_upstream_process_header_line,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	194 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	195 ngx_http_upstream_copy_header_line,
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	196 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	197
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	198 { ngx_string("Last-Modified"),
5732 d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	199 ngx_http_upstream_process_last_modified, 0,
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	200 ngx_http_upstream_copy_last_modified, 0, 0 },
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	201
3037 0278f13b04c5 process upstream ETag header Igor Sysoev <igor@sysoev.ru> parents: 3032 diff changeset	202 { ngx_string("ETag"),
0278f13b04c5 process upstream ETag header Igor Sysoev <igor@sysoev.ru> parents: 3032 diff changeset	203 ngx_http_upstream_process_header_line,
0278f13b04c5 process upstream ETag header Igor Sysoev <igor@sysoev.ru> parents: 3032 diff changeset	204 offsetof(ngx_http_upstream_headers_in_t, etag),
0278f13b04c5 process upstream ETag header Igor Sysoev <igor@sysoev.ru> parents: 3032 diff changeset	205 ngx_http_upstream_copy_header_line,
0278f13b04c5 process upstream ETag header Igor Sysoev <igor@sysoev.ru> parents: 3032 diff changeset	206 offsetof(ngx_http_headers_out_t, etag), 0 },
0278f13b04c5 process upstream ETag header Igor Sysoev <igor@sysoev.ru> parents: 3032 diff changeset	207
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	208 { ngx_string("Server"),
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	209 ngx_http_upstream_process_header_line,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	210 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	211 ngx_http_upstream_copy_header_line,
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	212 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	213
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	214 { ngx_string("WWW-Authenticate"),
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	215 ngx_http_upstream_process_header_line,
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	216 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	217 ngx_http_upstream_copy_header_line, 0, 0 },
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	218
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	219 { ngx_string("Location"),
2140 dce5ddef5af9 if upstream sent a location header without status use 302 Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	220 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	221 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	222 ngx_http_upstream_rewrite_location, 0, 0 },
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	223
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	224 { ngx_string("Refresh"),
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	225 ngx_http_upstream_ignore_header_line, 0,
515 417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	226 ngx_http_upstream_rewrite_refresh, 0, 0 },
417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	227
417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	228 { ngx_string("Set-Cookie"),
5677 3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	229 ngx_http_upstream_process_set_cookie,
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	230 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	231 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	232
c3bd8cdabb8f nginx-0.1.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	233 { ngx_string("Content-Disposition"),
c3bd8cdabb8f nginx-0.1.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	234 ngx_http_upstream_ignore_header_line, 0,
c3bd8cdabb8f nginx-0.1.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	235 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	236
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	237 { 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	238 ngx_http_upstream_process_cache_control, 0,
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	239 ngx_http_upstream_copy_multi_header_lines,
515 417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	240 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	241
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	242 { ngx_string("Expires"),
2666 81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	243 ngx_http_upstream_process_expires, 0,
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	244 ngx_http_upstream_copy_header_line,
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	245 offsetof(ngx_http_headers_out_t, expires), 1 },
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	246
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	247 { ngx_string("Accept-Ranges"),
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	248 ngx_http_upstream_process_header_line,
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	249 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	250 ngx_http_upstream_copy_allow_ranges,
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	251 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	252
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	253 { ngx_string("Connection"),
4124 0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	254 ngx_http_upstream_process_connection, 0,
515 417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	255 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	256
641 5e8fb59c18c1 nginx-0.3.42-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	257 { ngx_string("Keep-Alive"),
5e8fb59c18c1 nginx-0.3.42-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	258 ngx_http_upstream_ignore_header_line, 0,
5e8fb59c18c1 nginx-0.3.42-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	259 ngx_http_upstream_ignore_header_line, 0, 0 },
5e8fb59c18c1 nginx-0.3.42-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	260
5877 60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	261 { ngx_string("Vary"),
60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	262 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	263 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	264
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	265 { ngx_string("X-Powered-By"),
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	266 ngx_http_upstream_ignore_header_line, 0,
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	267 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	268
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	269 { ngx_string("X-Accel-Expires"),
2664 f903114355d4 zero field Igor Sysoev <igor@sysoev.ru> parents: 2663 diff changeset	270 ngx_http_upstream_process_accel_expires, 0,
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	271 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	272
417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	273 { ngx_string("X-Accel-Redirect"),
417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	274 ngx_http_upstream_process_header_line,
417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	275 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	276 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	277
527 7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	278 { ngx_string("X-Accel-Limit-Rate"),
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	279 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	280 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	281
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	282 { ngx_string("X-Accel-Buffering"),
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	283 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	284 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	285
657 400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	286 { ngx_string("X-Accel-Charset"),
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	287 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	288 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	289
4123 0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	290 { ngx_string("Transfer-Encoding"),
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	291 ngx_http_upstream_process_transfer_encoding, 0,
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	292 ngx_http_upstream_ignore_header_line, 0, 0 },
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	293
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	294 #if (NGX_HTTP_GZIP)
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	295 { ngx_string("Content-Encoding"),
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	296 ngx_http_upstream_process_header_line,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	297 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	298 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	299 #endif
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	300
515 417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	301 { 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	302 };
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	303
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	304
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	305 static ngx_command_t ngx_http_upstream_commands[] = {
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	306
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	307 { ngx_string("upstream"),
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	308 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	309 ngx_http_upstream,
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	310 0,
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	311 0,
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	312 NULL },
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	313
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	314 { ngx_string("server"),
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	315 NGX_HTTP_UPS_CONF\|NGX_CONF_1MORE,
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	316 ngx_http_upstream_server,
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	317 NGX_HTTP_SRV_CONF_OFFSET,
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	318 0,
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	319 NULL },
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	320
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	321 ngx_null_command
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	322 };
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	323
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	324
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	325 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	326 ngx_http_upstream_add_variables, /* preconfiguration */
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	327 NULL, /* postconfiguration */
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	328
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	329 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	330 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	331
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	332 NULL, /* create server configuration */
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	333 NULL, /* merge server configuration */
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	334
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	335 NULL, /* create location configuration */
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	336 NULL /* merge location configuration */
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	337 };
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	338
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	339
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	340 ngx_module_t ngx_http_upstream_module = {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	341 NGX_MODULE_V1,
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	342 &ngx_http_upstream_module_ctx, /* module context */
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	343 ngx_http_upstream_commands, /* module directives */
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	344 NGX_HTTP_MODULE, /* module type */
541 b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 537 diff changeset	345 NULL, /* init master */
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	346 NULL, /* init module */
541 b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 537 diff changeset	347 NULL, /* init process */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 537 diff changeset	348 NULL, /* init thread */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 537 diff changeset	349 NULL, /* exit thread */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 537 diff changeset	350 NULL, /* exit process */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 537 diff changeset	351 NULL, /* exit master */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 537 diff changeset	352 NGX_MODULE_V1_PADDING
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	353 };
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	354
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	355
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	356 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	357
1181 ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	358 { 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	359 ngx_http_upstream_addr_variable, 0,
3898 bd1222fb0192 allow to use $upstream_... variables in SSI Igor Sysoev <igor@sysoev.ru> parents: 3879 diff changeset	360 NGX_HTTP_VAR_NOCACHEABLE, 0 },
1181 ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	361
637 e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 629 diff changeset	362 { 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	363 ngx_http_upstream_status_variable, 0,
3898 bd1222fb0192 allow to use $upstream_... variables in SSI Igor Sysoev <igor@sysoev.ru> parents: 3879 diff changeset	364 NGX_HTTP_VAR_NOCACHEABLE, 0 },
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	365
6147 74b6ef56ea56 Upstream: $upstream_connect_time. Ruslan Ermilov <ru@nginx.com> parents: 6146 diff changeset	366 { ngx_string("upstream_connect_time"), NULL,
74b6ef56ea56 Upstream: $upstream_connect_time. Ruslan Ermilov <ru@nginx.com> parents: 6146 diff changeset	367 ngx_http_upstream_response_time_variable, 2,
74b6ef56ea56 Upstream: $upstream_connect_time. Ruslan Ermilov <ru@nginx.com> parents: 6146 diff changeset	368 NGX_HTTP_VAR_NOCACHEABLE, 0 },
74b6ef56ea56 Upstream: $upstream_connect_time. Ruslan Ermilov <ru@nginx.com> parents: 6146 diff changeset	369
5964 0a198a517eaf Upstream: $upstream_header_time variable. Vladimir Homutov <vl@nginx.com> parents: 5960 diff changeset	370 { ngx_string("upstream_header_time"), NULL,
0a198a517eaf Upstream: $upstream_header_time variable. Vladimir Homutov <vl@nginx.com> parents: 5960 diff changeset	371 ngx_http_upstream_response_time_variable, 1,
0a198a517eaf Upstream: $upstream_header_time variable. Vladimir Homutov <vl@nginx.com> parents: 5960 diff changeset	372 NGX_HTTP_VAR_NOCACHEABLE, 0 },
0a198a517eaf Upstream: $upstream_header_time variable. Vladimir Homutov <vl@nginx.com> parents: 5960 diff changeset	373
637 e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 629 diff changeset	374 { 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	375 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	376 NGX_HTTP_VAR_NOCACHEABLE, 0 },
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	377
2402 cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	378 { ngx_string("upstream_response_length"), NULL,
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	379 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	380 NGX_HTTP_VAR_NOCACHEABLE, 0 },
2402 cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	381
2957 b4f39842523b fix building --without-http-cache, broken in r2953 Igor Sysoev <igor@sysoev.ru> parents: 2953 diff changeset	382 #if (NGX_HTTP_CACHE)
b4f39842523b fix building --without-http-cache, broken in r2953 Igor Sysoev <igor@sysoev.ru> parents: 2953 diff changeset	383
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	384 { ngx_string("upstream_cache_status"), NULL,
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	385 ngx_http_upstream_cache_status, 0,
3898 bd1222fb0192 allow to use $upstream_... variables in SSI Igor Sysoev <igor@sysoev.ru> parents: 3879 diff changeset	386 NGX_HTTP_VAR_NOCACHEABLE, 0 },
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	387
5441 43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	388 { ngx_string("upstream_cache_last_modified"), NULL,
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	389 ngx_http_upstream_cache_last_modified, 0,
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	390 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	391
5738 c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	392 { ngx_string("upstream_cache_etag"), NULL,
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	393 ngx_http_upstream_cache_etag, 0,
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	394 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	395
2957 b4f39842523b fix building --without-http-cache, broken in r2953 Igor Sysoev <igor@sysoev.ru> parents: 2953 diff changeset	396 #endif
b4f39842523b fix building --without-http-cache, broken in r2953 Igor Sysoev <igor@sysoev.ru> parents: 2953 diff changeset	397
637 e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 629 diff changeset	398 { 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	399 };
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	400
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	401
2268 33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	402 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	403 { 500, NGX_HTTP_UPSTREAM_FT_HTTP_500 },
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	404 { 502, NGX_HTTP_UPSTREAM_FT_HTTP_502 },
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	405 { 503, NGX_HTTP_UPSTREAM_FT_HTTP_503 },
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	406 { 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	407 { 403, NGX_HTTP_UPSTREAM_FT_HTTP_403 },
2268 33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	408 { 404, NGX_HTTP_UPSTREAM_FT_HTTP_404 },
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	409 { 0, 0 }
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	410 };
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	411
2875 6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2874 diff changeset	412
6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2874 diff changeset	413 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	414 { ngx_string("GET"), NGX_HTTP_GET},
6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2874 diff changeset	415 { ngx_string("HEAD"), NGX_HTTP_HEAD },
6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2874 diff changeset	416 { ngx_string("POST"), NGX_HTTP_POST },
6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2874 diff changeset	417 { ngx_null_string, 0 }
6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2874 diff changeset	418 };
6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2874 diff changeset	419
6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2874 diff changeset	420
3667 12bd9e26fadb use shared ngx_http_upstream_ignore_headers_masks[] Igor Sysoev <igor@sysoev.ru> parents: 3527 diff changeset	421 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	422 { 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	423 { 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	424 { 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	425 { 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	426 { 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	427 { 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	428 { 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	429 { 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	430 { 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	431 { ngx_null_string, 0 }
12bd9e26fadb use shared ngx_http_upstream_ignore_headers_masks[] Igor Sysoev <igor@sysoev.ru> parents: 3527 diff changeset	432 };
12bd9e26fadb use shared ngx_http_upstream_ignore_headers_masks[] Igor Sysoev <igor@sysoev.ru> parents: 3527 diff changeset	433
12bd9e26fadb use shared ngx_http_upstream_ignore_headers_masks[] Igor Sysoev <igor@sysoev.ru> parents: 3527 diff changeset	434
3006 95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	435 ngx_int_t
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	436 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	437 {
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	438 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	439
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	440 u = r->upstream;
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	441
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	442 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	443 r->main->count++;
3006 95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	444 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	445 }
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	446
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	447 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	448 if (u == NULL) {
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	449 return NGX_ERROR;
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	450 }
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	451
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	452 r->upstream = u;
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	453
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	454 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	455 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	456
3056 d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	457 #if (NGX_HTTP_CACHE)
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	458 r->cache = NULL;
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	459 #endif
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	460
4117 103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	461 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	462 u->headers_in.last_modified_time = -1;
4117 103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	463
3006 95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	464 return NGX_OK;
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	465 }
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	466
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	467
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	468 void
31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	469 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	470 {
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	471 ngx_connection_t *c;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	472
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	473 c = r->connection;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	474
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	475 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	476 "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	477
6246 257b51c37c5a The HTTP/2 implementation (RFC 7240, 7241). Valentin Bartenev <vbart@nginx.com> parents: 6242 diff changeset	478 #if (NGX_HTTP_V2)
257b51c37c5a The HTTP/2 implementation (RFC 7240, 7241). Valentin Bartenev <vbart@nginx.com> parents: 6242 diff changeset	479 if (r->stream) {
5121 c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: 5113 diff changeset	480 ngx_http_upstream_init_request(r);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: 5113 diff changeset	481 return;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: 5113 diff changeset	482 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: 5113 diff changeset	483 #endif
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: 5113 diff changeset	484
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	485 if (c->read->timer_set) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	486 ngx_del_timer(c->read);
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 if (ngx_event_flags & NGX_USE_CLEAR_EVENT) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	490
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	491 if (!c->write->active) {
531 c3bd8cdabb8f nginx-0.1.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	492 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	493 == NGX_ERROR)
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	494 {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	495 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	496 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	497 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	498 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	499 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	500
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	501 ngx_http_upstream_init_request(r);
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	502 }
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	503
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	504
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	505 static void
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	506 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	507 {
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	508 ngx_str_t *host;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	509 ngx_uint_t i;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	510 ngx_resolver_ctx_t *ctx, temp;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	511 ngx_http_cleanup_t *cln;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	512 ngx_http_upstream_t *u;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	513 ngx_http_core_loc_conf_t *clcf;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	514 ngx_http_upstream_srv_conf_t uscf, *uscfp;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	515 ngx_http_upstream_main_conf_t *umcf;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	516
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	517 if (r->aio) {
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	518 return;
537 c9ad0d9c7d59 nginx-0.1.43-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 531 diff changeset	519 }
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	520
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	521 u = r->upstream;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	522
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	523 #if (NGX_HTTP_CACHE)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	524
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	525 if (u->conf->cache) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	526 ngx_int_t rc;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	527
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	528 rc = ngx_http_upstream_cache(r, u);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	529
3055 92b6cfaa3c27 fix sending a cached file using AIO Igor Sysoev <igor@sysoev.ru> parents: 3053 diff changeset	530 if (rc == NGX_BUSY) {
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	531 r->write_event_handler = ngx_http_upstream_init_request;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	532 return;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	533 }
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	534
3055 92b6cfaa3c27 fix sending a cached file using AIO Igor Sysoev <igor@sysoev.ru> parents: 3053 diff changeset	535 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	536
5827 54e9b83d00f0 Upstream: avoided directly terminating the connection. FengGu <flygoast@126.com> parents: 5818 diff changeset	537 if (rc == NGX_ERROR) {
54e9b83d00f0 Upstream: avoided directly terminating the connection. FengGu <flygoast@126.com> parents: 5818 diff changeset	538 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	539 return;
54e9b83d00f0 Upstream: avoided directly terminating the connection. FengGu <flygoast@126.com> parents: 5818 diff changeset	540 }
54e9b83d00f0 Upstream: avoided directly terminating the connection. FengGu <flygoast@126.com> parents: 5818 diff changeset	541
6242 0e3a45ec2a3a Upstream: fixed cache send error handling. Roman Arutyunyan <arut@nginx.com> parents: 6180 diff changeset	542 if (rc == NGX_OK) {
0e3a45ec2a3a Upstream: fixed cache send error handling. Roman Arutyunyan <arut@nginx.com> parents: 6180 diff changeset	543 rc = ngx_http_upstream_cache_send(r, u);
0e3a45ec2a3a Upstream: fixed cache send error handling. Roman Arutyunyan <arut@nginx.com> parents: 6180 diff changeset	544
0e3a45ec2a3a Upstream: fixed cache send error handling. Roman Arutyunyan <arut@nginx.com> parents: 6180 diff changeset	545 if (rc == NGX_DONE) {
0e3a45ec2a3a Upstream: fixed cache send error handling. Roman Arutyunyan <arut@nginx.com> parents: 6180 diff changeset	546 return;
0e3a45ec2a3a Upstream: fixed cache send error handling. Roman Arutyunyan <arut@nginx.com> parents: 6180 diff changeset	547 }
0e3a45ec2a3a Upstream: fixed cache send error handling. Roman Arutyunyan <arut@nginx.com> parents: 6180 diff changeset	548
0e3a45ec2a3a Upstream: fixed cache send error handling. Roman Arutyunyan <arut@nginx.com> parents: 6180 diff changeset	549 if (rc == NGX_HTTP_UPSTREAM_INVALID_HEADER) {
0e3a45ec2a3a Upstream: fixed cache send error handling. Roman Arutyunyan <arut@nginx.com> parents: 6180 diff changeset	550 rc = NGX_DECLINED;
0e3a45ec2a3a Upstream: fixed cache send error handling. Roman Arutyunyan <arut@nginx.com> parents: 6180 diff changeset	551 r->cached = 0;
0e3a45ec2a3a Upstream: fixed cache send error handling. Roman Arutyunyan <arut@nginx.com> parents: 6180 diff changeset	552 }
0e3a45ec2a3a Upstream: fixed cache send error handling. Roman Arutyunyan <arut@nginx.com> parents: 6180 diff changeset	553 }
0e3a45ec2a3a Upstream: fixed cache send error handling. Roman Arutyunyan <arut@nginx.com> parents: 6180 diff changeset	554
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	555 if (rc != NGX_DECLINED) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	556 ngx_http_finalize_request(r, rc);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	557 return;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	558 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	559 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	560
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	561 #endif
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	562
5947 d9025ea1f5a5 Upstream: simplified proxy_store and friends configuration code. Valentin Bartenev <vbart@nginx.com> parents: 5935 diff changeset	563 u->store = u->conf->store;
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	564
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	565 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	566 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	567 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	568 }
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	569
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	570 if (r->request_body) {
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	571 u->request_bufs = r->request_body->bufs;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	572 }
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	573
537 c9ad0d9c7d59 nginx-0.1.43-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 531 diff changeset	574 if (u->create_request(r) != NGX_OK) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	575 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	576 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	577 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	578
5008 fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	579 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	580
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	581 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	582
3053 0d253659da12 directio_alignment Igor Sysoev <igor@sysoev.ru> parents: 3052 diff changeset	583 u->output.alignment = clcf->directio_alignment;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	584 u->output.pool = r->pool;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	585 u->output.bufs.num = 1;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	586 u->output.bufs.size = clcf->client_body_buffer_size;
6050 a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	587
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	588 if (u->output.output_filter == NULL) {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	589 u->output.output_filter = ngx_chain_writer;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	590 u->output.filter_ctx = &u->writer;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	591 }
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	592
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	593 u->writer.pool = r->pool;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	594
1168 4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	595 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	596
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	597 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	598 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	599 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	600 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	601 return;
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	602 }
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	603
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	604 } else {
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	605
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	606 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	607 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	608 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	609 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	610 return;
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	611 }
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	612
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	613 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	614 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	615
593 425af804d968 nginx-0.3.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 591 diff changeset	616 cln = ngx_http_cleanup_add(r, 0);
569 174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	617 if (cln == NULL) {
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	618 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	619 return;
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	620 }
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	621
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	622 cln->handler = ngx_http_upstream_cleanup;
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	623 cln->data = r;
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	624 u->cleanup = &cln->handler;
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	625
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	626 if (u->resolved == NULL) {
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	627
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	628 uscf = u->conf->upstream;
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 } else {
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	631
5660 7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	632 #if (NGX_HTTP_SSL)
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	633 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	634 #endif
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	635
2422 7af1e5fe102c variable support for unix sockets in fastcgi_pass and proxy_pass Igor Sysoev <igor@sysoev.ru> parents: 2413 diff changeset	636 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	637
7af1e5fe102c variable support for unix sockets in fastcgi_pass and proxy_pass Igor Sysoev <igor@sysoev.ru> parents: 2413 diff changeset	638 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	639 != NGX_OK)
7af1e5fe102c variable support for unix sockets in fastcgi_pass and proxy_pass Igor Sysoev <igor@sysoev.ru> parents: 2413 diff changeset	640 {
3169 b1013d768911 fix request counter in resolver handling, the bug was introduced in r3050 Igor Sysoev <igor@sysoev.ru> parents: 3161 diff changeset	641 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	642 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	643 return;
7af1e5fe102c variable support for unix sockets in fastcgi_pass and proxy_pass Igor Sysoev <igor@sysoev.ru> parents: 2413 diff changeset	644 }
7af1e5fe102c variable support for unix sockets in fastcgi_pass and proxy_pass Igor Sysoev <igor@sysoev.ru> parents: 2413 diff changeset	645
7af1e5fe102c variable support for unix sockets in fastcgi_pass and proxy_pass Igor Sysoev <igor@sysoev.ru> parents: 2413 diff changeset	646 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	647
7af1e5fe102c variable support for unix sockets in fastcgi_pass and proxy_pass Igor Sysoev <igor@sysoev.ru> parents: 2413 diff changeset	648 return;
7af1e5fe102c variable support for unix sockets in fastcgi_pass and proxy_pass Igor Sysoev <igor@sysoev.ru> parents: 2413 diff changeset	649 }
7af1e5fe102c variable support for unix sockets in fastcgi_pass and proxy_pass Igor Sysoev <igor@sysoev.ru> parents: 2413 diff changeset	650
1705 d22095839d86 optimize r->upstream usage Igor Sysoev <igor@sysoev.ru> parents: 1701 diff changeset	651 host = &u->resolved->host;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	652
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	653 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	654
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	655 uscfp = umcf->upstreams.elts;
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 for (i = 0; i < umcf->upstreams.nelts; i++) {
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	658
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	659 uscf = uscfp[i];
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	660
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	661 if (uscf->host.len == host->len
2285 c77f4710595c fix r1913 Igor Sysoev <igor@sysoev.ru> parents: 2268 diff changeset	662 && ((uscf->port == 0 && u->resolved->no_port)
1912 68b426b43c31 fix r1903 Igor Sysoev <igor@sysoev.ru> parents: 1908 diff changeset	663 \|\| 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	664 && 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	665 {
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	666 goto found;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	667 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	668 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	669
3879 502a6b0acf3f fix case when a host in fastcgi_pass, scgi_pass, and uwsgi_pass Igor Sysoev <igor@sysoev.ru> parents: 3713 diff changeset	670 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	671 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	672 "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	673 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	674 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	675 return;
502a6b0acf3f fix case when a host in fastcgi_pass, scgi_pass, and uwsgi_pass Igor Sysoev <igor@sysoev.ru> parents: 3713 diff changeset	676 }
502a6b0acf3f fix case when a host in fastcgi_pass, scgi_pass, and uwsgi_pass Igor Sysoev <igor@sysoev.ru> parents: 3713 diff changeset	677
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	678 temp.name = *host;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	679
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	680 ctx = ngx_resolve_start(clcf->resolver, &temp);
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	681 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	682 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	683 NGX_HTTP_INTERNAL_SERVER_ERROR);
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	684 return;
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
1683 1e0b028055ec allow to use IP addresses without defined resolver Igor Sysoev <igor@sysoev.ru> parents: 1658 diff changeset	687 if (ctx == NGX_NO_RESOLVER) {
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	688 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	689 "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	690
3169 b1013d768911 fix request counter in resolver handling, the bug was introduced in r3050 Igor Sysoev <igor@sysoev.ru> parents: 3161 diff changeset	691 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	692 return;
1e0b028055ec allow to use IP addresses without defined resolver Igor Sysoev <igor@sysoev.ru> parents: 1658 diff changeset	693 }
1e0b028055ec allow to use IP addresses without defined resolver Igor Sysoev <igor@sysoev.ru> parents: 1658 diff changeset	694
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	695 ctx->name = *host;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	696 ctx->handler = ngx_http_upstream_resolve_handler;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	697 ctx->data = r;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	698 ctx->timeout = clcf->resolver_timeout;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	699
1959 4f16186f5603 quick resolving handles u->resolved->ctx by itself Igor Sysoev <igor@sysoev.ru> parents: 1958 diff changeset	700 u->resolved->ctx = ctx;
4f16186f5603 quick resolving handles u->resolved->ctx by itself Igor Sysoev <igor@sysoev.ru> parents: 1958 diff changeset	701
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	702 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	703 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	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
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	709 return;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	710 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	711
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	712 found:
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	713
4964 2464ccebdb52 Upstream: fixed SIGSEGV with the "if" directive. Maxim Dounin <mdounin@mdounin.ru> parents: 4916 diff changeset	714 if (uscf == NULL) {
2464ccebdb52 Upstream: fixed SIGSEGV with the "if" directive. Maxim Dounin <mdounin@mdounin.ru> parents: 4916 diff changeset	715 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	716 "no upstream configuration");
2464ccebdb52 Upstream: fixed SIGSEGV with the "if" directive. Maxim Dounin <mdounin@mdounin.ru> parents: 4916 diff changeset	717 ngx_http_upstream_finalize_request(r, u,
2464ccebdb52 Upstream: fixed SIGSEGV with the "if" directive. Maxim Dounin <mdounin@mdounin.ru> parents: 4916 diff changeset	718 NGX_HTTP_INTERNAL_SERVER_ERROR);
2464ccebdb52 Upstream: fixed SIGSEGV with the "if" directive. Maxim Dounin <mdounin@mdounin.ru> parents: 4916 diff changeset	719 return;
2464ccebdb52 Upstream: fixed SIGSEGV with the "if" directive. Maxim Dounin <mdounin@mdounin.ru> parents: 4916 diff changeset	720 }
2464ccebdb52 Upstream: fixed SIGSEGV with the "if" directive. Maxim Dounin <mdounin@mdounin.ru> parents: 4916 diff changeset	721
5682 110b50657d77 Upstream: restored workaround for "if". Maxim Dounin <mdounin@mdounin.ru> parents: 5677 diff changeset	722 #if (NGX_HTTP_SSL)
110b50657d77 Upstream: restored workaround for "if". Maxim Dounin <mdounin@mdounin.ru> parents: 5677 diff changeset	723 u->ssl_name = uscf->host;
110b50657d77 Upstream: restored workaround for "if". Maxim Dounin <mdounin@mdounin.ru> parents: 5677 diff changeset	724 #endif
110b50657d77 Upstream: restored workaround for "if". Maxim Dounin <mdounin@mdounin.ru> parents: 5677 diff changeset	725
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	726 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	727 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	728 NGX_HTTP_INTERNAL_SERVER_ERROR);
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	729 return;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	730 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	731
5832 d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5827 diff changeset	732 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	733
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5827 diff changeset	734 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	735 && 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	736 {
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5827 diff changeset	737 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	738 }
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5827 diff changeset	739
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	740 ngx_http_upstream_connect(r, u);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	741 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	742
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	743
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	744 #if (NGX_HTTP_CACHE)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	745
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	746 static ngx_int_t
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	747 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	748 {
5951 610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	749 ngx_int_t rc;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	750 ngx_http_cache_t *c;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	751 ngx_http_file_cache_t *cache;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	752
3056 d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	753 c = r->cache;
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	754
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	755 if (c == NULL) {
3056 d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	756
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	757 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	758 return NGX_DECLINED;
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	759 }
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	760
5951 610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	761 rc = ngx_http_upstream_cache_get(r, u, &cache);
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	762
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	763 if (rc != NGX_OK) {
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	764 return rc;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	765 }
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	766
6290 4d5ac1a31d44 Upstream: proxy_cache_convert_head directive. Roman Arutyunyan <arut@nginx.com> parents: 6246 diff changeset	767 if ((r->method & NGX_HTTP_HEAD) && u->conf->cache_convert_head) {
3056 d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	768 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	769 }
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	770
3698 d11227f0107f rename ngx_http_file_cache_create() to ngx_http_file_cache_new() Igor Sysoev <igor@sysoev.ru> parents: 3697 diff changeset	771 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	772 return NGX_ERROR;
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	773 }
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	774
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	775 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	776 return NGX_ERROR;
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	777 }
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	778
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	779 /* TODO: add keys */
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	780
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	781 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	782
3976 215fe9223419 update r3945 with more descriptive error message Igor Sysoev <igor@sysoev.ru> parents: 3963 diff changeset	783 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	784 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	785 "%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	786 "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	787 &u->conf->module, u->conf->buffer_size,
215fe9223419 update r3945 with more descriptive error message Igor Sysoev <igor@sysoev.ru> parents: 3963 diff changeset	788 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	789
f1f194ceab16 fix segfault if cache key is larger than upstream buffer size Igor Sysoev <igor@sysoev.ru> parents: 3940 diff changeset	790 r->cache = NULL;
f1f194ceab16 fix segfault if cache key is larger than upstream buffer size Igor Sysoev <igor@sysoev.ru> parents: 3940 diff changeset	791 return NGX_DECLINED;
f1f194ceab16 fix segfault if cache key is larger than upstream buffer size Igor Sysoev <igor@sysoev.ru> parents: 3940 diff changeset	792 }
f1f194ceab16 fix segfault if cache key is larger than upstream buffer size Igor Sysoev <igor@sysoev.ru> parents: 3940 diff changeset	793
4176 2b5151a2300b Fixed cache bypass caching of non-cacheable replies (ticket #21). Maxim Dounin <mdounin@mdounin.ru> parents: 4152 diff changeset	794 u->cacheable = 1;
2b5151a2300b Fixed cache bypass caching of non-cacheable replies (ticket #21). Maxim Dounin <mdounin@mdounin.ru> parents: 4152 diff changeset	795
5950 eaeecf00d5d7 Upstream: preset some cache configuration when bypassing. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	796 c = r->cache;
eaeecf00d5d7 Upstream: preset some cache configuration when bypassing. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	797
eaeecf00d5d7 Upstream: preset some cache configuration when bypassing. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	798 c->body_start = u->conf->buffer_size;
eaeecf00d5d7 Upstream: preset some cache configuration when bypassing. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	799 c->min_uses = u->conf->cache_min_uses;
5951 610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	800 c->file_cache = cache;
5950 eaeecf00d5d7 Upstream: preset some cache configuration when bypassing. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	801
3917 2a70484a6580 fix a broken cached response if bypass/no_cache directive values are different, Igor Sysoev <igor@sysoev.ru> parents: 3898 diff changeset	802 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	803
2a70484a6580 fix a broken cached response if bypass/no_cache directive values are different, Igor Sysoev <igor@sysoev.ru> parents: 3898 diff changeset	804 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	805 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	806
2a70484a6580 fix a broken cached response if bypass/no_cache directive values are different, Igor Sysoev <igor@sysoev.ru> parents: 3898 diff changeset	807 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	808 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	809 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	810
2a70484a6580 fix a broken cached response if bypass/no_cache directive values are different, Igor Sysoev <igor@sysoev.ru> parents: 3898 diff changeset	811 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	812 break;
2a70484a6580 fix a broken cached response if bypass/no_cache directive values are different, Igor Sysoev <igor@sysoev.ru> parents: 3898 diff changeset	813 }
2a70484a6580 fix a broken cached response if bypass/no_cache directive values are different, Igor Sysoev <igor@sysoev.ru> parents: 3898 diff changeset	814
4385 70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4375 diff changeset	815 c->lock = u->conf->cache_lock;
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4375 diff changeset	816 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	817 c->lock_age = u->conf->cache_lock_age;
4385 70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4375 diff changeset	818
3056 d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	819 u->cache_status = NGX_HTTP_CACHE_MISS;
2592 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
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	822 rc = ngx_http_file_cache_open(r);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	823
2926 80a314b63c56 delete useless r->cache->uses Igor Sysoev <igor@sysoev.ru> parents: 2912 diff changeset	824 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	825 "http upstream cache: %i", rc);
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	826
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	827 switch (rc) {
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	828
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	829 case NGX_HTTP_CACHE_UPDATING:
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	830
2927 55ceaef03d34 proxy_cache_use_stale/fastcgi_cache_use_stale updating Igor Sysoev <igor@sysoev.ru> parents: 2926 diff changeset	831 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	832 u->cache_status = rc;
2927 55ceaef03d34 proxy_cache_use_stale/fastcgi_cache_use_stale updating Igor Sysoev <igor@sysoev.ru> parents: 2926 diff changeset	833 rc = NGX_OK;
55ceaef03d34 proxy_cache_use_stale/fastcgi_cache_use_stale updating Igor Sysoev <igor@sysoev.ru> parents: 2926 diff changeset	834
55ceaef03d34 proxy_cache_use_stale/fastcgi_cache_use_stale updating Igor Sysoev <igor@sysoev.ru> parents: 2926 diff changeset	835 } else {
55ceaef03d34 proxy_cache_use_stale/fastcgi_cache_use_stale updating Igor Sysoev <igor@sysoev.ru> parents: 2926 diff changeset	836 rc = NGX_HTTP_CACHE_STALE;
55ceaef03d34 proxy_cache_use_stale/fastcgi_cache_use_stale updating Igor Sysoev <igor@sysoev.ru> parents: 2926 diff changeset	837 }
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	838
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	839 break;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	840
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	841 case NGX_OK:
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	842 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	843 }
55ceaef03d34 proxy_cache_use_stale/fastcgi_cache_use_stale updating Igor Sysoev <igor@sysoev.ru> parents: 2926 diff changeset	844
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	845 switch (rc) {
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	846
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	847 case NGX_OK:
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	848
6242 0e3a45ec2a3a Upstream: fixed cache send error handling. Roman Arutyunyan <arut@nginx.com> parents: 6180 diff changeset	849 return NGX_OK;
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	850
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	851 case NGX_HTTP_CACHE_STALE:
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	852
2665 4d627567c324 fix r2664: ..._cache_valid did not work for stale responses Igor Sysoev <igor@sysoev.ru> parents: 2664 diff changeset	853 c->valid_sec = 0;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	854 u->buffer.start = NULL;
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	855 u->cache_status = NGX_HTTP_CACHE_EXPIRED;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	856
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	857 break;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	858
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	859 case NGX_DECLINED:
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	860
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	861 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	862 u->buffer.start = NULL;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	863
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	864 } else {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	865 u->buffer.pos = u->buffer.start + c->header_start;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	866 u->buffer.last = u->buffer.pos;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	867 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	868
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	869 break;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	870
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	871 case NGX_HTTP_CACHE_SCARCE:
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	872
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	873 u->cacheable = 0;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	874
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	875 break;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	876
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	877 case NGX_AGAIN:
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	878
3055 92b6cfaa3c27 fix sending a cached file using AIO Igor Sysoev <igor@sysoev.ru> parents: 3053 diff changeset	879 return NGX_BUSY;
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	880
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	881 case NGX_ERROR:
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	882
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	883 return NGX_ERROR;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	884
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	885 default:
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	886
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	887 /* 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	888
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	889 u->cache_status = NGX_HTTP_CACHE_HIT;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	890
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	891 return rc;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	892 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	893
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	894 r->cached = 0;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	895
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	896 return NGX_DECLINED;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	897 }
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
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	900 static ngx_int_t
5951 610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	901 ngx_http_upstream_cache_get(ngx_http_request_t r, ngx_http_upstream_t u,
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	902 ngx_http_file_cache_t **cache)
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	903 {
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	904 ngx_str_t *name, val;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	905 ngx_uint_t i;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	906 ngx_http_file_cache_t **caches;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	907
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	908 if (u->conf->cache_zone) {
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	909 *cache = u->conf->cache_zone->data;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	910 return NGX_OK;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	911 }
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	912
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	913 if (ngx_http_complex_value(r, u->conf->cache_value, &val) != NGX_OK) {
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	914 return NGX_ERROR;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	915 }
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	916
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	917 if (val.len == 0
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	918 \|\| (val.len == 3 && ngx_strncmp(val.data, "off", 3) == 0))
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	919 {
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	920 return NGX_DECLINED;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	921 }
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	922
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	923 caches = u->caches->elts;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	924
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	925 for (i = 0; i < u->caches->nelts; i++) {
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	926 name = &caches[i]->shm_zone->shm.name;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	927
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	928 if (name->len == val.len
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	929 && ngx_strncmp(name->data, val.data, val.len) == 0)
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	930 {
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	931 *cache = caches[i];
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	932 return NGX_OK;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	933 }
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	934 }
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	935
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	936 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	937 "cache \"%V\" not found", &val);
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	938
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	939 return NGX_ERROR;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	940 }
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	941
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	942
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	943 static ngx_int_t
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	944 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	945 {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	946 ngx_int_t rc;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	947 ngx_http_cache_t *c;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	948
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	949 r->cached = 1;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	950 c = r->cache;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	951
3369 479468a7d982 fix handling cached HTTP/0.9 response Igor Sysoev <igor@sysoev.ru> parents: 3272 diff changeset	952 if (c->header_start == c->body_start) {
479468a7d982 fix handling cached HTTP/0.9 response Igor Sysoev <igor@sysoev.ru> parents: 3272 diff changeset	953 r->http_version = NGX_HTTP_VERSION_9;
479468a7d982 fix handling cached HTTP/0.9 response Igor Sysoev <igor@sysoev.ru> parents: 3272 diff changeset	954 return ngx_http_cache_send(r);
479468a7d982 fix handling cached HTTP/0.9 response Igor Sysoev <igor@sysoev.ru> parents: 3272 diff changeset	955 }
479468a7d982 fix handling cached HTTP/0.9 response Igor Sysoev <igor@sysoev.ru> parents: 3272 diff changeset	956
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	957 /* TODO: cache stack */
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	958
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	959 u->buffer = *c->buf;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	960 u->buffer.pos += c->header_start;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	961
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	962 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	963 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	964 u->headers_in.last_modified_time = -1;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	965
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	966 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	967 sizeof(ngx_table_elt_t))
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	968 != NGX_OK)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	969 {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	970 return NGX_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	971 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	972
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	973 rc = u->process_header(r);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	974
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	975 if (rc == NGX_OK) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	976
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	977 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	978 return NGX_DONE;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	979 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	980
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	981 return ngx_http_cache_send(r);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	982 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	983
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	984 if (rc == NGX_ERROR) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	985 return NGX_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	986 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	987
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	988 /* rc == NGX_HTTP_UPSTREAM_INVALID_HEADER */
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	989
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	990 /* TODO: delete file */
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	991
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	992 return rc;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	993 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	994
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	995 #endif
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	996
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	997
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	998 static void
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	999 ngx_http_upstream_resolve_handler(ngx_resolver_ctx_t *ctx)
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1000 {
5113 08b36f2afc3f Upstream: fixed previous commit. Maxim Dounin <mdounin@mdounin.ru> parents: 5112 diff changeset	1001 ngx_connection_t *c;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1002 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	1003 ngx_http_upstream_t *u;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1004 ngx_http_upstream_resolved_t *ur;
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 r = ctx->data;
5113 08b36f2afc3f Upstream: fixed previous commit. Maxim Dounin <mdounin@mdounin.ru> parents: 5112 diff changeset	1007 c = r->connection;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1008
3169 b1013d768911 fix request counter in resolver handling, the bug was introduced in r3050 Igor Sysoev <igor@sysoev.ru> parents: 3161 diff changeset	1009 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	1010 ur = u->resolved;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1011
5928 8dfee01ff0bd Upstream: improved subrequest logging. Maxim Dounin <mdounin@mdounin.ru> parents: 5911 diff changeset	1012 ngx_http_set_log_request(c->log, r);
8dfee01ff0bd Upstream: improved subrequest logging. Maxim Dounin <mdounin@mdounin.ru> parents: 5911 diff changeset	1013
8dfee01ff0bd Upstream: improved subrequest logging. Maxim Dounin <mdounin@mdounin.ru> parents: 5911 diff changeset	1014 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
8dfee01ff0bd Upstream: improved subrequest logging. Maxim Dounin <mdounin@mdounin.ru> parents: 5911 diff changeset	1015 "http upstream resolve: \"%V?%V\"", &r->uri, &r->args);
8dfee01ff0bd Upstream: improved subrequest logging. Maxim Dounin <mdounin@mdounin.ru> parents: 5911 diff changeset	1016
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1017 if (ctx->state) {
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1018 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1019 "%V could not be resolved (%i: %s)",
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1020 &ctx->name, ctx->state,
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1021 ngx_resolver_strerror(ctx->state));
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1022
3169 b1013d768911 fix request counter in resolver handling, the bug was introduced in r3050 Igor Sysoev <igor@sysoev.ru> parents: 3161 diff changeset	1023 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	1024 goto failed;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1025 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1026
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1027 ur->naddrs = ctx->naddrs;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1028 ur->addrs = ctx->addrs;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1029
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1030 #if (NGX_DEBUG)
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1031 {
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5453 diff changeset	1032 u_char text[NGX_SOCKADDR_STRLEN];
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5453 diff changeset	1033 ngx_str_t addr;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1034 ngx_uint_t i;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1035
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5453 diff changeset	1036 addr.data = text;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5453 diff changeset	1037
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1038 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	1039 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	1040 text, NGX_SOCKADDR_STRLEN, 0);
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5453 diff changeset	1041
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5453 diff changeset	1042 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	1043 "name was resolved to %V", &addr);
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1044 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1045 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1046 #endif
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1047
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1048 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	1049 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	1050 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	1051 goto failed;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1052 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1053
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1054 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	1055 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	1056
5885 5a042519bfe7 Upstream: limited next_upstream time and tries when resolving DNS. Gu Feng <flygoast@126.com> parents: 5883 diff changeset	1057 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	1058
5a042519bfe7 Upstream: limited next_upstream time and tries when resolving DNS. Gu Feng <flygoast@126.com> parents: 5883 diff changeset	1059 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	1060 && 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	1061 {
5a042519bfe7 Upstream: limited next_upstream time and tries when resolving DNS. Gu Feng <flygoast@126.com> parents: 5883 diff changeset	1062 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	1063 }
5a042519bfe7 Upstream: limited next_upstream time and tries when resolving DNS. Gu Feng <flygoast@126.com> parents: 5883 diff changeset	1064
3169 b1013d768911 fix request counter in resolver handling, the bug was introduced in r3050 Igor Sysoev <igor@sysoev.ru> parents: 3161 diff changeset	1065 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	1066
d3c15c7831eb Upstream: call ngx_http_run_posted_requests() on resolve errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5104 diff changeset	1067 failed:
d3c15c7831eb Upstream: call ngx_http_run_posted_requests() on resolve errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5104 diff changeset	1068
5113 08b36f2afc3f Upstream: fixed previous commit. Maxim Dounin <mdounin@mdounin.ru> parents: 5112 diff changeset	1069 ngx_http_run_posted_requests(c);
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1070 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1071
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1072
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1073 static void
2377 87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1074 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	1075 {
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1076 ngx_connection_t *c;
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1077 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	1078 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	1079
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1080 c = ev->data;
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1081 r = c->data;
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1082
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1083 u = r->upstream;
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1084 c = r->connection;
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1085
5928 8dfee01ff0bd Upstream: improved subrequest logging. Maxim Dounin <mdounin@mdounin.ru> parents: 5911 diff changeset	1086 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	1087
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1088 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	1089 "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	1090
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1091 if (ev->write) {
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	1092 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	1093
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1094 } else {
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	1095 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	1096 }
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1097
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1098 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	1099 }
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1100
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1101
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1102 static void
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1103 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	1104 {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1105 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	1106 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1107
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1108
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1109 static void
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1110 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	1111 {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1112 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	1113 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1114
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1115
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1116 static void
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1117 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	1118 ngx_event_t *ev)
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1119 {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1120 int n;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1121 char buf[1];
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1122 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	1123 ngx_int_t event;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1124 ngx_connection_t *c;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1125 ngx_http_upstream_t *u;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1126
527 7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	1127 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	1128 "http upstream check client, write event:%d, \"%V\"",
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	1129 ev->write, &r->uri);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1130
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1131 c = r->connection;
483 621229427cba nginx-0.1.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	1132 u = r->upstream;
621229427cba nginx-0.1.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	1133
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	1134 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	1135 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	1136
6ad4bba6313e delete level event of appropriate type, this should fix select()'s EBADF, Igor Sysoev <igor@sysoev.ru> parents: 2805 diff changeset	1137 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	1138
6ad4bba6313e delete level event of appropriate type, this should fix select()'s EBADF, Igor Sysoev <igor@sysoev.ru> parents: 2805 diff changeset	1139 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	1140 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	1141 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	1142 return;
6ad4bba6313e delete level event of appropriate type, this should fix select()'s EBADF, Igor Sysoev <igor@sysoev.ru> parents: 2805 diff changeset	1143 }
6ad4bba6313e delete level event of appropriate type, this should fix select()'s EBADF, Igor Sysoev <igor@sysoev.ru> parents: 2805 diff changeset	1144 }
6ad4bba6313e delete level event of appropriate type, this should fix select()'s EBADF, Igor Sysoev <igor@sysoev.ru> parents: 2805 diff changeset	1145
2757 9cc973b46af1 get a full response if the response is cacheable or storable even Igor Sysoev <igor@sysoev.ru> parents: 2708 diff changeset	1146 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	1147 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	1148 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	1149 }
2807 6ad4bba6313e delete level event of appropriate type, this should fix select()'s EBADF, Igor Sysoev <igor@sysoev.ru> parents: 2805 diff changeset	1150
527 7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	1151 return;
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	1152 }
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	1153
6246 257b51c37c5a The HTTP/2 implementation (RFC 7240, 7241). Valentin Bartenev <vbart@nginx.com> parents: 6242 diff changeset	1154 #if (NGX_HTTP_V2)
257b51c37c5a The HTTP/2 implementation (RFC 7240, 7241). Valentin Bartenev <vbart@nginx.com> parents: 6242 diff changeset	1155 if (r->stream) {
5121 c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: 5113 diff changeset	1156 return;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: 5113 diff changeset	1157 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: 5113 diff changeset	1158 #endif
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: 5113 diff changeset	1159
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1160 #if (NGX_HAVE_KQUEUE)
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1161
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1162 if (ngx_event_flags & NGX_USE_KQUEUE_EVENT) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1163
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1164 if (!ev->pending_eof) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1165 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1166 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1167
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1168 ev->eof = 1;
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	1169 c->error = 1;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1170
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1171 if (ev->kq_errno) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1172 ev->error = 1;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1173 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1174
2757 9cc973b46af1 get a full response if the response is cacheable or storable even Igor Sysoev <igor@sysoev.ru> parents: 2708 diff changeset	1175 if (!u->cacheable && u->peer.connection) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1176 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	1177 "kevent() reported that client prematurely closed "
527 7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	1178 "connection, so upstream connection is closed too");
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1179 ngx_http_upstream_finalize_request(r, u,
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1180 NGX_HTTP_CLIENT_CLOSED_REQUEST);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1181 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1182 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1183
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1184 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	1185 "kevent() reported that client prematurely closed "
75d2388bd6b9 Tweaked error messages. Ruslan Ermilov <ru@nginx.com> parents: 4176 diff changeset	1186 "connection");
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1187
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1188 if (u->peer.connection == NULL) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1189 ngx_http_upstream_finalize_request(r, u,
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1190 NGX_HTTP_CLIENT_CLOSED_REQUEST);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1191 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1192
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1193 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1194 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1195
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1196 #endif
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1197
5373 46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1198 #if (NGX_HAVE_EPOLLRDHUP)
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1199
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1200 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	1201 socklen_t len;
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1202
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1203 ev->eof = 1;
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1204 c->error = 1;
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1205
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1206 err = 0;
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1207 len = sizeof(ngx_err_t);
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1208
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1209 /*
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1210 * 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	1211 * 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	1212 */
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1213
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1214 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	1215 == -1)
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1216 {
5557 188481078faf Use ngx_socket_errno where appropriate. Piotr Sikora <piotr@cloudflare.com> parents: 5546 diff changeset	1217 err = ngx_socket_errno;
5373 46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1218 }
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1219
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1220 if (err) {
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1221 ev->error = 1;
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1222 }
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1223
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1224 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	1225 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	1226 "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	1227 "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	1228 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	1229 NGX_HTTP_CLIENT_CLOSED_REQUEST);
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1230 return;
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1231 }
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1232
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1233 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	1234 "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	1235 "connection");
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1236
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1237 if (u->peer.connection == NULL) {
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1238 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	1239 NGX_HTTP_CLIENT_CLOSED_REQUEST);
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1240 }
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1241
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1242 return;
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1243 }
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1244
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1245 #endif
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1246
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1247 n = recv(c->fd, buf, 1, MSG_PEEK);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1248
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1249 err = ngx_socket_errno;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1250
1109 1402dbb554c4 add debug logging Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	1251 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ev->log, err,
1402dbb554c4 add debug logging Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	1252 "http upstream recv(): %d", n);
1402dbb554c4 add debug logging Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	1253
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1254 if (ev->write && (n >= 0 \|\| err == NGX_EAGAIN)) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1255 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1256 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1257
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1258 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	1259
6ad4bba6313e delete level event of appropriate type, this should fix select()'s EBADF, Igor Sysoev <igor@sysoev.ru> parents: 2805 diff changeset	1260 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	1261
6ad4bba6313e delete level event of appropriate type, this should fix select()'s EBADF, Igor Sysoev <igor@sysoev.ru> parents: 2805 diff changeset	1262 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	1263 ngx_http_upstream_finalize_request(r, u,
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1264 NGX_HTTP_INTERNAL_SERVER_ERROR);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1265 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1266 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1267 }
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 if (n > 0) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1270 return;
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
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1273 if (n == -1) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1274 if (err == NGX_EAGAIN) {
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
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1278 ev->error = 1;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1279
483 621229427cba nginx-0.1.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	1280 } else { /* n == 0 */
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1281 err = 0;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1282 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1283
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	1284 ev->eof = 1;
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	1285 c->error = 1;
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	1286
2757 9cc973b46af1 get a full response if the response is cacheable or storable even Igor Sysoev <igor@sysoev.ru> parents: 2708 diff changeset	1287 if (!u->cacheable && u->peer.connection) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1288 ngx_log_error(NGX_LOG_INFO, ev->log, err,
4182 75d2388bd6b9 Tweaked error messages. Ruslan Ermilov <ru@nginx.com> parents: 4176 diff changeset	1289 "client prematurely closed connection, "
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1290 "so upstream connection is closed too");
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1291 ngx_http_upstream_finalize_request(r, u,
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1292 NGX_HTTP_CLIENT_CLOSED_REQUEST);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1293 return;
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
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1296 ngx_log_error(NGX_LOG_INFO, ev->log, err,
4182 75d2388bd6b9 Tweaked error messages. Ruslan Ermilov <ru@nginx.com> parents: 4176 diff changeset	1297 "client prematurely closed connection");
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1298
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1299 if (u->peer.connection == NULL) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1300 ngx_http_upstream_finalize_request(r, u,
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1301 NGX_HTTP_CLIENT_CLOSED_REQUEST);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1302 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1303 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1304
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1305
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	1306 static void
31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	1307 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	1308 {
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1309 ngx_int_t rc;
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1310 ngx_connection_t *c;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1311
483 621229427cba nginx-0.1.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	1312 r->connection->log->action = "connecting to upstream";
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1313
6146 59fc60585f1e Upstream: times to obtain header/response are stored as ngx_msec_t. Ruslan Ermilov <ru@nginx.com> parents: 6125 diff changeset	1314 if (u->state && u->state->response_time) {
59fc60585f1e Upstream: times to obtain header/response are stored as ngx_msec_t. Ruslan Ermilov <ru@nginx.com> parents: 6125 diff changeset	1315 u->state->response_time = ngx_current_msec - u->state->response_time;
665 5fd7a5e99047 nginx-0.3.54-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	1316 }
5fd7a5e99047 nginx-0.3.54-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	1317
1168 4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	1318 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	1319 if (u->state == NULL) {
5fd7a5e99047 nginx-0.3.54-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	1320 ngx_http_upstream_finalize_request(r, u,
5fd7a5e99047 nginx-0.3.54-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	1321 NGX_HTTP_INTERNAL_SERVER_ERROR);
5fd7a5e99047 nginx-0.3.54-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	1322 return;
5fd7a5e99047 nginx-0.3.54-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	1323 }
5fd7a5e99047 nginx-0.3.54-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	1324
5fd7a5e99047 nginx-0.3.54-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	1325 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	1326
6146 59fc60585f1e Upstream: times to obtain header/response are stored as ngx_msec_t. Ruslan Ermilov <ru@nginx.com> parents: 6125 diff changeset	1327 u->state->response_time = ngx_current_msec;
6147 74b6ef56ea56 Upstream: $upstream_connect_time. Ruslan Ermilov <ru@nginx.com> parents: 6146 diff changeset	1328 u->state->connect_time = (ngx_msec_t) -1;
6146 59fc60585f1e Upstream: times to obtain header/response are stored as ngx_msec_t. Ruslan Ermilov <ru@nginx.com> parents: 6125 diff changeset	1329 u->state->header_time = (ngx_msec_t) -1;
665 5fd7a5e99047 nginx-0.3.54-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	1330
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1331 rc = ngx_event_connect_peer(&u->peer);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1332
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1333 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	1334 "http upstream connect: %i", rc);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1335
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1336 if (rc == NGX_ERROR) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1337 ngx_http_upstream_finalize_request(r, u,
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1338 NGX_HTTP_INTERNAL_SERVER_ERROR);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1339 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1340 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1341
1707 f3188f6eae1f $upstream_addr did not contain last address, the bug was introduced in r1659 Igor Sysoev <igor@sysoev.ru> parents: 1706 diff changeset	1342 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	1343
543 511a89da35ad nginx-0.2.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 541 diff changeset	1344 if (rc == NGX_BUSY) {
511a89da35ad nginx-0.2.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 541 diff changeset	1345 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	1346 ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_NOLIVE);
0be898896d1a backup upstream servers Igor Sysoev <igor@sysoev.ru> parents: 1340 diff changeset	1347 return;
543 511a89da35ad nginx-0.2.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 541 diff changeset	1348 }
511a89da35ad nginx-0.2.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 541 diff changeset	1349
1378 0be898896d1a backup upstream servers Igor Sysoev <igor@sysoev.ru> parents: 1340 diff changeset	1350 if (rc == NGX_DECLINED) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1351 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	1352 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1353 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1354
5261 af60a210cb78 Upstream: updated list of ngx_event_connect_peer() return values. Ruslan Ermilov <ru@nginx.com> parents: 5231 diff changeset	1355 /* 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	1356
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1357 c = u->peer.connection;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1358
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1359 c->data = r;
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1360
2377 87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1361 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	1362 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	1363
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1364 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	1365 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	1366
1397 6c25a49e548a upstream sendfile bit was overridden by r->connection->sendfile Igor Sysoev <igor@sysoev.ru> parents: 1378 diff changeset	1367 c->sendfile &= r->connection->sendfile;
1958 3e9e4581fbba fix peer sendfile capability Igor Sysoev <igor@sysoev.ru> parents: 1947 diff changeset	1368 u->output.sendfile = c->sendfile;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1369
4116 9baf12ea5ca1 Upstream: separate pool for peer connections. Maxim Dounin <mdounin@mdounin.ru> parents: 4115 diff changeset	1370 if (c->pool == NULL) {
9baf12ea5ca1 Upstream: separate pool for peer connections. Maxim Dounin <mdounin@mdounin.ru> parents: 4115 diff changeset	1371
9baf12ea5ca1 Upstream: separate pool for peer connections. Maxim Dounin <mdounin@mdounin.ru> parents: 4115 diff changeset	1372 /* 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	1373
9baf12ea5ca1 Upstream: separate pool for peer connections. Maxim Dounin <mdounin@mdounin.ru> parents: 4115 diff changeset	1374 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	1375 if (c->pool == NULL) {
9baf12ea5ca1 Upstream: separate pool for peer connections. Maxim Dounin <mdounin@mdounin.ru> parents: 4115 diff changeset	1376 ngx_http_upstream_finalize_request(r, u,
9baf12ea5ca1 Upstream: separate pool for peer connections. Maxim Dounin <mdounin@mdounin.ru> parents: 4115 diff changeset	1377 NGX_HTTP_INTERNAL_SERVER_ERROR);
9baf12ea5ca1 Upstream: separate pool for peer connections. Maxim Dounin <mdounin@mdounin.ru> parents: 4115 diff changeset	1378 return;
9baf12ea5ca1 Upstream: separate pool for peer connections. Maxim Dounin <mdounin@mdounin.ru> parents: 4115 diff changeset	1379 }
9baf12ea5ca1 Upstream: separate pool for peer connections. Maxim Dounin <mdounin@mdounin.ru> parents: 4115 diff changeset	1380 }
9baf12ea5ca1 Upstream: separate pool for peer connections. Maxim Dounin <mdounin@mdounin.ru> parents: 4115 diff changeset	1381
2847 3e10674139e4 style fix Igor Sysoev <igor@sysoev.ru> parents: 2824 diff changeset	1382 c->log = r->connection->log;
4116 9baf12ea5ca1 Upstream: separate pool for peer connections. Maxim Dounin <mdounin@mdounin.ru> parents: 4115 diff changeset	1383 c->pool->log = c->log;
2847 3e10674139e4 style fix Igor Sysoev <igor@sysoev.ru> parents: 2824 diff changeset	1384 c->read->log = c->log;
3e10674139e4 style fix Igor Sysoev <igor@sysoev.ru> parents: 2824 diff changeset	1385 c->write->log = c->log;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1386
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1387 /* 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	1388
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1389 u->writer.out = NULL;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1390 u->writer.last = &u->writer.out;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1391 u->writer.connection = c;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1392 u->writer.limit = 0;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1393
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1394 if (u->request_sent) {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1395 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	1396 ngx_http_upstream_finalize_request(r, u,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1397 NGX_HTTP_INTERNAL_SERVER_ERROR);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1398 return;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1399 }
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1400 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1401
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	1402 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	1403 && 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	1404 && 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	1405 && 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	1406 {
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1407 /*
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1408 * 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	1409 * 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	1410 */
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1411
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1412 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	1413 if (u->output.free == NULL) {
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1414 ngx_http_upstream_finalize_request(r, u,
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1415 NGX_HTTP_INTERNAL_SERVER_ERROR);
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1416 return;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1417 }
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1418
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1419 u->output.free->buf = r->request_body->buf;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1420 u->output.free->next = NULL;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1421 u->output.allocated = 1;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1422
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1423 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	1424 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	1425 r->request_body->buf->tag = u->output.tag;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1426 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1427
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1428 u->request_sent = 0;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1429
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1430 if (rc == NGX_AGAIN) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1431 ngx_add_timer(c->write, u->conf->connect_timeout);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1432 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1433 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1434
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1435 #if (NGX_HTTP_SSL)
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1436
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1437 if (u->ssl && c->ssl == NULL) {
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1438 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	1439 return;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1440 }
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1441
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1442 #endif
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1443
6050 a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1444 ngx_http_upstream_send_request(r, u, 1);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1445 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1446
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1447
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1448 #if (NGX_HTTP_SSL)
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 static void
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1451 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	1452 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	1453 {
6068 643f2ce02f1c Upstream: abbreviated SSL handshake may interact badly with Nagle. Ruslan Ermilov <ru@nginx.com> parents: 6050 diff changeset	1454 int tcp_nodelay;
643f2ce02f1c Upstream: abbreviated SSL handshake may interact badly with Nagle. Ruslan Ermilov <ru@nginx.com> parents: 6050 diff changeset	1455 ngx_int_t rc;
643f2ce02f1c Upstream: abbreviated SSL handshake may interact badly with Nagle. Ruslan Ermilov <ru@nginx.com> parents: 6050 diff changeset	1456 ngx_http_core_loc_conf_t *clcf;
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1457
5305 12b750d35162 Upstream: reliably detect connection failures with SSL peers. Ruslan Ermilov <ru@nginx.com> parents: 5304 diff changeset	1458 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	1459 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	1460 return;
12b750d35162 Upstream: reliably detect connection failures with SSL peers. Ruslan Ermilov <ru@nginx.com> parents: 5304 diff changeset	1461 }
12b750d35162 Upstream: reliably detect connection failures with SSL peers. Ruslan Ermilov <ru@nginx.com> parents: 5304 diff changeset	1462
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1463 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	1464 NGX_SSL_BUFFER\|NGX_SSL_CLIENT)
2536 a6d6d762c554 small optimization: " == NGX_ERROR" > " != NGX_OK" Igor Sysoev <igor@sysoev.ru> parents: 2463 diff changeset	1465 != NGX_OK)
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1466 {
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1467 ngx_http_upstream_finalize_request(r, u,
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1468 NGX_HTTP_INTERNAL_SERVER_ERROR);
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1469 return;
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1470 }
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1471
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1472 c->sendfile = 0;
619 7a16e281c01f nginx-0.3.31-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 615 diff changeset	1473 u->output.sendfile = 0;
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1474
5661 060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1475 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	1476 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	1477 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	1478 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	1479 return;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1480 }
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1481 }
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1482
2184 274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2183 diff changeset	1483 if (u->conf->ssl_session_reuse) {
274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2183 diff changeset	1484 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	1485 ngx_http_upstream_finalize_request(r, u,
274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2183 diff changeset	1486 NGX_HTTP_INTERNAL_SERVER_ERROR);
274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2183 diff changeset	1487 return;
274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2183 diff changeset	1488 }
6068 643f2ce02f1c Upstream: abbreviated SSL handshake may interact badly with Nagle. Ruslan Ermilov <ru@nginx.com> parents: 6050 diff changeset	1489
643f2ce02f1c Upstream: abbreviated SSL handshake may interact badly with Nagle. Ruslan Ermilov <ru@nginx.com> parents: 6050 diff changeset	1490 /* abbreviated SSL handshake may interact badly with Nagle */
643f2ce02f1c Upstream: abbreviated SSL handshake may interact badly with Nagle. Ruslan Ermilov <ru@nginx.com> parents: 6050 diff changeset	1491
643f2ce02f1c Upstream: abbreviated SSL handshake may interact badly with Nagle. Ruslan Ermilov <ru@nginx.com> parents: 6050 diff changeset	1492 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
643f2ce02f1c Upstream: abbreviated SSL handshake may interact badly with Nagle. Ruslan Ermilov <ru@nginx.com> parents: 6050 diff changeset	1493
643f2ce02f1c Upstream: abbreviated SSL handshake may interact badly with Nagle. Ruslan Ermilov <ru@nginx.com> parents: 6050 diff changeset	1494 if (clcf->tcp_nodelay && c->tcp_nodelay == NGX_TCP_NODELAY_UNSET) {
643f2ce02f1c Upstream: abbreviated SSL handshake may interact badly with Nagle. Ruslan Ermilov <ru@nginx.com> parents: 6050 diff changeset	1495 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "tcp_nodelay");
643f2ce02f1c Upstream: abbreviated SSL handshake may interact badly with Nagle. Ruslan Ermilov <ru@nginx.com> parents: 6050 diff changeset	1496
643f2ce02f1c Upstream: abbreviated SSL handshake may interact badly with Nagle. Ruslan Ermilov <ru@nginx.com> parents: 6050 diff changeset	1497 tcp_nodelay = 1;
643f2ce02f1c Upstream: abbreviated SSL handshake may interact badly with Nagle. Ruslan Ermilov <ru@nginx.com> parents: 6050 diff changeset	1498
643f2ce02f1c Upstream: abbreviated SSL handshake may interact badly with Nagle. Ruslan Ermilov <ru@nginx.com> parents: 6050 diff changeset	1499 if (setsockopt(c->fd, IPPROTO_TCP, TCP_NODELAY,
643f2ce02f1c Upstream: abbreviated SSL handshake may interact badly with Nagle. Ruslan Ermilov <ru@nginx.com> parents: 6050 diff changeset	1500 (const void *) &tcp_nodelay, sizeof(int)) == -1)
643f2ce02f1c Upstream: abbreviated SSL handshake may interact badly with Nagle. Ruslan Ermilov <ru@nginx.com> parents: 6050 diff changeset	1501 {
643f2ce02f1c Upstream: abbreviated SSL handshake may interact badly with Nagle. Ruslan Ermilov <ru@nginx.com> parents: 6050 diff changeset	1502 ngx_connection_error(c, ngx_socket_errno,
643f2ce02f1c Upstream: abbreviated SSL handshake may interact badly with Nagle. Ruslan Ermilov <ru@nginx.com> parents: 6050 diff changeset	1503 "setsockopt(TCP_NODELAY) failed");
643f2ce02f1c Upstream: abbreviated SSL handshake may interact badly with Nagle. Ruslan Ermilov <ru@nginx.com> parents: 6050 diff changeset	1504 ngx_http_upstream_finalize_request(r, u,
643f2ce02f1c Upstream: abbreviated SSL handshake may interact badly with Nagle. Ruslan Ermilov <ru@nginx.com> parents: 6050 diff changeset	1505 NGX_HTTP_INTERNAL_SERVER_ERROR);
643f2ce02f1c Upstream: abbreviated SSL handshake may interact badly with Nagle. Ruslan Ermilov <ru@nginx.com> parents: 6050 diff changeset	1506 return;
643f2ce02f1c Upstream: abbreviated SSL handshake may interact badly with Nagle. Ruslan Ermilov <ru@nginx.com> parents: 6050 diff changeset	1507 }
643f2ce02f1c Upstream: abbreviated SSL handshake may interact badly with Nagle. Ruslan Ermilov <ru@nginx.com> parents: 6050 diff changeset	1508
643f2ce02f1c Upstream: abbreviated SSL handshake may interact badly with Nagle. Ruslan Ermilov <ru@nginx.com> parents: 6050 diff changeset	1509 c->tcp_nodelay = NGX_TCP_NODELAY_SET;
643f2ce02f1c Upstream: abbreviated SSL handshake may interact badly with Nagle. Ruslan Ermilov <ru@nginx.com> parents: 6050 diff changeset	1510 }
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1511 }
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1512
641 5e8fb59c18c1 nginx-0.3.42-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1513 r->connection->log->action = "SSL handshaking to upstream";
5e8fb59c18c1 nginx-0.3.42-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1514
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1515 rc = ngx_ssl_handshake(c);
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1516
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1517 if (rc == NGX_AGAIN) {
5774 9bf58a3da25b Upstream: SSL handshake timeouts. Maxim Dounin <mdounin@mdounin.ru> parents: 5770 diff changeset	1518
9bf58a3da25b Upstream: SSL handshake timeouts. Maxim Dounin <mdounin@mdounin.ru> parents: 5770 diff changeset	1519 if (!c->write->timer_set) {
9bf58a3da25b Upstream: SSL handshake timeouts. Maxim Dounin <mdounin@mdounin.ru> parents: 5770 diff changeset	1520 ngx_add_timer(c->write, u->conf->connect_timeout);
9bf58a3da25b Upstream: SSL handshake timeouts. Maxim Dounin <mdounin@mdounin.ru> parents: 5770 diff changeset	1521 }
9bf58a3da25b Upstream: SSL handshake timeouts. Maxim Dounin <mdounin@mdounin.ru> parents: 5770 diff changeset	1522
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1523 c->ssl->handler = ngx_http_upstream_ssl_handshake;
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1524 return;
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1525 }
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1526
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1527 ngx_http_upstream_ssl_handshake(c);
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1528 }
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1529
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1530
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1531 static void
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1532 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	1533 {
5661 060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1534 long rc;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1535 ngx_http_request_t *r;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1536 ngx_http_upstream_t *u;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1537
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1538 r = c->data;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1539 u = r->upstream;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1540
5928 8dfee01ff0bd Upstream: improved subrequest logging. Maxim Dounin <mdounin@mdounin.ru> parents: 5911 diff changeset	1541 ngx_http_set_log_request(c->log, r);
8dfee01ff0bd Upstream: improved subrequest logging. Maxim Dounin <mdounin@mdounin.ru> parents: 5911 diff changeset	1542
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1543 if (c->ssl->handshaked) {
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1544
5661 060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1545 if (u->conf->ssl_verify) {
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1546 rc = SSL_get_verify_result(c->ssl->connection);
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1547
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1548 if (rc != X509_V_OK) {
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1549 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	1550 "upstream SSL certificate verify error: (%l:%s)",
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1551 rc, X509_verify_cert_error_string(rc));
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1552 goto failed;
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1553 }
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1554
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1555 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	1556 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	1557 "upstream SSL certificate does not match \"%V\"",
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1558 &u->ssl_name);
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1559 goto failed;
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1560 }
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1561 }
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1562
2184 274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2183 diff changeset	1563 if (u->conf->ssl_session_reuse) {
274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2183 diff changeset	1564 u->peer.save_session(&u->peer, u->peer.data);
274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2183 diff changeset	1565 }
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	1566
2377 87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1567 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	1568 c->read->handler = ngx_http_upstream_handler;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1569
5340 13a5f4765887 Upstream: posted requests handling after ssl handshake errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5305 diff changeset	1570 c = r->connection;
13a5f4765887 Upstream: posted requests handling after ssl handshake errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5305 diff changeset	1571
6050 a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1572 ngx_http_upstream_send_request(r, u, 1);
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1573
5340 13a5f4765887 Upstream: posted requests handling after ssl handshake errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5305 diff changeset	1574 ngx_http_run_posted_requests(c);
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1575 return;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1576 }
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1577
5661 060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1578 failed:
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1579
5340 13a5f4765887 Upstream: posted requests handling after ssl handshake errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5305 diff changeset	1580 c = r->connection;
13a5f4765887 Upstream: posted requests handling after ssl handshake errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5305 diff changeset	1581
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1582 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	1583
5340 13a5f4765887 Upstream: posted requests handling after ssl handshake errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5305 diff changeset	1584 ngx_http_run_posted_requests(c);
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1585 }
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1586
5660 7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1587
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1588 static ngx_int_t
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1589 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	1590 ngx_connection_t *c)
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1591 {
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1592 u_char p, last;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1593 ngx_str_t name;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1594
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1595 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	1596 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	1597 return NGX_ERROR;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1598 }
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1599
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1600 } else {
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1601 name = u->ssl_name;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1602 }
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1603
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1604 if (name.len == 0) {
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1605 goto done;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1606 }
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1607
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1608 /*
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1609 * 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	1610 * 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	1611 */
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1612
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1613 p = name.data;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1614 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	1615
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1616 if (*p == '[') {
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1617 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	1618
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1619 if (p == NULL) {
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1620 p = name.data;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1621 }
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1622 }
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1623
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1624 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	1625
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1626 if (p != NULL) {
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1627 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	1628 }
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1629
5661 060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1630 if (!u->conf->ssl_server_name) {
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1631 goto done;
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1632 }
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1633
5660 7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1634 #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	1635
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1636 /* 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	1637
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1638 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	1639 goto done;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1640 }
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1641
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1642 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	1643 goto done;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1644 }
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1645
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1646 /*
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1647 * 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	1648 * 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	1649 */
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1650
5667 16405e02e612 Upstream: for ssl name, non-aligned memory allocation is enough. Ruslan Ermilov <ru@nginx.com> parents: 5661 diff changeset	1651 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	1652 if (p == NULL) {
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1653 return NGX_ERROR;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1654 }
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1655
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1656 (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	1657
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1658 name.data = p;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1659
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1660 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	1661 "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	1662
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1663 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	1664 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	1665 "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	1666 return NGX_ERROR;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1667 }
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1668
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1669 #endif
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1670
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1671 done:
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1672
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1673 u->ssl_name = name;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1674
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1675 return NGX_OK;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1676 }
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1677
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1678 #endif
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1679
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1680
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1681 static ngx_int_t
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	1682 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	1683 {
5848 106a8bfa4f42 Upstream: fixed file buffers reinit in ngx_http_upstream_reinit(). Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	1684 off_t file_pos;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1685 ngx_chain_t *cl;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1686
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1687 if (u->reinit_request(r) != NGX_OK) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1688 return NGX_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1689 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1690
4120 42135dd1f0ea Upstream: keepalive flag. Maxim Dounin <mdounin@mdounin.ru> parents: 4119 diff changeset	1691 u->keepalive = 0;
5072 7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	1692 u->upgrade = 0;
4120 42135dd1f0ea Upstream: keepalive flag. Maxim Dounin <mdounin@mdounin.ru> parents: 4119 diff changeset	1693
1705 d22095839d86 optimize r->upstream usage Igor Sysoev <igor@sysoev.ru> parents: 1701 diff changeset	1694 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	1695 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	1696 u->headers_in.last_modified_time = -1;
1705 d22095839d86 optimize r->upstream usage Igor Sysoev <igor@sysoev.ru> parents: 1701 diff changeset	1697
d22095839d86 optimize r->upstream usage Igor Sysoev <igor@sysoev.ru> parents: 1701 diff changeset	1698 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	1699 sizeof(ngx_table_elt_t))
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1700 != NGX_OK)
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1701 {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1702 return NGX_ERROR;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1703 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1704
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1705 /* reinit the request chain */
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1706
5848 106a8bfa4f42 Upstream: fixed file buffers reinit in ngx_http_upstream_reinit(). Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	1707 file_pos = 0;
106a8bfa4f42 Upstream: fixed file buffers reinit in ngx_http_upstream_reinit(). Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	1708
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1709 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	1710 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	1711
106a8bfa4f42 Upstream: fixed file buffers reinit in ngx_http_upstream_reinit(). Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	1712 /* 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	1713
106a8bfa4f42 Upstream: fixed file buffers reinit in ngx_http_upstream_reinit(). Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	1714 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	1715 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	1716 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	1717 }
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1718 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1719
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1720 /* reinit the subrequest's ngx_output_chain() context */
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1721
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1722 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	1723 && r != r->main && u->output.buf)
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1724 {
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1725 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	1726 if (u->output.free == NULL) {
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1727 return NGX_ERROR;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1728 }
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1729
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1730 u->output.free->buf = u->output.buf;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1731 u->output.free->next = NULL;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1732
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1733 u->output.buf->pos = u->output.buf->start;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1734 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	1735 }
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1736
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1737 u->output.buf = NULL;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1738 u->output.in = NULL;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1739 u->output.busy = NULL;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1740
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	1741 /* reinit u->buffer */
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1742
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1743 u->buffer.pos = u->buffer.start;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1744
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1745 #if (NGX_HTTP_CACHE)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1746
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1747 if (r->cache) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1748 u->buffer.pos += r->cache->header_start;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1749 }
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1750
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1751 #endif
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1752
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1753 u->buffer.last = u->buffer.pos;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1754
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1755 return NGX_OK;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1756 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1757
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1758
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	1759 static void
6050 a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1760 ngx_http_upstream_send_request(ngx_http_request_t r, ngx_http_upstream_t u,
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1761 ngx_uint_t do_write)
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1762 {
1153 c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	1763 ngx_int_t rc;
483 621229427cba nginx-0.1.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	1764 ngx_connection_t *c;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1765
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1766 c = u->peer.connection;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1767
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1768 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	1769 "http upstream send request");
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1770
6147 74b6ef56ea56 Upstream: $upstream_connect_time. Ruslan Ermilov <ru@nginx.com> parents: 6146 diff changeset	1771 if (u->state->connect_time == (ngx_msec_t) -1) {
74b6ef56ea56 Upstream: $upstream_connect_time. Ruslan Ermilov <ru@nginx.com> parents: 6146 diff changeset	1772 u->state->connect_time = ngx_current_msec - u->state->response_time;
74b6ef56ea56 Upstream: $upstream_connect_time. Ruslan Ermilov <ru@nginx.com> parents: 6146 diff changeset	1773 }
74b6ef56ea56 Upstream: $upstream_connect_time. Ruslan Ermilov <ru@nginx.com> parents: 6146 diff changeset	1774
1153 c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	1775 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	1776 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	1777 return;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1778 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1779
483 621229427cba nginx-0.1.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	1780 c->log->action = "sending request to upstream";
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1781
6050 a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1782 rc = ngx_http_upstream_send_request_body(r, u, do_write);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1783
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1784 if (rc == NGX_ERROR) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1785 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	1786 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1787 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1788
6050 a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1789 if (rc >= NGX_HTTP_SPECIAL_RESPONSE) {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1790 ngx_http_upstream_finalize_request(r, u, rc);
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1791 return;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1792 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1793
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1794 if (rc == NGX_AGAIN) {
6050 a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1795 if (!c->write->ready) {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1796 ngx_add_timer(c->write, u->conf->send_timeout);
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1797
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1798 } else if (c->write->timer_set) {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1799 ngx_del_timer(c->write);
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1800 }
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1801
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	1802 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	1803 ngx_http_upstream_finalize_request(r, u,
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1804 NGX_HTTP_INTERNAL_SERVER_ERROR);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1805 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1806 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1807
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1808 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1809 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1810
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1811 /* rc == NGX_OK */
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1812
6050 a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1813 if (c->write->timer_set) {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1814 ngx_del_timer(c->write);
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1815 }
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1816
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1817 if (c->tcp_nopush == NGX_TCP_NOPUSH_SET) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1818 if (ngx_tcp_push(c->fd) == NGX_ERROR) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1819 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	1820 ngx_tcp_push_n " failed");
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1821 ngx_http_upstream_finalize_request(r, u,
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1822 NGX_HTTP_INTERNAL_SERVER_ERROR);
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1823 return;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1824 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1825
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1826 c->tcp_nopush = NGX_TCP_NOPUSH_UNSET;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1827 }
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1828
2377 87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1829 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	1830
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	1831 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	1832 ngx_http_upstream_finalize_request(r, u,
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1833 NGX_HTTP_INTERNAL_SERVER_ERROR);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1834 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1835 }
5745 9d3a9c45fc43 Upstream: fixed handling of write event after sending request. Valentin Bartenev <vbart@nginx.com> parents: 5738 diff changeset	1836
9d3a9c45fc43 Upstream: fixed handling of write event after sending request. Valentin Bartenev <vbart@nginx.com> parents: 5738 diff changeset	1837 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	1838
9d3a9c45fc43 Upstream: fixed handling of write event after sending request. Valentin Bartenev <vbart@nginx.com> parents: 5738 diff changeset	1839 if (c->read->ready) {
9d3a9c45fc43 Upstream: fixed handling of write event after sending request. Valentin Bartenev <vbart@nginx.com> parents: 5738 diff changeset	1840 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	1841 return;
9d3a9c45fc43 Upstream: fixed handling of write event after sending request. Valentin Bartenev <vbart@nginx.com> parents: 5738 diff changeset	1842 }
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1843 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1844
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1845
6050 a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1846 static ngx_int_t
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1847 ngx_http_upstream_send_request_body(ngx_http_request_t *r,
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1848 ngx_http_upstream_t *u, ngx_uint_t do_write)
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1849 {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1850 int tcp_nodelay;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1851 ngx_int_t rc;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1852 ngx_chain_t out, cl, *ln;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1853 ngx_connection_t *c;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1854 ngx_http_core_loc_conf_t *clcf;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1855
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1856 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1857 "http upstream send request body");
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1858
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1859 if (!r->request_body_no_buffering) {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1860
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1861 /* buffered request body */
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1862
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1863 if (!u->request_sent) {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1864 u->request_sent = 1;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1865 out = u->request_bufs;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1866
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1867 } else {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1868 out = NULL;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1869 }
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1870
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1871 return ngx_output_chain(&u->output, out);
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1872 }
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1873
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1874 if (!u->request_sent) {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1875 u->request_sent = 1;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1876 out = u->request_bufs;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1877
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1878 if (r->request_body->bufs) {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1879 for (cl = out; cl->next; cl = out->next) { /* void */ }
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1880 cl->next = r->request_body->bufs;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1881 r->request_body->bufs = NULL;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1882 }
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1883
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1884 c = u->peer.connection;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1885 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1886
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1887 if (clcf->tcp_nodelay && c->tcp_nodelay == NGX_TCP_NODELAY_UNSET) {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1888 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "tcp_nodelay");
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1889
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1890 tcp_nodelay = 1;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1891
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1892 if (setsockopt(c->fd, IPPROTO_TCP, TCP_NODELAY,
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1893 (const void *) &tcp_nodelay, sizeof(int)) == -1)
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1894 {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1895 ngx_connection_error(c, ngx_socket_errno,
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1896 "setsockopt(TCP_NODELAY) failed");
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1897 return NGX_ERROR;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1898 }
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1899
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1900 c->tcp_nodelay = NGX_TCP_NODELAY_SET;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1901 }
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1902
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1903 r->read_event_handler = ngx_http_upstream_read_request_handler;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1904
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1905 } else {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1906 out = NULL;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1907 }
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1908
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1909 for ( ;; ) {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1910
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1911 if (do_write) {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1912 rc = ngx_output_chain(&u->output, out);
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1913
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1914 if (rc == NGX_ERROR) {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1915 return NGX_ERROR;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1916 }
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1917
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1918 while (out) {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1919 ln = out;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1920 out = out->next;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1921 ngx_free_chain(r->pool, ln);
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1922 }
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1923
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1924 if (rc == NGX_OK && !r->reading_body) {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1925 break;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1926 }
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1927 }
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1928
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1929 if (r->reading_body) {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1930 /* read client request body */
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1931
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1932 rc = ngx_http_read_unbuffered_request_body(r);
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1933
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1934 if (rc >= NGX_HTTP_SPECIAL_RESPONSE) {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1935 return rc;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1936 }
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1937
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1938 out = r->request_body->bufs;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1939 r->request_body->bufs = NULL;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1940 }
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1941
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1942 /* stop if there is nothing to send */
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1943
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1944 if (out == NULL) {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1945 rc = NGX_AGAIN;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1946 break;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1947 }
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1948
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1949 do_write = 1;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1950 }
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1951
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1952 if (!r->reading_body) {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1953 if (!u->store && !r->post_action && !u->conf->ignore_client_abort) {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1954 r->read_event_handler =
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1955 ngx_http_upstream_rd_check_broken_connection;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1956 }
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1957 }
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1958
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1959 return rc;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1960 }
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1961
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1962
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	1963 static void
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	1964 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	1965 ngx_http_upstream_t *u)
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1966 {
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	1967 ngx_connection_t *c;
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	1968
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	1969 c = u->peer.connection;
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	1970
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	1971 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	1972 "http upstream send request handler");
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1973
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	1974 if (c->write->timedout) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1975 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	1976 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1977 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1978
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1979 #if (NGX_HTTP_SSL)
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1980
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1981 if (u->ssl && c->ssl == NULL) {
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1982 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	1983 return;
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1984 }
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1985
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1986 #endif
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1987
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	1988 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	1989 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	1990
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	1991 (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	1992
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	1993 return;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	1994 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	1995
6050 a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1996 ngx_http_upstream_send_request(r, u, 1);
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1997 }
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1998
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1999
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2000 static void
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2001 ngx_http_upstream_read_request_handler(ngx_http_request_t *r)
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2002 {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2003 ngx_connection_t *c;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2004 ngx_http_upstream_t *u;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2005
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2006 c = r->connection;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2007 u = r->upstream;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2008
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2009 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2010 "http upstream read request handler");
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2011
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2012 if (c->read->timedout) {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2013 c->timedout = 1;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2014 ngx_http_upstream_finalize_request(r, u, NGX_HTTP_REQUEST_TIME_OUT);
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2015 return;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2016 }
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2017
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2018 ngx_http_upstream_send_request(r, u, 0);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2019 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2020
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2021
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	2022 static void
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2023 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	2024 {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2025 ssize_t n;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2026 ngx_int_t rc;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2027 ngx_connection_t *c;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2028
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2029 c = u->peer.connection;
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2030
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2031 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	2032 "http upstream process header");
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2033
483 621229427cba nginx-0.1.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	2034 c->log->action = "reading response header from upstream";
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2035
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2036 if (c->read->timedout) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2037 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	2038 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2039 }
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2040
1153 c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2041 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	2042 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	2043 return;
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2044 }
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2045
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2046 if (u->buffer.start == NULL) {
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2047 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	2048 if (u->buffer.start == NULL) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2049 ngx_http_upstream_finalize_request(r, u,
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2050 NGX_HTTP_INTERNAL_SERVER_ERROR);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2051 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2052 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2053
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2054 u->buffer.pos = u->buffer.start;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2055 u->buffer.last = u->buffer.start;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2056 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	2057 u->buffer.temporary = 1;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2058
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2059 u->buffer.tag = u->output.tag;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2060
1705 d22095839d86 optimize r->upstream usage Igor Sysoev <igor@sysoev.ru> parents: 1701 diff changeset	2061 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	2062 sizeof(ngx_table_elt_t))
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2063 != NGX_OK)
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2064 {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2065 ngx_http_upstream_finalize_request(r, u,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2066 NGX_HTTP_INTERNAL_SERVER_ERROR);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2067 return;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2068 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2069
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2070 #if (NGX_HTTP_CACHE)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2071
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2072 if (r->cache) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2073 u->buffer.pos += r->cache->header_start;
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2074 u->buffer.last = u->buffer.pos;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2075 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2076 #endif
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2077 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2078
2360 64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2079 for ( ;; ) {
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2080
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2081 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	2082
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2083 if (n == NGX_AGAIN) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2084 #if 0
2360 64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2085 ngx_add_timer(rev, u->read_timeout);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2086 #endif
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2087
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2088 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	2089 ngx_http_upstream_finalize_request(r, u,
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2090 NGX_HTTP_INTERNAL_SERVER_ERROR);
2360 64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2091 return;
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2092 }
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2093
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2094 return;
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2095 }
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2096
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2097 if (n == 0) {
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2098 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	2099 "upstream prematurely closed connection");
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2100 }
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2101
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2102 if (n == NGX_ERROR \|\| n == 0) {
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2103 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	2104 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2105 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2106
2360 64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2107 u->buffer.last += n;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2108
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2109 #if 0
2360 64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2110 u->valid_header_in = 0;
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2111
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2112 u->peer.cached = 0;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2113 #endif
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2114
2360 64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2115 rc = u->process_header(r);
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2116
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2117 if (rc == NGX_AGAIN) {
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2118
4460 6299d1c4dbb4 Upstream: fixed "too big header" check. Maxim Dounin <mdounin@mdounin.ru> parents: 4412 diff changeset	2119 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	2120 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	2121 "upstream sent too big header");
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2122
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2123 ngx_http_upstream_next(r, u,
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2124 NGX_HTTP_UPSTREAM_FT_INVALID_HEADER);
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2125 return;
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2126 }
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2127
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2128 continue;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2129 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2130
2360 64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2131 break;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2132 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2133
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2134 if (rc == NGX_HTTP_UPSTREAM_INVALID_HEADER) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2135 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	2136 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2137 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2138
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	2139 if (rc == NGX_ERROR) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2140 ngx_http_upstream_finalize_request(r, u,
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2141 NGX_HTTP_INTERNAL_SERVER_ERROR);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2142 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2143 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2144
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2145 /* rc == NGX_OK */
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2146
6146 59fc60585f1e Upstream: times to obtain header/response are stored as ngx_msec_t. Ruslan Ermilov <ru@nginx.com> parents: 6125 diff changeset	2147 u->state->header_time = ngx_current_msec - u->state->response_time;
5964 0a198a517eaf Upstream: $upstream_header_time variable. Vladimir Homutov <vl@nginx.com> parents: 5960 diff changeset	2148
5209 07e515e65984 Upstream: allow to intercept responses with status 300. Ruslan Ermilov <ru@nginx.com> parents: 5169 diff changeset	2149 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	2150
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2151 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	2152 return;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2153 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2154
2267 920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2155 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	2156 return;
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	2157 }
31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	2158 }
31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	2159
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2160 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	2161 return;
417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	2162 }
417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	2163
777 4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2164 if (!r->subrequest_in_memory) {
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2165 ngx_http_upstream_send_response(r, u);
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2166 return;
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2167 }
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2168
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2169 /* subrequest content in memory */
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2170
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2171 if (u->input_filter == NULL) {
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2172 u->input_filter_init = ngx_http_upstream_non_buffered_filter_init;
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2173 u->input_filter = ngx_http_upstream_non_buffered_filter;
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2174 u->input_filter_ctx = r;
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2175 }
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2176
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2177 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	2178 ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
777 4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2179 return;
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2180 }
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2181
2308 3f98400e31e9 memcached response was stored in variable with END Igor Sysoev <igor@sysoev.ru> parents: 2285 diff changeset	2182 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	2183
3f98400e31e9 memcached response was stored in variable with END Igor Sysoev <igor@sysoev.ru> parents: 2285 diff changeset	2184 if (n) {
5216 4a40163772a1 Upstream: made the assignment more obvious. Ruslan Ermilov <ru@nginx.com> parents: 5209 diff changeset	2185 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	2186
2402 cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	2187 u->state->response_length += n;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	2188
2308 3f98400e31e9 memcached response was stored in variable with END Igor Sysoev <igor@sysoev.ru> parents: 2285 diff changeset	2189 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	2190 ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2191 return;
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2192 }
5217 ddba4e308ecc Upstream: slightly optimized ngx_http_upstream_process_header(). Ruslan Ermilov <ru@nginx.com> parents: 5216 diff changeset	2193 }
ddba4e308ecc Upstream: slightly optimized ngx_http_upstream_process_header(). Ruslan Ermilov <ru@nginx.com> parents: 5216 diff changeset	2194
ddba4e308ecc Upstream: slightly optimized ngx_http_upstream_process_header(). Ruslan Ermilov <ru@nginx.com> parents: 5216 diff changeset	2195 if (u->length == 0) {
ddba4e308ecc Upstream: slightly optimized ngx_http_upstream_process_header(). Ruslan Ermilov <ru@nginx.com> parents: 5216 diff changeset	2196 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	2197 return;
777 4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2198 }
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2199
2377 87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	2200 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	2201
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2202 ngx_http_upstream_process_body_in_memory(r, u);
777 4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2203 }
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2204
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2205
1153 c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2206 static ngx_int_t
2268 33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2207 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	2208 {
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2209 ngx_uint_t status;
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2210 ngx_http_upstream_next_t *un;
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2211
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2212 status = u->headers_in.status_n;
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2213
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2214 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	2215
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2216 if (status != un->status) {
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2217 continue;
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2218 }
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2219
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2220 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	2221 ngx_http_upstream_next(r, u, un->mask);
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2222 return NGX_OK;
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2223 }
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2224
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2225 #if (NGX_HTTP_CACHE)
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2226
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	2227 if (u->cache_status == NGX_HTTP_CACHE_EXPIRED
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	2228 && (u->conf->cache_use_stale & un->mask))
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	2229 {
2824 d106509491b5 fix building --without-http-cache Igor Sysoev <igor@sysoev.ru> parents: 2807 diff changeset	2230 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	2231
60551422e150 reinit proxy/fastcgi header parser before ngx_http_upstream_cache_send() Igor Sysoev <igor@sysoev.ru> parents: 2804 diff changeset	2232 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	2233
60551422e150 reinit proxy/fastcgi header parser before ngx_http_upstream_cache_send() Igor Sysoev <igor@sysoev.ru> parents: 2804 diff changeset	2234 if (rc == NGX_OK) {
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	2235 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	2236 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	2237 }
60551422e150 reinit proxy/fastcgi header parser before ngx_http_upstream_cache_send() Igor Sysoev <igor@sysoev.ru> parents: 2804 diff changeset	2238
60551422e150 reinit proxy/fastcgi header parser before ngx_http_upstream_cache_send() Igor Sysoev <igor@sysoev.ru> parents: 2804 diff changeset	2239 ngx_http_upstream_finalize_request(r, u, rc);
2268 33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2240 return NGX_OK;
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2241 }
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2242
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2243 #endif
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2244 }
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2245
5441 43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2246 #if (NGX_HTTP_CACHE)
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2247
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2248 if (status == NGX_HTTP_NOT_MODIFIED
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2249 && u->cache_status == NGX_HTTP_CACHE_EXPIRED
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2250 && u->conf->cache_revalidate)
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2251 {
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2252 time_t now, valid;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2253 ngx_int_t rc;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2254
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2255 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	2256 "http upstream not modified");
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2257
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2258 now = ngx_time();
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2259 valid = r->cache->valid_sec;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2260
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2261 rc = u->reinit_request(r);
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2262
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2263 if (rc != NGX_OK) {
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2264 ngx_http_upstream_finalize_request(r, u, rc);
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2265 return NGX_OK;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2266 }
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2267
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2268 u->cache_status = NGX_HTTP_CACHE_REVALIDATED;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2269 rc = ngx_http_upstream_cache_send(r, u);
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2270
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2271 if (valid == 0) {
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2272 valid = r->cache->valid_sec;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2273 }
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2274
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2275 if (valid == 0) {
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2276 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	2277 u->headers_in.status_n);
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2278 if (valid) {
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2279 valid = now + valid;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2280 }
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2281 }
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2282
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2283 if (valid) {
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2284 r->cache->valid_sec = valid;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2285 r->cache->date = now;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2286
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2287 ngx_http_file_cache_update_header(r);
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2288 }
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2289
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2290 ngx_http_upstream_finalize_request(r, u, rc);
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2291 return NGX_OK;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2292 }
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2293
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2294 #endif
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2295
2268 33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2296 return NGX_DECLINED;
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2297 }
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2298
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2299
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2300 static ngx_int_t
2267 920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2301 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	2302 ngx_http_upstream_t *u)
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2303 {
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2304 ngx_int_t status;
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2305 ngx_uint_t i;
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2306 ngx_table_elt_t *h;
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2307 ngx_http_err_page_t *err_page;
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2308 ngx_http_core_loc_conf_t *clcf;
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2309
2441 0c117a89f399 in miss case memcached module returned END instead of default 404 page body Igor Sysoev <igor@sysoev.ru> parents: 2422 diff changeset	2310 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	2311
0c117a89f399 in miss case memcached module returned END instead of default 404 page body Igor Sysoev <igor@sysoev.ru> parents: 2422 diff changeset	2312 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	2313 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	2314 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	2315 }
0c117a89f399 in miss case memcached module returned END instead of default 404 page body Igor Sysoev <igor@sysoev.ru> parents: 2422 diff changeset	2316
2267 920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2317 if (!u->conf->intercept_errors) {
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2318 return NGX_DECLINED;
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2319 }
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2320
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2321 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	2322
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2323 if (clcf->error_pages == NULL) {
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2324 return NGX_DECLINED;
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2325 }
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2326
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2327 err_page = clcf->error_pages->elts;
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2328 for (i = 0; i < clcf->error_pages->nelts; i++) {
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2329
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2330 if (err_page[i].status == status) {
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2331
2953 aa12525236da fix segfault if there is error_page 401, proxy_intercept_errors is on Igor Sysoev <igor@sysoev.ru> parents: 2952 diff changeset	2332 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	2333 && 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	2334 {
2267 920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2335 h = ngx_list_push(&r->headers_out.headers);
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2336
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2337 if (h == NULL) {
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2338 ngx_http_upstream_finalize_request(r, u,
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2339 NGX_HTTP_INTERNAL_SERVER_ERROR);
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2340 return NGX_OK;
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2341 }
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2342
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2343 h = u->headers_in.www_authenticate;
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2344
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2345 r->headers_out.www_authenticate = h;
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2346 }
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2347
3706 ea908f6ae499 an intercepted error code was not cached Igor Sysoev <igor@sysoev.ru> parents: 3705 diff changeset	2348 #if (NGX_HTTP_CACHE)
ea908f6ae499 an intercepted error code was not cached Igor Sysoev <igor@sysoev.ru> parents: 3705 diff changeset	2349
3709 64777690c697 fix r3707: cache node should be freed be a response is not cached Igor Sysoev <igor@sysoev.ru> parents: 3708 diff changeset	2350 if (r->cache) {
3706 ea908f6ae499 an intercepted error code was not cached Igor Sysoev <igor@sysoev.ru> parents: 3705 diff changeset	2351 time_t valid;
ea908f6ae499 an intercepted error code was not cached Igor Sysoev <igor@sysoev.ru> parents: 3705 diff changeset	2352
ea908f6ae499 an intercepted error code was not cached Igor Sysoev <igor@sysoev.ru> parents: 3705 diff changeset	2353 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	2354
ea908f6ae499 an intercepted error code was not cached Igor Sysoev <igor@sysoev.ru> parents: 3705 diff changeset	2355 if (valid) {
ea908f6ae499 an intercepted error code was not cached Igor Sysoev <igor@sysoev.ru> parents: 3705 diff changeset	2356 r->cache->valid_sec = ngx_time() + valid;
ea908f6ae499 an intercepted error code was not cached Igor Sysoev <igor@sysoev.ru> parents: 3705 diff changeset	2357 r->cache->error = status;
ea908f6ae499 an intercepted error code was not cached Igor Sysoev <igor@sysoev.ru> parents: 3705 diff changeset	2358 }
ea908f6ae499 an intercepted error code was not cached Igor Sysoev <igor@sysoev.ru> parents: 3705 diff changeset	2359
3711 ce6ba077c270 several changes in cache cleanup handling: Igor Sysoev <igor@sysoev.ru> parents: 3709 diff changeset	2360 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	2361 }
ea908f6ae499 an intercepted error code was not cached Igor Sysoev <igor@sysoev.ru> parents: 3705 diff changeset	2362 #endif
2267 920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2363 ngx_http_upstream_finalize_request(r, u, status);
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2364
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2365 return NGX_OK;
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2366 }
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2367 }
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2368
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2369 return NGX_DECLINED;
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2370 }
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2371
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2372
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2373 static ngx_int_t
1153 c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2374 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	2375 {
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2376 int err;
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2377 socklen_t len;
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2378
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2379 #if (NGX_HAVE_KQUEUE)
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2380
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2381 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	2382 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	2383 if (c->write->pending_eof) {
e62219793beb Upstream: better detection of connect() failures with kqueue. Maxim Dounin <mdounin@mdounin.ru> parents: 4895 diff changeset	2384 err = c->write->kq_errno;
e62219793beb Upstream: better detection of connect() failures with kqueue. Maxim Dounin <mdounin@mdounin.ru> parents: 4895 diff changeset	2385
e62219793beb Upstream: better detection of connect() failures with kqueue. Maxim Dounin <mdounin@mdounin.ru> parents: 4895 diff changeset	2386 } else {
e62219793beb Upstream: better detection of connect() failures with kqueue. Maxim Dounin <mdounin@mdounin.ru> parents: 4895 diff changeset	2387 err = c->read->kq_errno;
e62219793beb Upstream: better detection of connect() failures with kqueue. Maxim Dounin <mdounin@mdounin.ru> parents: 4895 diff changeset	2388 }
e62219793beb Upstream: better detection of connect() failures with kqueue. Maxim Dounin <mdounin@mdounin.ru> parents: 4895 diff changeset	2389
1469 0a269c464eaf connection error should be logged with "connecting to upstream" action, Igor Sysoev <igor@sysoev.ru> parents: 1468 diff changeset	2390 c->log->action = "connecting to upstream";
4916 79c8e87b1fcb Trailing whitespace fix. Maxim Dounin <mdounin@mdounin.ru> parents: 4915 diff changeset	2391 (void) ngx_connection_error(c, err,
1166 bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2392 "kevent() reported that connect() failed");
bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2393 return NGX_ERROR;
bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2394 }
1153 c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2395
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2396 } else
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2397 #endif
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2398 {
1166 bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2399 err = 0;
bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2400 len = sizeof(int);
bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2401
bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2402 /*
bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2403 * 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	2404 * Solaris returns -1 and sets errno
bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2405 */
bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2406
bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2407 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	2408 == -1)
bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2409 {
5557 188481078faf Use ngx_socket_errno where appropriate. Piotr Sikora <piotr@cloudflare.com> parents: 5546 diff changeset	2410 err = ngx_socket_errno;
1166 bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2411 }
bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2412
bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2413 if (err) {
1469 0a269c464eaf connection error should be logged with "connecting to upstream" action, Igor Sysoev <igor@sysoev.ru> parents: 1468 diff changeset	2414 c->log->action = "connecting to upstream";
1166 bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2415 (void) ngx_connection_error(c, err, "connect() failed");
bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2416 return NGX_ERROR;
bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2417 }
1153 c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2418 }
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2419
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2420 return NGX_OK;
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2421 }
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2422
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2423
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2424 static ngx_int_t
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2425 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	2426 {
5489 6d357b2a9d6e Upstream: keep $upstream_http_x_accel_redirect intact. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	2427 ngx_str_t uri, args;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2428 ngx_uint_t i, flags;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2429 ngx_list_part_t *part;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2430 ngx_table_elt_t *h;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2431 ngx_http_upstream_header_t *hh;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2432 ngx_http_upstream_main_conf_t *umcf;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2433
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2434 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	2435
2786 4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	2436 if (u->headers_in.x_accel_redirect
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	2437 && !(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	2438 {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2439 ngx_http_upstream_finalize_request(r, u, NGX_DECLINED);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2440
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2441 part = &u->headers_in.headers.part;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2442 h = part->elts;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2443
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2444 for (i = 0; /* void */; i++) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2445
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2446 if (i >= part->nelts) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2447 if (part->next == NULL) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2448 break;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2449 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2450
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2451 part = part->next;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2452 h = part->elts;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2453 i = 0;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2454 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2455
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2456 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	2457 h[i].lowcase_key, h[i].key.len);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2458
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2459 if (hh && hh->redirect) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2460 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	2461 ngx_http_finalize_request(r,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2462 NGX_HTTP_INTERNAL_SERVER_ERROR);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2463 return NGX_DONE;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2464 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2465 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2466 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2467
5489 6d357b2a9d6e Upstream: keep $upstream_http_x_accel_redirect intact. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	2468 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	2469
7d7eac6e31df Upstream: support named location for X-Accel-Redirect. Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp> parents: 5885 diff changeset	2470 if (uri.data[0] == '@') {
7d7eac6e31df Upstream: support named location for X-Accel-Redirect. Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp> parents: 5885 diff changeset	2471 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	2472
7d7eac6e31df Upstream: support named location for X-Accel-Redirect. Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp> parents: 5885 diff changeset	2473 } else {
7d7eac6e31df Upstream: support named location for X-Accel-Redirect. Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp> parents: 5885 diff changeset	2474 ngx_str_null(&args);
7d7eac6e31df Upstream: support named location for X-Accel-Redirect. Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp> parents: 5885 diff changeset	2475 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	2476
7d7eac6e31df Upstream: support named location for X-Accel-Redirect. Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp> parents: 5885 diff changeset	2477 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	2478 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	2479 return NGX_DONE;
7d7eac6e31df Upstream: support named location for X-Accel-Redirect. Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp> parents: 5885 diff changeset	2480 }
7d7eac6e31df Upstream: support named location for X-Accel-Redirect. Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp> parents: 5885 diff changeset	2481
7d7eac6e31df Upstream: support named location for X-Accel-Redirect. Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp> parents: 5885 diff changeset	2482 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	2483 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	2484 }
7d7eac6e31df Upstream: support named location for X-Accel-Redirect. Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp> parents: 5885 diff changeset	2485
7d7eac6e31df Upstream: support named location for X-Accel-Redirect. Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp> parents: 5885 diff changeset	2486 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	2487 }
7d7eac6e31df Upstream: support named location for X-Accel-Redirect. Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp> parents: 5885 diff changeset	2488
3120 40b8b398dbbc fix request counter for X-Accel-Redirect, the bug was introduced in r3050 Igor Sysoev <igor@sysoev.ru> parents: 3112 diff changeset	2489 ngx_http_finalize_request(r, NGX_DONE);
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2490 return NGX_DONE;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2491 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2492
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2493 part = &u->headers_in.headers.part;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2494 h = part->elts;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2495
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2496 for (i = 0; /* void */; i++) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2497
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2498 if (i >= part->nelts) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2499 if (part->next == NULL) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2500 break;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2501 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2502
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2503 part = part->next;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2504 h = part->elts;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2505 i = 0;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2506 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2507
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2508 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	2509 h[i].lowcase_key, h[i].key.len))
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2510 {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2511 continue;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2512 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2513
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2514 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	2515 h[i].lowcase_key, h[i].key.len);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2516
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2517 if (hh) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2518 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	2519 ngx_http_upstream_finalize_request(r, u,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2520 NGX_HTTP_INTERNAL_SERVER_ERROR);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2521 return NGX_DONE;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2522 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2523
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2524 continue;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2525 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2526
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2527 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	2528 ngx_http_upstream_finalize_request(r, u,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2529 NGX_HTTP_INTERNAL_SERVER_ERROR);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2530 return NGX_DONE;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2531 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2532 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2533
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2534 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	2535 r->headers_out.server->hash = 0;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2536 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2537
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2538 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	2539 r->headers_out.date->hash = 0;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2540 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2541
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2542 r->headers_out.status = u->headers_in.status_n;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2543 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	2544
4117 103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	2545 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	2546
5735 5fb1e57c758a Entity tags: explicit flag to skip not modified filter. Maxim Dounin <mdounin@mdounin.ru> parents: 5732 diff changeset	2547 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	2548
5874 2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5869 diff changeset	2549 if (u->conf->force_ranges) {
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5869 diff changeset	2550 r->allow_ranges = 1;
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5869 diff changeset	2551 r->single_range = 1;
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5869 diff changeset	2552
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5869 diff changeset	2553 #if (NGX_HTTP_CACHE)
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5869 diff changeset	2554 if (r->cached) {
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5869 diff changeset	2555 r->single_range = 0;
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5869 diff changeset	2556 }
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5869 diff changeset	2557 #endif
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5869 diff changeset	2558 }
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5869 diff changeset	2559
5300 f538a67c9f77 Upstream: u->length now defaults to -1 (API change). Maxim Dounin <mdounin@mdounin.ru> parents: 5299 diff changeset	2560 u->length = -1;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2561
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2562 return NGX_OK;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2563 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2564
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2565
777 4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2566 static void
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2567 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	2568 ngx_http_upstream_t *u)
777 4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2569 {
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2570 size_t size;
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2571 ssize_t n;
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2572 ngx_buf_t *b;
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2573 ngx_event_t *rev;
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2574 ngx_connection_t *c;
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2575
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2576 c = u->peer.connection;
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2577 rev = c->read;
777 4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2578
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2579 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2580 "http upstream process body on memory");
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2581
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2582 if (rev->timedout) {
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2583 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	2584 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	2585 return;
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2586 }
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2587
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2588 b = &u->buffer;
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2589
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2590 for ( ;; ) {
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2591
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2592 size = b->end - b->last;
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2593
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2594 if (size == 0) {
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2595 ngx_log_error(NGX_LOG_ALERT, c->log, 0,
3708 c1385a3b8093 fix typo Igor Sysoev <igor@sysoev.ru> parents: 3706 diff changeset	2596 "upstream buffer is too small to read response");
777 4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2597 ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2598 return;
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2599 }
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2600
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2601 n = c->recv(c, b->last, size);
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2602
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2603 if (n == NGX_AGAIN) {
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2604 break;
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2605 }
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2606
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2607 if (n == 0 \|\| n == NGX_ERROR) {
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2608 ngx_http_upstream_finalize_request(r, u, n);
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2609 return;
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2610 }
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2611
2402 cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	2612 u->state->response_length += n;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	2613
777 4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2614 if (u->input_filter(u->input_filter_ctx, n) == NGX_ERROR) {
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2615 ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2616 return;
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2617 }
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2618
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2619 if (!rev->ready) {
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2620 break;
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2621 }
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2622 }
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2623
4120 42135dd1f0ea Upstream: keepalive flag. Maxim Dounin <mdounin@mdounin.ru> parents: 4119 diff changeset	2624 if (u->length == 0) {
42135dd1f0ea Upstream: keepalive flag. Maxim Dounin <mdounin@mdounin.ru> parents: 4119 diff changeset	2625 ngx_http_upstream_finalize_request(r, u, 0);
42135dd1f0ea Upstream: keepalive flag. Maxim Dounin <mdounin@mdounin.ru> parents: 4119 diff changeset	2626 return;
42135dd1f0ea Upstream: keepalive flag. Maxim Dounin <mdounin@mdounin.ru> parents: 4119 diff changeset	2627 }
42135dd1f0ea Upstream: keepalive flag. Maxim Dounin <mdounin@mdounin.ru> parents: 4119 diff changeset	2628
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2629 if (ngx_handle_read_event(rev, 0) != NGX_OK) {
777 4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2630 ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2631 return;
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2632 }
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2633
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2634 if (rev->active) {
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2635 ngx_add_timer(rev, u->conf->read_timeout);
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2636
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2637 } else if (rev->timer_set) {
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2638 ngx_del_timer(rev);
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2639 }
681 7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 675 diff changeset	2640 }
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 675 diff changeset	2641
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 675 diff changeset	2642
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 675 diff changeset	2643 static void
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 675 diff changeset	2644 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	2645 {
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 675 diff changeset	2646 int tcp_nodelay;
2402 cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	2647 ssize_t n;
681 7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 675 diff changeset	2648 ngx_int_t rc;
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 675 diff changeset	2649 ngx_event_pipe_t *p;
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 675 diff changeset	2650 ngx_connection_t *c;
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 675 diff changeset	2651 ngx_http_core_loc_conf_t *clcf;
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 675 diff changeset	2652
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2653 rc = ngx_http_send_header(r);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2654
2701 756f73ca1e39 support HEAD in proxy cache Igor Sysoev <igor@sysoev.ru> parents: 2692 diff changeset	2655 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	2656 ngx_http_upstream_finalize_request(r, u, rc);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2657 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2658 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2659
5353 1608b1135a1d Upstream: setting u->header_sent before ngx_http_upstream_upgrade(). Maxim Dounin <mdounin@mdounin.ru> parents: 5340 diff changeset	2660 u->header_sent = 1;
1608b1135a1d Upstream: setting u->header_sent before ngx_http_upstream_upgrade(). Maxim Dounin <mdounin@mdounin.ru> parents: 5340 diff changeset	2661
5072 7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2662 if (u->upgrade) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2663 ngx_http_upstream_upgrade(r, u);
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2664 return;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2665 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2666
2704 ac1e2e199c9f shutdown client connection for cacheable header only responses Igor Sysoev <igor@sysoev.ru> parents: 2703 diff changeset	2667 c = r->connection;
ac1e2e199c9f shutdown client connection for cacheable header only responses Igor Sysoev <igor@sysoev.ru> parents: 2703 diff changeset	2668
2701 756f73ca1e39 support HEAD in proxy cache Igor Sysoev <igor@sysoev.ru> parents: 2692 diff changeset	2669 if (r->header_only) {
2704 ac1e2e199c9f shutdown client connection for cacheable header only responses Igor Sysoev <igor@sysoev.ru> parents: 2703 diff changeset	2670
5746 35990c69b3ac Upstream: p->downstream_error instead of closing connection. Maxim Dounin <mdounin@mdounin.ru> parents: 5745 diff changeset	2671 if (!u->buffering) {
2701 756f73ca1e39 support HEAD in proxy cache Igor Sysoev <igor@sysoev.ru> parents: 2692 diff changeset	2672 ngx_http_upstream_finalize_request(r, u, rc);
756f73ca1e39 support HEAD in proxy cache Igor Sysoev <igor@sysoev.ru> parents: 2692 diff changeset	2673 return;
756f73ca1e39 support HEAD in proxy cache Igor Sysoev <igor@sysoev.ru> parents: 2692 diff changeset	2674 }
5746 35990c69b3ac Upstream: p->downstream_error instead of closing connection. Maxim Dounin <mdounin@mdounin.ru> parents: 5745 diff changeset	2675
35990c69b3ac Upstream: p->downstream_error instead of closing connection. Maxim Dounin <mdounin@mdounin.ru> parents: 5745 diff changeset	2676 if (!u->cacheable && !u->store) {
35990c69b3ac Upstream: p->downstream_error instead of closing connection. Maxim Dounin <mdounin@mdounin.ru> parents: 5745 diff changeset	2677 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	2678 return;
35990c69b3ac Upstream: p->downstream_error instead of closing connection. Maxim Dounin <mdounin@mdounin.ru> parents: 5745 diff changeset	2679 }
35990c69b3ac Upstream: p->downstream_error instead of closing connection. Maxim Dounin <mdounin@mdounin.ru> parents: 5745 diff changeset	2680
35990c69b3ac Upstream: p->downstream_error instead of closing connection. Maxim Dounin <mdounin@mdounin.ru> parents: 5745 diff changeset	2681 u->pipe->downstream_error = 1;
2701 756f73ca1e39 support HEAD in proxy cache Igor Sysoev <igor@sysoev.ru> parents: 2692 diff changeset	2682 }
756f73ca1e39 support HEAD in proxy cache Igor Sysoev <igor@sysoev.ru> parents: 2692 diff changeset	2683
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	2684 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	2685 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	2686 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	2687 }
9c2f3ed7a247 nginx-0.3.3-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	2688
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2689 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	2690
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	2691 if (!u->buffering) {
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2692
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2693 if (u->input_filter == NULL) {
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2694 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	2695 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	2696 u->input_filter_ctx = r;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2697 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2698
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	2699 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	2700 r->write_event_handler =
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2701 ngx_http_upstream_process_non_buffered_downstream;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2702
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2703 r->limit_rate = 0;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2704
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2705 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	2706 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	2707 return;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2708 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2709
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	2710 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	2711 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	2712
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	2713 tcp_nodelay = 1;
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	2714
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	2715 if (setsockopt(c->fd, IPPROTO_TCP, TCP_NODELAY,
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	2716 (const void *) &tcp_nodelay, sizeof(int)) == -1)
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	2717 {
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	2718 ngx_connection_error(c, ngx_socket_errno,
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	2719 "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	2720 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	2721 return;
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	2722 }
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	2723
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	2724 c->tcp_nodelay = NGX_TCP_NODELAY_SET;
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	2725 }
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	2726
2402 cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	2727 n = u->buffer.last - u->buffer.pos;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	2728
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	2729 if (n) {
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2730 u->buffer.last = u->buffer.pos;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2731
2402 cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	2732 u->state->response_length += n;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	2733
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	2734 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	2735 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	2736 return;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2737 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2738
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	2739 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	2740
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2741 } else {
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2742 u->buffer.pos = u->buffer.start;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2743 u->buffer.last = u->buffer.start;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2744
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2745 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	2746 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	2747 return;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2748 }
1468 491e5059ea19 read EOF of header only responses in non-buffered proxying Igor Sysoev <igor@sysoev.ru> parents: 1397 diff changeset	2749
4120 42135dd1f0ea Upstream: keepalive flag. Maxim Dounin <mdounin@mdounin.ru> parents: 4119 diff changeset	2750 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	2751 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	2752 }
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2753 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2754
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2755 return;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2756 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2757
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2758 /* TODO: preallocate event_pipe bufs, look "Content-Length" */
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2759
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2760 #if (NGX_HTTP_CACHE)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2761
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2762 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	2763 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	2764 r->cache->file.fd = NGX_INVALID_FILE;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2765 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2766
3699 b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	2767 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	2768
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	2769 case NGX_ERROR:
5295 a489c31c9783 Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5294 diff changeset	2770 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	2771 return;
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	2772
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	2773 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	2774 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	2775 break;
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	2776
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	2777 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	2778
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	2779 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	2780
5950 eaeecf00d5d7 Upstream: preset some cache configuration when bypassing. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2781 /* create cache if previously bypassed */
3699 b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	2782
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	2783 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	2784 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	2785 return;
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	2786 }
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	2787 }
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	2788
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	2789 break;
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	2790 }
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	2791
1565 4c43e25d11ea fix English grammar Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	2792 if (u->cacheable) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2793 time_t now, valid;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2794
2663 09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	2795 now = ngx_time();
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	2796
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	2797 valid = r->cache->valid_sec;
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	2798
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	2799 if (valid == 0) {
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	2800 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	2801 u->headers_in.status_n);
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	2802 if (valid) {
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	2803 r->cache->valid_sec = now + valid;
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	2804 }
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	2805 }
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	2806
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2807 if (valid) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2808 r->cache->date = now;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2809 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	2810
5935 1573fc7875fa Cache: send conditional requests only for cached 200/206 responses. Piotr Sikora <piotr@cloudflare.com> parents: 5928 diff changeset	2811 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	2812 \|\| 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	2813 {
1573fc7875fa Cache: send conditional requests only for cached 200/206 responses. Piotr Sikora <piotr@cloudflare.com> parents: 5928 diff changeset	2814 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	2815
1573fc7875fa Cache: send conditional requests only for cached 200/206 responses. Piotr Sikora <piotr@cloudflare.com> parents: 5928 diff changeset	2816 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	2817 r->cache->etag = u->headers_in.etag->value;
5992 174512857ccf Cache: do not inherit last_modified and etag from stale response. Roman Arutyunyan <arut@nginx.com> parents: 5977 diff changeset	2818
174512857ccf Cache: do not inherit last_modified and etag from stale response. Roman Arutyunyan <arut@nginx.com> parents: 5977 diff changeset	2819 } else {
174512857ccf Cache: do not inherit last_modified and etag from stale response. Roman Arutyunyan <arut@nginx.com> parents: 5977 diff changeset	2820 ngx_str_null(&r->cache->etag);
5935 1573fc7875fa Cache: send conditional requests only for cached 200/206 responses. Piotr Sikora <piotr@cloudflare.com> parents: 5928 diff changeset	2821 }
5992 174512857ccf Cache: do not inherit last_modified and etag from stale response. Roman Arutyunyan <arut@nginx.com> parents: 5977 diff changeset	2822
174512857ccf Cache: do not inherit last_modified and etag from stale response. Roman Arutyunyan <arut@nginx.com> parents: 5977 diff changeset	2823 } else {
174512857ccf Cache: do not inherit last_modified and etag from stale response. Roman Arutyunyan <arut@nginx.com> parents: 5977 diff changeset	2824 r->cache->last_modified = -1;
174512857ccf Cache: do not inherit last_modified and etag from stale response. Roman Arutyunyan <arut@nginx.com> parents: 5977 diff changeset	2825 ngx_str_null(&r->cache->etag);
5737 44b9ab7752e3 Cache: ETag now saved into cache header. Maxim Dounin <mdounin@mdounin.ru> parents: 5735 diff changeset	2826 }
44b9ab7752e3 Cache: ETag now saved into cache header. Maxim Dounin <mdounin@mdounin.ru> parents: 5735 diff changeset	2827
5959 f7584d7c0ccb Cache: update variant while setting header. Valentin Bartenev <vbart@nginx.com> parents: 5951 diff changeset	2828 if (ngx_http_file_cache_set_header(r, u->buffer.start) != NGX_OK) {
f7584d7c0ccb Cache: update variant while setting header. Valentin Bartenev <vbart@nginx.com> parents: 5951 diff changeset	2829 ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
f7584d7c0ccb Cache: update variant while setting header. Valentin Bartenev <vbart@nginx.com> parents: 5951 diff changeset	2830 return;
f7584d7c0ccb Cache: update variant while setting header. Valentin Bartenev <vbart@nginx.com> parents: 5951 diff changeset	2831 }
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2832
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2833 } else {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2834 u->cacheable = 0;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2835 }
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2836 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2837
2690 d3cffe32b930 add debug logging Igor Sysoev <igor@sysoev.ru> parents: 2669 diff changeset	2838 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
d3cffe32b930 add debug logging Igor Sysoev <igor@sysoev.ru> parents: 2669 diff changeset	2839 "http cacheable: %d", u->cacheable);
d3cffe32b930 add debug logging Igor Sysoev <igor@sysoev.ru> parents: 2669 diff changeset	2840
3083 ffe8bfb38184 clean cache updating state if a response has uncacheable code or Igor Sysoev <igor@sysoev.ru> parents: 3056 diff changeset	2841 if (u->cacheable == 0 && r->cache) {
3711 ce6ba077c270 several changes in cache cleanup handling: Igor Sysoev <igor@sysoev.ru> parents: 3709 diff changeset	2842 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	2843 }
ffe8bfb38184 clean cache updating state if a response has uncacheable code or Igor Sysoev <igor@sysoev.ru> parents: 3056 diff changeset	2844
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2845 #endif
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2846
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2847 p = u->pipe;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2848
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2849 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	2850 p->output_ctx = r;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2851 p->tag = u->output.tag;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2852 p->bufs = u->conf->bufs;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2853 p->busy_size = u->conf->busy_buffers_size;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2854 p->upstream = u->peer.connection;
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	2855 p->downstream = c;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2856 p->pool = r->pool;
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	2857 p->log = c->log;
5883 973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	2858 p->limit_rate = u->conf->limit_rate;
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	2859 p->start_sec = ngx_time();
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2860
1565 4c43e25d11ea fix English grammar Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	2861 p->cacheable = u->cacheable \|\| u->store;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2862
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 487 diff changeset	2863 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	2864 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	2865 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	2866 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2867 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2868
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2869 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	2870 p->temp_file->file.log = c->log;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2871 p->temp_file->path = u->conf->temp_path;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2872 p->temp_file->pool = r->pool;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2873
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2874 if (p->cacheable) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2875 p->temp_file->persistent = 1;
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	2876
5960 e9effef98874 Upstream: use_temp_path parameter of proxy_cache_path and friends. Valentin Bartenev <vbart@nginx.com> parents: 5959 diff changeset	2877 #if (NGX_HTTP_CACHE)
5968 99639bfdfa2a Cache: added temp_path to file cache. Roman Arutyunyan <arut@nginx.com> parents: 5964 diff changeset	2878 if (r->cache && r->cache->file_cache->temp_path) {
99639bfdfa2a Cache: added temp_path to file cache. Roman Arutyunyan <arut@nginx.com> parents: 5964 diff changeset	2879 p->temp_file->path = r->cache->file_cache->temp_path;
5960 e9effef98874 Upstream: use_temp_path parameter of proxy_cache_path and friends. Valentin Bartenev <vbart@nginx.com> parents: 5959 diff changeset	2880 }
e9effef98874 Upstream: use_temp_path parameter of proxy_cache_path and friends. Valentin Bartenev <vbart@nginx.com> parents: 5959 diff changeset	2881 #endif
e9effef98874 Upstream: use_temp_path parameter of proxy_cache_path and friends. Valentin Bartenev <vbart@nginx.com> parents: 5959 diff changeset	2882
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2883 } else {
667 63a820b0bc6c nginx-0.3.55-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 665 diff changeset	2884 p->temp_file->log_level = NGX_LOG_WARN;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2885 p->temp_file->warn = "an upstream response is buffered "
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2886 "to a temporary file";
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2887 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2888
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2889 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	2890 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	2891
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 487 diff changeset	2892 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	2893 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	2894 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	2895 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2896 }
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	2897
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2898 p->preread_bufs->buf = &u->buffer;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2899 p->preread_bufs->next = NULL;
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2900 u->buffer.recycled = 1;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2901
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2902 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	2903
1565 4c43e25d11ea fix English grammar Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	2904 if (u->cacheable) {
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	2905
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2906 p->buf_to_file = ngx_calloc_buf(r->pool);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2907 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	2908 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	2909 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2910 }
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	2911
4895 508e61393b6c Event pipe: fixed handling of buf_to_file data. Maxim Dounin <mdounin@mdounin.ru> parents: 4769 diff changeset	2912 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	2913 p->buf_to_file->pos = u->buffer.start;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2914 p->buf_to_file->last = u->buffer.pos;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2915 p->buf_to_file->temporary = 1;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2916 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2917
6125 4dc8e7b62216 Removed the obsolete aio module. Ruslan Ermilov <ru@nginx.com> parents: 6068 diff changeset	2918 if (ngx_event_flags & NGX_USE_IOCP_EVENT) {
4499 778ef9c3fd2d Fixed spelling in single-line comments. Ruslan Ermilov <ru@nginx.com> parents: 4474 diff changeset	2919 /* 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	2920 p->single_buf = 1;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2921 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2922
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2923 /* 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	2924 p->free_bufs = 1;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2925
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2926 /*
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2927 * 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	2928 * as though these bytes were read
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2929 */
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2930 u->buffer.last = u->buffer.pos;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2931
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2932 if (u->conf->cyclic_temp_file) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2933
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2934 /*
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2935 * 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	2936 * 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	2937 * 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	2938 */
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2939
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2940 p->cyclic_temp_file = 1;
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	2941 c->sendfile = 0;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2942
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2943 } else {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2944 p->cyclic_temp_file = 0;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2945 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2946
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2947 p->read_timeout = u->conf->read_timeout;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2948 p->send_timeout = clcf->send_timeout;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2949 p->send_lowat = clcf->send_lowat;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2950
4119 b66712cde67d Upstream: pipe length and input_filter_init in buffered mode. Maxim Dounin <mdounin@mdounin.ru> parents: 4118 diff changeset	2951 p->length = -1;
b66712cde67d Upstream: pipe length and input_filter_init in buffered mode. Maxim Dounin <mdounin@mdounin.ru> parents: 4118 diff changeset	2952
b66712cde67d Upstream: pipe length and input_filter_init in buffered mode. Maxim Dounin <mdounin@mdounin.ru> parents: 4118 diff changeset	2953 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	2954 && 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	2955 {
5295 a489c31c9783 Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5294 diff changeset	2956 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	2957 return;
b66712cde67d Upstream: pipe length and input_filter_init in buffered mode. Maxim Dounin <mdounin@mdounin.ru> parents: 4118 diff changeset	2958 }
b66712cde67d Upstream: pipe length and input_filter_init in buffered mode. Maxim Dounin <mdounin@mdounin.ru> parents: 4118 diff changeset	2959
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	2960 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	2961 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	2962
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2963 ngx_http_upstream_process_upstream(r, u);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2964 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2965
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2966
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	2967 static void
5072 7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2968 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	2969 {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2970 int tcp_nodelay;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2971 ngx_connection_t *c;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2972 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	2973
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2974 c = r->connection;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2975 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	2976
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2977 /* 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	2978
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2979 r->keepalive = 0;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2980 c->log->action = "proxying upgraded connection";
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2981
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2982 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	2983 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	2984 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	2985 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	2986
5142 afea5259e05c Upstream: fixed tcp_nodelay with connection upgrade (ticket #325). Maxim Dounin <mdounin@mdounin.ru> parents: 5132 diff changeset	2987 if (clcf->tcp_nodelay) {
5072 7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2988 tcp_nodelay = 1;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2989
5142 afea5259e05c Upstream: fixed tcp_nodelay with connection upgrade (ticket #325). Maxim Dounin <mdounin@mdounin.ru> parents: 5132 diff changeset	2990 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	2991 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	2992
afea5259e05c Upstream: fixed tcp_nodelay with connection upgrade (ticket #325). Maxim Dounin <mdounin@mdounin.ru> parents: 5132 diff changeset	2993 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	2994 (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	2995 {
afea5259e05c Upstream: fixed tcp_nodelay with connection upgrade (ticket #325). Maxim Dounin <mdounin@mdounin.ru> parents: 5132 diff changeset	2996 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	2997 "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	2998 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	2999 return;
afea5259e05c Upstream: fixed tcp_nodelay with connection upgrade (ticket #325). Maxim Dounin <mdounin@mdounin.ru> parents: 5132 diff changeset	3000 }
afea5259e05c Upstream: fixed tcp_nodelay with connection upgrade (ticket #325). Maxim Dounin <mdounin@mdounin.ru> parents: 5132 diff changeset	3001
afea5259e05c Upstream: fixed tcp_nodelay with connection upgrade (ticket #325). Maxim Dounin <mdounin@mdounin.ru> parents: 5132 diff changeset	3002 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	3003 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3004
5142 afea5259e05c Upstream: fixed tcp_nodelay with connection upgrade (ticket #325). Maxim Dounin <mdounin@mdounin.ru> parents: 5132 diff changeset	3005 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	3006 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	3007 "tcp_nodelay");
afea5259e05c Upstream: fixed tcp_nodelay with connection upgrade (ticket #325). Maxim Dounin <mdounin@mdounin.ru> parents: 5132 diff changeset	3008
afea5259e05c Upstream: fixed tcp_nodelay with connection upgrade (ticket #325). Maxim Dounin <mdounin@mdounin.ru> parents: 5132 diff changeset	3009 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	3010 (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	3011 {
afea5259e05c Upstream: fixed tcp_nodelay with connection upgrade (ticket #325). Maxim Dounin <mdounin@mdounin.ru> parents: 5132 diff changeset	3012 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	3013 "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	3014 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	3015 return;
afea5259e05c Upstream: fixed tcp_nodelay with connection upgrade (ticket #325). Maxim Dounin <mdounin@mdounin.ru> parents: 5132 diff changeset	3016 }
afea5259e05c Upstream: fixed tcp_nodelay with connection upgrade (ticket #325). Maxim Dounin <mdounin@mdounin.ru> parents: 5132 diff changeset	3017
afea5259e05c Upstream: fixed tcp_nodelay with connection upgrade (ticket #325). Maxim Dounin <mdounin@mdounin.ru> parents: 5132 diff changeset	3018 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	3019 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3020 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3021
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3022 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	3023 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	3024 return;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3025 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3026
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3027 if (u->peer.connection->read->ready
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3028 \|\| u->buffer.pos != u->buffer.last)
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3029 {
5579 7586e7b2dbe9 Upstream: ngx_post_event() instead of upgraded call (ticket #503). Maxim Dounin <mdounin@mdounin.ru> parents: 5557 diff changeset	3030 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	3031 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	3032 return;
5072 7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3033 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3034
5532 17134d29782e Upstream: reading from a client after connection upgrade. Maxim Dounin <mdounin@mdounin.ru> parents: 5500 diff changeset	3035 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	3036 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3037
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3038
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3039 static void
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3040 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	3041 {
5073 52eb762c68a9 Proxy: fixed do_write handling in previous commit. Maxim Dounin <mdounin@mdounin.ru> parents: 5072 diff changeset	3042 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	3043 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3044
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3045
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3046 static void
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3047 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	3048 {
5073 52eb762c68a9 Proxy: fixed do_write handling in previous commit. Maxim Dounin <mdounin@mdounin.ru> parents: 5072 diff changeset	3049 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	3050 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3051
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3052
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3053 static void
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3054 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	3055 ngx_http_upstream_t *u)
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3056 {
5073 52eb762c68a9 Proxy: fixed do_write handling in previous commit. Maxim Dounin <mdounin@mdounin.ru> parents: 5072 diff changeset	3057 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	3058 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3059
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3060
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3061 static void
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3062 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	3063 ngx_http_upstream_t *u)
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3064 {
5073 52eb762c68a9 Proxy: fixed do_write handling in previous commit. Maxim Dounin <mdounin@mdounin.ru> parents: 5072 diff changeset	3065 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	3066 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3067
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3068
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3069 static void
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3070 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	3071 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	3072 {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3073 size_t size;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3074 ssize_t n;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3075 ngx_buf_t *b;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3076 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	3077 ngx_http_upstream_t *u;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3078 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	3079
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3080 c = r->connection;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3081 u = r->upstream;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3082
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3083 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	3084 "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	3085
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3086 downstream = c;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3087 upstream = u->peer.connection;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3088
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3089 if (downstream->write->timedout) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3090 c->timedout = 1;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3091 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	3092 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	3093 return;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3094 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3095
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3096 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	3097 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	3098 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	3099 return;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3100 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3101
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3102 if (from_upstream) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3103 src = upstream;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3104 dst = downstream;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3105 b = &u->buffer;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3106
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3107 } else {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3108 src = downstream;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3109 dst = upstream;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3110 b = &u->from_client;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3111
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3112 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	3113 b = r->header_in;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3114 b->end = b->last;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3115 do_write = 1;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3116 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3117
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3118 if (b->start == NULL) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3119 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	3120 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	3121 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	3122 return;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3123 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3124
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3125 b->pos = b->start;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3126 b->last = b->start;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3127 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	3128 b->temporary = 1;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3129 b->tag = u->output.tag;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3130 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3131 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3132
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3133 for ( ;; ) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3134
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3135 if (do_write) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3136
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3137 size = b->last - b->pos;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3138
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3139 if (size && dst->write->ready) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3140
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3141 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	3142
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3143 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	3144 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	3145 return;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3146 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3147
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3148 if (n > 0) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3149 b->pos += n;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3150
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3151 if (b->pos == b->last) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3152 b->pos = b->start;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3153 b->last = b->start;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3154 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3155 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3156 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3157 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3158
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3159 size = b->end - b->last;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3160
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3161 if (size && src->read->ready) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3162
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3163 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	3164
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3165 if (n == NGX_AGAIN \|\| n == 0) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3166 break;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3167 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3168
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3169 if (n > 0) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3170 do_write = 1;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3171 b->last += n;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3172
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3173 continue;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3174 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3175
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3176 if (n == NGX_ERROR) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3177 src->read->eof = 1;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3178 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3179 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3180
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3181 break;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3182 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3183
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3184 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	3185 \|\| (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	3186 \|\| (downstream->read->eof && upstream->read->eof))
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3187 {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3188 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	3189 "http upstream upgraded done");
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3190 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	3191 return;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3192 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3193
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3194 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	3195
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3196 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	3197 != NGX_OK)
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3198 {
5295 a489c31c9783 Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5294 diff changeset	3199 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	3200 return;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3201 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3202
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3203 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	3204 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	3205
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3206 } else if (upstream->write->timer_set) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3207 ngx_del_timer(upstream->write);
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3208 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3209
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3210 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	3211 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	3212 return;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3213 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3214
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3215 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	3216 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	3217
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3218 } else if (upstream->read->timer_set) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3219 ngx_del_timer(upstream->read);
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3220 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3221
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3222 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	3223 != NGX_OK)
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3224 {
5295 a489c31c9783 Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5294 diff changeset	3225 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	3226 return;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3227 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3228
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3229 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	3230 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	3231 return;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3232 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3233
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3234 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	3235 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	3236
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3237 } else if (downstream->write->timer_set) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3238 ngx_del_timer(downstream->write);
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3239 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3240 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3241
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3242
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3243 static void
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3244 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	3245 {
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3246 ngx_event_t *wev;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3247 ngx_connection_t *c;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3248 ngx_http_upstream_t *u;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3249
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3250 c = r->connection;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3251 u = r->upstream;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3252 wev = c->write;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3253
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3254 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	3255 "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	3256
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3257 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	3258
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3259 if (wev->timedout) {
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3260 c->timedout = 1;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3261 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	3262 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	3263 return;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3264 }
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3265
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3266 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	3267 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3268
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3269
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3270 static void
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	3271 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	3272 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	3273 {
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	3274 ngx_connection_t *c;
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	3275
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	3276 c = u->peer.connection;
2381 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 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	3279 "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	3280
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3281 c->log->action = "reading upstream";
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3282
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	3283 if (c->read->timedout) {
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3284 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	3285 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	3286 return;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3287 }
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3288
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3289 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	3290 }
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
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3293 static void
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3294 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	3295 ngx_uint_t do_write)
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3296 {
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3297 size_t size;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3298 ssize_t n;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3299 ngx_buf_t *b;
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	3300 ngx_int_t rc;
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3301 ngx_connection_t downstream, upstream;
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3302 ngx_http_upstream_t *u;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3303 ngx_http_core_loc_conf_t *clcf;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3304
756 d904b5cb3bba fix building introduced by previous commit Igor Sysoev <igor@sysoev.ru> parents: 755 diff changeset	3305 u = r->upstream;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3306 downstream = r->connection;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3307 upstream = u->peer.connection;
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3308
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3309 b = &u->buffer;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3310
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3311 do_write = do_write \|\| u->length == 0;
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3312
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3313 for ( ;; ) {
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3314
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3315 if (do_write) {
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3316
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3317 if (u->out_bufs \|\| u->busy_bufs) {
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	3318 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	3319
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	3320 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	3321 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	3322 return;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3323 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3324
4114 5db098f97e0e API change: ngx_chain_update_chains() now requires pool. Maxim Dounin <mdounin@mdounin.ru> parents: 3976 diff changeset	3325 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	3326 &u->out_bufs, u->output.tag);
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3327 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3328
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3329 if (u->busy_bufs == NULL) {
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3330
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3331 if (u->length == 0
5301 a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3332 \|\| (upstream->read->eof && u->length == -1))
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3333 {
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3334 ngx_http_upstream_finalize_request(r, u, 0);
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3335 return;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3336 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3337
5301 a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3338 if (upstream->read->eof) {
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3339 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	3340 "upstream prematurely closed connection");
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3341
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3342 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	3343 NGX_HTTP_BAD_GATEWAY);
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3344 return;
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3345 }
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3346
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3347 if (upstream->read->error) {
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3348 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	3349 NGX_HTTP_BAD_GATEWAY);
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3350 return;
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3351 }
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3352
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3353 b->pos = b->start;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3354 b->last = b->start;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3355 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3356 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3357
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3358 size = b->end - b->last;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3359
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3360 if (size && upstream->read->ready) {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3361
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3362 n = upstream->recv(upstream, b->last, size);
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3363
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3364 if (n == NGX_AGAIN) {
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3365 break;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3366 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3367
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3368 if (n > 0) {
2402 cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	3369 u->state->response_length += n;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	3370
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3371 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	3372 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	3373 return;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3374 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3375 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3376
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3377 do_write = 1;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3378
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3379 continue;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3380 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3381
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3382 break;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3383 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3384
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3385 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	3386
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3387 if (downstream->data == r) {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3388 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	3389 != NGX_OK)
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	3390 {
5295 a489c31c9783 Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5294 diff changeset	3391 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	3392 return;
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	3393 }
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3394 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3395
1063 e2a6ecc5a3ae a non-active client connection must not closed after send timeout Igor Sysoev <igor@sysoev.ru> parents: 1031 diff changeset	3396 if (downstream->write->active && !downstream->write->ready) {
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3397 ngx_add_timer(downstream->write, clcf->send_timeout);
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3398
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3399 } else if (downstream->write->timer_set) {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3400 ngx_del_timer(downstream->write);
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3401 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3402
2377 87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	3403 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	3404 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	3405 return;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3406 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3407
1063 e2a6ecc5a3ae a non-active client connection must not closed after send timeout Igor Sysoev <igor@sysoev.ru> parents: 1031 diff changeset	3408 if (upstream->read->active && !upstream->read->ready) {
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3409 ngx_add_timer(upstream->read, u->conf->read_timeout);
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3410
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3411 } else if (upstream->read->timer_set) {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3412 ngx_del_timer(upstream->read);
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3413 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3414 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3415
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3416
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3417 static ngx_int_t
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3418 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	3419 {
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3420 return NGX_OK;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3421 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3422
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3423
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3424 static ngx_int_t
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3425 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	3426 {
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3427 ngx_http_request_t *r = data;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3428
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3429 ngx_buf_t *b;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3430 ngx_chain_t cl, *ll;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3431 ngx_http_upstream_t *u;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3432
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3433 u = r->upstream;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3434
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3435 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	3436 ll = &cl->next;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3437 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3438
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3439 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	3440 if (cl == NULL) {
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3441 return NGX_ERROR;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3442 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3443
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3444 *ll = cl;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3445
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3446 cl->buf->flush = 1;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3447 cl->buf->memory = 1;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3448
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3449 b = &u->buffer;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3450
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3451 cl->buf->pos = b->last;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3452 b->last += bytes;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3453 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	3454 cl->buf->tag = u->output.tag;
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3455
4118 dbddec65fdab Upstream: r->upstream->length type change to off_t. Maxim Dounin <mdounin@mdounin.ru> parents: 4117 diff changeset	3456 if (u->length == -1) {
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3457 return NGX_OK;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3458 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3459
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3460 u->length -= bytes;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3461
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3462 return NGX_OK;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3463 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3464
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3465
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3466 static void
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3467 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	3468 {
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3469 ngx_event_t *wev;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3470 ngx_connection_t *c;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3471 ngx_event_pipe_t *p;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3472 ngx_http_upstream_t *u;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3473
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3474 c = r->connection;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3475 u = r->upstream;
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3476 p = u->pipe;
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3477 wev = c->write;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3478
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3479 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	3480 "http upstream process downstream");
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3481
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3482 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	3483
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3484 if (wev->timedout) {
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3485
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3486 if (wev->delayed) {
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3487
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3488 wev->timedout = 0;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3489 wev->delayed = 0;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3490
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3491 if (!wev->ready) {
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3492 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	3493
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3494 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	3495 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	3496 }
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3497
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3498 return;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3499 }
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3500
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3501 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	3502 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	3503 return;
527 7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	3504 }
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3505
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3506 } else {
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3507 p->downstream_error = 1;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3508 c->timedout = 1;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3509 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	3510 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3511
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3512 } else {
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3513
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3514 if (wev->delayed) {
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3515
527 7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	3516 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	3517 "http downstream delayed");
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	3518
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3519 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	3520 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	3521 }
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	3522
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	3523 return;
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	3524 }
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	3525
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3526 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	3527 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	3528 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3529 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3530 }
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3531
5995 5f179f344096 Upstream: upstream argument in ngx_http_upstream_process_request(). Maxim Dounin <mdounin@mdounin.ru> parents: 5994 diff changeset	3532 ngx_http_upstream_process_request(r, u);
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3533 }
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3534
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3535
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3536 static void
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	3537 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	3538 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	3539 {
5883 973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3540 ngx_event_t *rev;
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3541 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	3542 ngx_connection_t *c;
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	3543
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	3544 c = u->peer.connection;
5883 973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3545 p = u->pipe;
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3546 rev = c->read;
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3547
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3548 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	3549 "http upstream process upstream");
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3550
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3551 c->log->action = "reading upstream";
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3552
5883 973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3553 if (rev->timedout) {
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3554
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3555 if (rev->delayed) {
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3556
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3557 rev->timedout = 0;
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3558 rev->delayed = 0;
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3559
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3560 if (!rev->ready) {
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3561 ngx_add_timer(rev, p->read_timeout);
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3562
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3563 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	3564 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	3565 }
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3566
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3567 return;
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3568 }
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3569
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3570 if (ngx_event_pipe(p, 0) == NGX_ABORT) {
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3571 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	3572 return;
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3573 }
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3574
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3575 } else {
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3576 p->upstream_error = 1;
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3577 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	3578 }
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3579
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3580 } else {
5883 973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3581
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3582 if (rev->delayed) {
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3583
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3584 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	3585 "http upstream delayed");
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3586
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3587 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	3588 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	3589 }
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3590
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3591 return;
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3592 }
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3593
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3594 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	3595 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	3596 return;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3597 }
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3598 }
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3599
5995 5f179f344096 Upstream: upstream argument in ngx_http_upstream_process_request(). Maxim Dounin <mdounin@mdounin.ru> parents: 5994 diff changeset	3600 ngx_http_upstream_process_request(r, u);
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3601 }
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3602
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3603
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3604 static void
5995 5f179f344096 Upstream: upstream argument in ngx_http_upstream_process_request(). Maxim Dounin <mdounin@mdounin.ru> parents: 5994 diff changeset	3605 ngx_http_upstream_process_request(ngx_http_request_t *r,
5f179f344096 Upstream: upstream argument in ngx_http_upstream_process_request(). Maxim Dounin <mdounin@mdounin.ru> parents: 5994 diff changeset	3606 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	3607 {
5996 ab660d7c9980 Style. Maxim Dounin <mdounin@mdounin.ru> parents: 5995 diff changeset	3608 ngx_temp_file_t *tf;
ab660d7c9980 Style. Maxim Dounin <mdounin@mdounin.ru> parents: 5995 diff changeset	3609 ngx_event_pipe_t *p;
5995 5f179f344096 Upstream: upstream argument in ngx_http_upstream_process_request(). Maxim Dounin <mdounin@mdounin.ru> parents: 5994 diff changeset	3610
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3611 p = u->pipe;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3612
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3613 if (u->peer.connection) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3614
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3615 if (u->store) {
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3616
2463 4bc8ea10d62b fix fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 2445 diff changeset	3617 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	3618
5298 a7b2db9119e0 Upstream: replaced u->pipe->temp_file with p->temp_file. Maxim Dounin <mdounin@mdounin.ru> parents: 5297 diff changeset	3619 tf = p->temp_file;
4469 24c0dca04eb9 Fix for proxy_store leaving temporary files for subrequests. Maxim Dounin <mdounin@mdounin.ru> parents: 4464 diff changeset	3620
2445 3c6af1fb7586 proxy/fastcgi_store did not delete incomplete files Igor Sysoev <igor@sysoev.ru> parents: 2441 diff changeset	3621 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	3622 && (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	3623 && (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	3624 \|\| 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	3625 {
3c6af1fb7586 proxy/fastcgi_store did not delete incomplete files Igor Sysoev <igor@sysoev.ru> parents: 2441 diff changeset	3626 ngx_http_upstream_store(r, u);
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3627 }
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3628 }
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3629 }
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3630
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	3631 #if (NGX_HTTP_CACHE)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	3632
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	3633 if (u->cacheable) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	3634
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	3635 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	3636 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	3637
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	3638 } else if (p->upstream_eof) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	3639
5298 a7b2db9119e0 Upstream: replaced u->pipe->temp_file with p->temp_file. Maxim Dounin <mdounin@mdounin.ru> parents: 5297 diff changeset	3640 tf = p->temp_file;
4298 186f02886bed Upstream: don't cache unfinished responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4197 diff changeset	3641
5299 b779728b180c Upstream: fixed store/cache of unfinished responses. Maxim Dounin <mdounin@mdounin.ru> parents: 5298 diff changeset	3642 if (p->length == -1
b779728b180c Upstream: fixed store/cache of unfinished responses. Maxim Dounin <mdounin@mdounin.ru> parents: 5298 diff changeset	3643 && (u->headers_in.content_length_n == -1
b779728b180c Upstream: fixed store/cache of unfinished responses. Maxim Dounin <mdounin@mdounin.ru> parents: 5298 diff changeset	3644 \|\| u->headers_in.content_length_n
b779728b180c Upstream: fixed store/cache of unfinished responses. Maxim Dounin <mdounin@mdounin.ru> parents: 5298 diff changeset	3645 == 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	3646 {
186f02886bed Upstream: don't cache unfinished responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4197 diff changeset	3647 ngx_http_file_cache_update(r, tf);
186f02886bed Upstream: don't cache unfinished responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4197 diff changeset	3648
186f02886bed Upstream: don't cache unfinished responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4197 diff changeset	3649 } else {
186f02886bed Upstream: don't cache unfinished responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4197 diff changeset	3650 ngx_http_file_cache_free(r->cache, tf);
186f02886bed Upstream: don't cache unfinished responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4197 diff changeset	3651 }
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	3652
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	3653 } 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	3654 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	3655 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3656 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3657
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3658 #endif
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3659
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3660 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	3661 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	3662 "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	3663
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3664 if (p->upstream_done
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3665 \|\| (p->upstream_eof && p->length == -1))
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3666 {
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3667 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	3668 return;
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3669 }
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3670
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3671 if (p->upstream_eof) {
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3672 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	3673 "upstream prematurely closed connection");
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3674 }
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3675
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3676 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	3677 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3678 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3679 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3680
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3681 if (p->downstream_error) {
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3682 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	3683 "http upstream downstream error");
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3684
2757 9cc973b46af1 get a full response if the response is cacheable or storable even Igor Sysoev <igor@sysoev.ru> parents: 2708 diff changeset	3685 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	3686 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	3687 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3688 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3689 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3690
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3691
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	3692 static void
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3693 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	3694 {
1947 94b03bbd328e use ngx_ext_rename_file() in proxy/fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1916 diff changeset	3695 size_t root;
94b03bbd328e use ngx_ext_rename_file() in proxy/fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1916 diff changeset	3696 time_t lm;
94b03bbd328e use ngx_ext_rename_file() in proxy/fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1916 diff changeset	3697 ngx_str_t path;
94b03bbd328e use ngx_ext_rename_file() in proxy/fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1916 diff changeset	3698 ngx_temp_file_t *tf;
94b03bbd328e use ngx_ext_rename_file() in proxy/fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1916 diff changeset	3699 ngx_ext_rename_file_t ext;
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3700
1777 edaea30d83be optimization Igor Sysoev <igor@sysoev.ru> parents: 1707 diff changeset	3701 tf = u->pipe->temp_file;
edaea30d83be optimization Igor Sysoev <igor@sysoev.ru> parents: 1707 diff changeset	3702
edaea30d83be optimization Igor Sysoev <igor@sysoev.ru> parents: 1707 diff changeset	3703 if (tf->file.fd == NGX_INVALID_FILE) {
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3704
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3705 /* create file for empty 200 response */
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3706
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3707 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	3708 if (tf == NULL) {
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3709 return;
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3710 }
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3711
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3712 tf->file.fd = NGX_INVALID_FILE;
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3713 tf->file.log = r->connection->log;
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3714 tf->path = u->conf->temp_path;
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3715 tf->pool = r->pool;
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3716 tf->persistent = 1;
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3717
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3718 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	3719 tf->persistent, tf->clean, tf->access)
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3720 != NGX_OK)
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3721 {
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3722 return;
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3723 }
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3724
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3725 u->pipe->temp_file = tf;
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3726 }
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3727
1947 94b03bbd328e use ngx_ext_rename_file() in proxy/fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1916 diff changeset	3728 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	3729 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	3730 ext.time = -1;
94b03bbd328e use ngx_ext_rename_file() in proxy/fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1916 diff changeset	3731 ext.create_path = 1;
94b03bbd328e use ngx_ext_rename_file() in proxy/fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1916 diff changeset	3732 ext.delete_file = 1;
94b03bbd328e use ngx_ext_rename_file() in proxy/fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1916 diff changeset	3733 ext.log = r->connection->log;
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3734
1705 d22095839d86 optimize r->upstream usage Igor Sysoev <igor@sysoev.ru> parents: 1701 diff changeset	3735 if (u->headers_in.last_modified) {
d22095839d86 optimize r->upstream usage Igor Sysoev <igor@sysoev.ru> parents: 1701 diff changeset	3736
6180 8b6fa4842133 Moved ngx_http_parse_time() to core, renamed accordingly. Maxim Dounin <mdounin@mdounin.ru> parents: 6147 diff changeset	3737 lm = ngx_parse_http_time(u->headers_in.last_modified->value.data,
1947 94b03bbd328e use ngx_ext_rename_file() in proxy/fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1916 diff changeset	3738 u->headers_in.last_modified->value.len);
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3739
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3740 if (lm != NGX_ERROR) {
1947 94b03bbd328e use ngx_ext_rename_file() in proxy/fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1916 diff changeset	3741 ext.time = lm;
94b03bbd328e use ngx_ext_rename_file() in proxy/fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1916 diff changeset	3742 ext.fd = tf->file.fd;
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3743 }
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3744 }
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3745
1295 5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	3746 if (u->conf->store_lengths == NULL) {
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	3747
5770 9de5820bb3e0 Upstream: ngx_http_upstream_store() error handling fixes. Maxim Dounin <mdounin@mdounin.ru> parents: 5757 diff changeset	3748 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	3749 return;
9de5820bb3e0 Upstream: ngx_http_upstream_store() error handling fixes. Maxim Dounin <mdounin@mdounin.ru> parents: 5757 diff changeset	3750 }
1295 5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	3751
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	3752 } else {
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	3753 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	3754 u->conf->store_values->elts)
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	3755 == NULL)
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	3756 {
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	3757 return;
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	3758 }
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	3759 }
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3760
3032 524ba56ba9f7 fix copy destination name length, introduced in r3025 Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	3761 path.len--;
524ba56ba9f7 fix copy destination name length, introduced in r3025 Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	3762
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3763 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	3764 "upstream stores \"%s\" to \"%s\"",
94b03bbd328e use ngx_ext_rename_file() in proxy/fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1916 diff changeset	3765 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	3766
94b03bbd328e use ngx_ext_rename_file() in proxy/fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1916 diff changeset	3767 (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	3768
9de5820bb3e0 Upstream: ngx_http_upstream_store() error handling fixes. Maxim Dounin <mdounin@mdounin.ru> parents: 5757 diff changeset	3769 u->store = 0;
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3770 }
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3771
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3772
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3773 static void
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	3774 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	3775 {
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	3776 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	3777 "http upstream dummy handler");
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3778 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3779
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3780
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	3781 static void
31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	3782 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	3783 ngx_uint_t ft_type)
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3784 {
5832 d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5827 diff changeset	3785 ngx_msec_t timeout;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3786 ngx_uint_t status, state;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3787
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3788 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	3789 "http next upstream, %xi", ft_type);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3790
5132 9bcf89ca78d2 Upstream: only call peer.free() if peer.get() selected a peer. Ruslan Ermilov <ru@nginx.com> parents: 5121 diff changeset	3791 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	3792
5231 05c53652e7b4 Upstream: http_403 support in proxy_next_upstream (and friends). Maxim Dounin <mdounin@mdounin.ru> parents: 5217 diff changeset	3793 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	3794 \|\| 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	3795 {
5132 9bcf89ca78d2 Upstream: only call peer.free() if peer.get() selected a peer. Ruslan Ermilov <ru@nginx.com> parents: 5121 diff changeset	3796 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	3797
5132 9bcf89ca78d2 Upstream: only call peer.free() if peer.get() selected a peer. Ruslan Ermilov <ru@nginx.com> parents: 5121 diff changeset	3798 } else {
9bcf89ca78d2 Upstream: only call peer.free() if peer.get() selected a peer. Ruslan Ermilov <ru@nginx.com> parents: 5121 diff changeset	3799 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	3800 }
9bcf89ca78d2 Upstream: only call peer.free() if peer.get() selected a peer. Ruslan Ermilov <ru@nginx.com> parents: 5121 diff changeset	3801
1378 0be898896d1a backup upstream servers Igor Sysoev <igor@sysoev.ru> parents: 1340 diff changeset	3802 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	3803 u->peer.sockaddr = NULL;
1378 0be898896d1a backup upstream servers Igor Sysoev <igor@sysoev.ru> parents: 1340 diff changeset	3804 }
525 09b42134ac0c nginx-0.1.37-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 515 diff changeset	3805
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3806 if (ft_type == NGX_HTTP_UPSTREAM_FT_TIMEOUT) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3807 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	3808 "upstream timed out");
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3809 }
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3810
6050 a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	3811 if (u->peer.cached && ft_type == NGX_HTTP_UPSTREAM_FT_ERROR
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	3812 && (!u->request_sent \|\| !r->request_body_no_buffering))
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	3813 {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3814 status = 0;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3815
4115 70a45a504905 Workaround for cpu hog on errors with cached connections. Maxim Dounin <mdounin@mdounin.ru> parents: 4114 diff changeset	3816 /* TODO: inform balancer instead */
70a45a504905 Workaround for cpu hog on errors with cached connections. Maxim Dounin <mdounin@mdounin.ru> parents: 4114 diff changeset	3817
70a45a504905 Workaround for cpu hog on errors with cached connections. Maxim Dounin <mdounin@mdounin.ru> parents: 4114 diff changeset	3818 u->peer.tries++;
70a45a504905 Workaround for cpu hog on errors with cached connections. Maxim Dounin <mdounin@mdounin.ru> parents: 4114 diff changeset	3819
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3820 } else {
5757 c5ec6944de98 Style: add whitespace between control statement and parentheses. Piotr Sikora <piotr@cloudflare.com> parents: 5746 diff changeset	3821 switch (ft_type) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3822
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3823 case NGX_HTTP_UPSTREAM_FT_TIMEOUT:
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3824 status = NGX_HTTP_GATEWAY_TIME_OUT;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3825 break;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3826
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3827 case NGX_HTTP_UPSTREAM_FT_HTTP_500:
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3828 status = NGX_HTTP_INTERNAL_SERVER_ERROR;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3829 break;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3830
5231 05c53652e7b4 Upstream: http_403 support in proxy_next_upstream (and friends). Maxim Dounin <mdounin@mdounin.ru> parents: 5217 diff changeset	3831 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	3832 status = NGX_HTTP_FORBIDDEN;
05c53652e7b4 Upstream: http_403 support in proxy_next_upstream (and friends). Maxim Dounin <mdounin@mdounin.ru> parents: 5217 diff changeset	3833 break;
05c53652e7b4 Upstream: http_403 support in proxy_next_upstream (and friends). Maxim Dounin <mdounin@mdounin.ru> parents: 5217 diff changeset	3834
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3835 case NGX_HTTP_UPSTREAM_FT_HTTP_404:
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3836 status = NGX_HTTP_NOT_FOUND;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3837 break;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3838
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3839 /*
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3840 * 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	3841 * never reach here
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3842 */
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3843
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3844 default:
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3845 status = NGX_HTTP_BAD_GATEWAY;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3846 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3847 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3848
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	3849 if (r->connection->error) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3850 ngx_http_upstream_finalize_request(r, u,
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3851 NGX_HTTP_CLIENT_CLOSED_REQUEST);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3852 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3853 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3854
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3855 if (status) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3856 u->state->status = status;
5832 d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5827 diff changeset	3857 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	3858
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5827 diff changeset	3859 if (u->peer.tries == 0
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5827 diff changeset	3860 \|\| !(u->conf->next_upstream & ft_type)
6050 a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	3861 \|\| (u->request_sent && r->request_body_no_buffering)
5832 d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5827 diff changeset	3862 \|\| (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	3863 {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3864 #if (NGX_HTTP_CACHE)
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3865
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	3866 if (u->cache_status == NGX_HTTP_CACHE_EXPIRED
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	3867 && (u->conf->cache_use_stale & ft_type))
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	3868 {
2805 60551422e150 reinit proxy/fastcgi header parser before ngx_http_upstream_cache_send() Igor Sysoev <igor@sysoev.ru> parents: 2804 diff changeset	3869 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	3870
60551422e150 reinit proxy/fastcgi header parser before ngx_http_upstream_cache_send() Igor Sysoev <igor@sysoev.ru> parents: 2804 diff changeset	3871 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	3872
60551422e150 reinit proxy/fastcgi header parser before ngx_http_upstream_cache_send() Igor Sysoev <igor@sysoev.ru> parents: 2804 diff changeset	3873 if (rc == NGX_OK) {
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	3874 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	3875 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	3876 }
60551422e150 reinit proxy/fastcgi header parser before ngx_http_upstream_cache_send() Igor Sysoev <igor@sysoev.ru> parents: 2804 diff changeset	3877
60551422e150 reinit proxy/fastcgi header parser before ngx_http_upstream_cache_send() Igor Sysoev <igor@sysoev.ru> parents: 2804 diff changeset	3878 ngx_http_upstream_finalize_request(r, u, rc);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3879 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3880 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3881 #endif
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3882
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3883 ngx_http_upstream_finalize_request(r, u, status);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3884 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3885 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3886 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3887
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3888 if (u->peer.connection) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3889 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	3890 "close http upstream connection: %d",
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3891 u->peer.connection->fd);
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3892 #if (NGX_HTTP_SSL)
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3893
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3894 if (u->peer.connection->ssl) {
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3895 u->peer.connection->ssl->no_wait_shutdown = 1;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3896 u->peer.connection->ssl->no_send_shutdown = 1;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3897
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3898 (void) ngx_ssl_shutdown(u->peer.connection);
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3899 }
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3900 #endif
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3901
4138 70e1ee2307f9 Fix of separate pool for upstream connections (r4117). Maxim Dounin <mdounin@mdounin.ru> parents: 4124 diff changeset	3902 if (u->peer.connection->pool) {
70e1ee2307f9 Fix of separate pool for upstream connections (r4117). Maxim Dounin <mdounin@mdounin.ru> parents: 4124 diff changeset	3903 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	3904 }
70e1ee2307f9 Fix of separate pool for upstream connections (r4117). Maxim Dounin <mdounin@mdounin.ru> parents: 4124 diff changeset	3905
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3906 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	3907 u->peer.connection = NULL;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3908 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3909
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3910 ngx_http_upstream_connect(r, u);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3911 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3912
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3913
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	3914 static void
569 174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	3915 ngx_http_upstream_cleanup(void *data)
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	3916 {
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	3917 ngx_http_request_t *r = data;
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	3918
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	3919 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	3920 "cleanup http upstream request: \"%V\"", &r->uri);
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	3921
5167 85ee9d858dcb Upstream: removed surplus ngx_resolve_name_done() call. Valentin Bartenev <vbart@nginx.com> parents: 5142 diff changeset	3922 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	3923 }
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	3924
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	3925
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	3926 static void
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	3927 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	3928 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	3929 {
6146 59fc60585f1e Upstream: times to obtain header/response are stored as ngx_msec_t. Ruslan Ermilov <ru@nginx.com> parents: 6125 diff changeset	3930 ngx_uint_t flush;
563 9c2f3ed7a247 nginx-0.3.3-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	3931
483 621229427cba nginx-0.1.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	3932 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	3933 "finalize http upstream request: %i", rc);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3934
5994 5abf5af257a7 Upstream: avoid duplicate finalization. Maxim Dounin <mdounin@mdounin.ru> parents: 5992 diff changeset	3935 if (u->cleanup == NULL) {
5abf5af257a7 Upstream: avoid duplicate finalization. Maxim Dounin <mdounin@mdounin.ru> parents: 5992 diff changeset	3936 /* the request was already finalized */
5abf5af257a7 Upstream: avoid duplicate finalization. Maxim Dounin <mdounin@mdounin.ru> parents: 5992 diff changeset	3937 ngx_http_finalize_request(r, NGX_DONE);
5abf5af257a7 Upstream: avoid duplicate finalization. Maxim Dounin <mdounin@mdounin.ru> parents: 5992 diff changeset	3938 return;
5abf5af257a7 Upstream: avoid duplicate finalization. Maxim Dounin <mdounin@mdounin.ru> parents: 5992 diff changeset	3939 }
5abf5af257a7 Upstream: avoid duplicate finalization. Maxim Dounin <mdounin@mdounin.ru> parents: 5992 diff changeset	3940
5abf5af257a7 Upstream: avoid duplicate finalization. Maxim Dounin <mdounin@mdounin.ru> parents: 5992 diff changeset	3941 *u->cleanup = NULL;
5abf5af257a7 Upstream: avoid duplicate finalization. Maxim Dounin <mdounin@mdounin.ru> parents: 5992 diff changeset	3942 u->cleanup = NULL;
569 174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	3943
3169 b1013d768911 fix request counter in resolver handling, the bug was introduced in r3050 Igor Sysoev <igor@sysoev.ru> parents: 3161 diff changeset	3944 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	3945 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	3946 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	3947 }
b1013d768911 fix request counter in resolver handling, the bug was introduced in r3050 Igor Sysoev <igor@sysoev.ru> parents: 3161 diff changeset	3948
6146 59fc60585f1e Upstream: times to obtain header/response are stored as ngx_msec_t. Ruslan Ermilov <ru@nginx.com> parents: 6125 diff changeset	3949 if (u->state && u->state->response_time) {
59fc60585f1e Upstream: times to obtain header/response are stored as ngx_msec_t. Ruslan Ermilov <ru@nginx.com> parents: 6125 diff changeset	3950 u->state->response_time = ngx_current_msec - u->state->response_time;
2402 cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	3951
5169 f6bbe77794aa Upstream: fixed $upstream_response_length without buffering. Sergey Kandaurov <pluknet@nginx.com> parents: 5167 diff changeset	3952 if (u->pipe && u->pipe->read_length) {
2402 cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	3953 u->state->response_length = u->pipe->read_length;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	3954 }
563 9c2f3ed7a247 nginx-0.3.3-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	3955 }
9c2f3ed7a247 nginx-0.3.3-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	3956
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3957 u->finalize_request(r, rc);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3958
5132 9bcf89ca78d2 Upstream: only call peer.free() if peer.get() selected a peer. Ruslan Ermilov <ru@nginx.com> parents: 5121 diff changeset	3959 if (u->peer.free && u->peer.sockaddr) {
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	3960 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	3961 u->peer.sockaddr = NULL;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	3962 }
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3963
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3964 if (u->peer.connection) {
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3965
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3966 #if (NGX_HTTP_SSL)
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3967
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3968 /* TODO: do not shutdown persistent connection */
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3969
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3970 if (u->peer.connection->ssl) {
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3971
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3972 /*
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3973 * We send the "close notify" shutdown alert to the upstream only
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3974 * and do not wait its "close notify" shutdown alert.
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3975 * It is acceptable according to the TLS standard.
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3976 */
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3977
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3978 u->peer.connection->ssl->no_wait_shutdown = 1;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3979
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3980 (void) ngx_ssl_shutdown(u->peer.connection);
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3981 }
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3982 #endif
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3983
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3984 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3985 "close http upstream connection: %d",
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3986 u->peer.connection->fd);
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3987
4138 70e1ee2307f9 Fix of separate pool for upstream connections (r4117). Maxim Dounin <mdounin@mdounin.ru> parents: 4124 diff changeset	3988 if (u->peer.connection->pool) {
70e1ee2307f9 Fix of separate pool for upstream connections (r4117). Maxim Dounin <mdounin@mdounin.ru> parents: 4124 diff changeset	3989 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	3990 }
70e1ee2307f9 Fix of separate pool for upstream connections (r4117). Maxim Dounin <mdounin@mdounin.ru> parents: 4124 diff changeset	3991
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3992 ngx_close_connection(u->peer.connection);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3993 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3994
483 621229427cba nginx-0.1.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	3995 u->peer.connection = NULL;
621229427cba nginx-0.1.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	3996
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3997 if (u->pipe && u->pipe->temp_file) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3998 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	3999 "http upstream temp fd: %d",
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	4000 u->pipe->temp_file->file.fd);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4001 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4002
4469 24c0dca04eb9 Fix for proxy_store leaving temporary files for subrequests. Maxim Dounin <mdounin@mdounin.ru> parents: 4464 diff changeset	4003 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	4004 && 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	4005 {
24c0dca04eb9 Fix for proxy_store leaving temporary files for subrequests. Maxim Dounin <mdounin@mdounin.ru> parents: 4464 diff changeset	4006 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	4007 == NGX_FILE_ERROR)
24c0dca04eb9 Fix for proxy_store leaving temporary files for subrequests. Maxim Dounin <mdounin@mdounin.ru> parents: 4464 diff changeset	4008 {
24c0dca04eb9 Fix for proxy_store leaving temporary files for subrequests. Maxim Dounin <mdounin@mdounin.ru> parents: 4464 diff changeset	4009 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	4010 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	4011 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	4012 }
24c0dca04eb9 Fix for proxy_store leaving temporary files for subrequests. Maxim Dounin <mdounin@mdounin.ru> parents: 4464 diff changeset	4013 }
24c0dca04eb9 Fix for proxy_store leaving temporary files for subrequests. Maxim Dounin <mdounin@mdounin.ru> parents: 4464 diff changeset	4014
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4015 #if (NGX_HTTP_CACHE)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4016
3940 22f3e9197096 revert r3935 and fix "stalled cache updating" alert Igor Sysoev <igor@sysoev.ru> parents: 3934 diff changeset	4017 if (r->cache) {
22f3e9197096 revert r3935 and fix "stalled cache updating" alert Igor Sysoev <igor@sysoev.ru> parents: 3934 diff changeset	4018
22f3e9197096 revert r3935 and fix "stalled cache updating" alert Igor Sysoev <igor@sysoev.ru> parents: 3934 diff changeset	4019 if (u->cacheable) {
22f3e9197096 revert r3935 and fix "stalled cache updating" alert Igor Sysoev <igor@sysoev.ru> parents: 3934 diff changeset	4020
22f3e9197096 revert r3935 and fix "stalled cache updating" alert Igor Sysoev <igor@sysoev.ru> parents: 3934 diff changeset	4021 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	4022 time_t valid;
22f3e9197096 revert r3935 and fix "stalled cache updating" alert Igor Sysoev <igor@sysoev.ru> parents: 3934 diff changeset	4023
22f3e9197096 revert r3935 and fix "stalled cache updating" alert Igor Sysoev <igor@sysoev.ru> parents: 3934 diff changeset	4024 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	4025
22f3e9197096 revert r3935 and fix "stalled cache updating" alert Igor Sysoev <igor@sysoev.ru> parents: 3934 diff changeset	4026 if (valid) {
22f3e9197096 revert r3935 and fix "stalled cache updating" alert Igor Sysoev <igor@sysoev.ru> parents: 3934 diff changeset	4027 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	4028 r->cache->error = rc;
22f3e9197096 revert r3935 and fix "stalled cache updating" alert Igor Sysoev <igor@sysoev.ru> parents: 3934 diff changeset	4029 }
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4030 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4031 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4032
3711 ce6ba077c270 several changes in cache cleanup handling: Igor Sysoev <igor@sysoev.ru> parents: 3709 diff changeset	4033 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	4034 }
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4035
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4036 #endif
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4037
5392 f1caf7b8ae1d Upstream: subrequest_in_memory fix. Maxim Dounin <mdounin@mdounin.ru> parents: 5373 diff changeset	4038 if (r->subrequest_in_memory
f1caf7b8ae1d Upstream: subrequest_in_memory fix. Maxim Dounin <mdounin@mdounin.ru> parents: 5373 diff changeset	4039 && u->headers_in.status_n >= NGX_HTTP_SPECIAL_RESPONSE)
f1caf7b8ae1d Upstream: subrequest_in_memory fix. Maxim Dounin <mdounin@mdounin.ru> parents: 5373 diff changeset	4040 {
f1caf7b8ae1d Upstream: subrequest_in_memory fix. Maxim Dounin <mdounin@mdounin.ru> parents: 5373 diff changeset	4041 u->buffer.last = u->buffer.pos;
f1caf7b8ae1d Upstream: subrequest_in_memory fix. Maxim Dounin <mdounin@mdounin.ru> parents: 5373 diff changeset	4042 }
f1caf7b8ae1d Upstream: subrequest_in_memory fix. Maxim Dounin <mdounin@mdounin.ru> parents: 5373 diff changeset	4043
515 417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	4044 if (rc == NGX_DECLINED) {
417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	4045 return;
417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	4046 }
417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	4047
483 621229427cba nginx-0.1.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	4048 r->connection->log->action = "sending to client";
621229427cba nginx-0.1.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	4049
5303 0fb714d80909 Upstream: request finalization rework. Maxim Dounin <mdounin@mdounin.ru> parents: 5302 diff changeset	4050 if (!u->header_sent
0fb714d80909 Upstream: request finalization rework. Maxim Dounin <mdounin@mdounin.ru> parents: 5302 diff changeset	4051 \|\| rc == NGX_HTTP_REQUEST_TIME_OUT
0fb714d80909 Upstream: request finalization rework. Maxim Dounin <mdounin@mdounin.ru> parents: 5302 diff changeset	4052 \|\| rc == NGX_HTTP_CLIENT_CLOSED_REQUEST)
4151 3549db8ceaf2 Cache: fix for sending of stale responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4143 diff changeset	4053 {
5303 0fb714d80909 Upstream: request finalization rework. Maxim Dounin <mdounin@mdounin.ru> parents: 5302 diff changeset	4054 ngx_http_finalize_request(r, rc);
0fb714d80909 Upstream: request finalization rework. Maxim Dounin <mdounin@mdounin.ru> parents: 5302 diff changeset	4055 return;
0fb714d80909 Upstream: request finalization rework. Maxim Dounin <mdounin@mdounin.ru> parents: 5302 diff changeset	4056 }
0fb714d80909 Upstream: request finalization rework. Maxim Dounin <mdounin@mdounin.ru> parents: 5302 diff changeset	4057
5304 d3eab5e2df5f Upstream: no last buffer on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5303 diff changeset	4058 flush = 0;
d3eab5e2df5f Upstream: no last buffer on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5303 diff changeset	4059
d3eab5e2df5f Upstream: no last buffer on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5303 diff changeset	4060 if (rc >= NGX_HTTP_SPECIAL_RESPONSE) {
d3eab5e2df5f Upstream: no last buffer on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5303 diff changeset	4061 rc = NGX_ERROR;
d3eab5e2df5f Upstream: no last buffer on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5303 diff changeset	4062 flush = 1;
5303 0fb714d80909 Upstream: request finalization rework. Maxim Dounin <mdounin@mdounin.ru> parents: 5302 diff changeset	4063 }
0fb714d80909 Upstream: request finalization rework. Maxim Dounin <mdounin@mdounin.ru> parents: 5302 diff changeset	4064
0fb714d80909 Upstream: request finalization rework. Maxim Dounin <mdounin@mdounin.ru> parents: 5302 diff changeset	4065 if (r->header_only) {
0fb714d80909 Upstream: request finalization rework. Maxim Dounin <mdounin@mdounin.ru> parents: 5302 diff changeset	4066 ngx_http_finalize_request(r, rc);
0fb714d80909 Upstream: request finalization rework. Maxim Dounin <mdounin@mdounin.ru> parents: 5302 diff changeset	4067 return;
0fb714d80909 Upstream: request finalization rework. Maxim Dounin <mdounin@mdounin.ru> parents: 5302 diff changeset	4068 }
0fb714d80909 Upstream: request finalization rework. Maxim Dounin <mdounin@mdounin.ru> parents: 5302 diff changeset	4069
0fb714d80909 Upstream: request finalization rework. Maxim Dounin <mdounin@mdounin.ru> parents: 5302 diff changeset	4070 if (rc == 0) {
2377 87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	4071 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	4072
d3eab5e2df5f Upstream: no last buffer on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5303 diff changeset	4073 } else if (flush) {
d3eab5e2df5f Upstream: no last buffer on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5303 diff changeset	4074 r->keepalive = 0;
d3eab5e2df5f Upstream: no last buffer on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5303 diff changeset	4075 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	4076 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4077
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4078 ngx_http_finalize_request(r, rc);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4079 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4080
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4081
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4082 static ngx_int_t
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4083 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	4084 ngx_uint_t offset)
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	4085 {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4086 ngx_table_elt_t **ph;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	4087
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4088 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	4089
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4090 if (*ph == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4091 *ph = h;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4092 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4093
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4094 return NGX_OK;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4095 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4096
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4097
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4098 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	4099 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	4100 ngx_uint_t offset)
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	4101 {
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	4102 return NGX_OK;
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	4103 }
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	4104
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	4105
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	4106 static ngx_int_t
4117 103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	4107 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	4108 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	4109 {
103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	4110 ngx_http_upstream_t *u;
103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	4111
103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	4112 u = r->upstream;
103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	4113
103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	4114 u->headers_in.content_length = h;
103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	4115 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	4116
103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	4117 return NGX_OK;
103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	4118 }
103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	4119
103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	4120
103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	4121 static ngx_int_t
5732 d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	4122 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	4123 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	4124 {
d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	4125 ngx_http_upstream_t *u;
d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	4126
d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	4127 u = r->upstream;
d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	4128
d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	4129 u->headers_in.last_modified = h;
d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	4130
d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	4131 #if (NGX_HTTP_CACHE)
d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	4132
d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	4133 if (u->cacheable) {
6180 8b6fa4842133 Moved ngx_http_parse_time() to core, renamed accordingly. Maxim Dounin <mdounin@mdounin.ru> parents: 6147 diff changeset	4134 u->headers_in.last_modified_time = ngx_parse_http_time(h->value.data,
5732 d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	4135 h->value.len);
d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	4136 }
d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	4137
d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	4138 #endif
d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	4139
d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	4140 return NGX_OK;
d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	4141 }
d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	4142
d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	4143
d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	4144 static ngx_int_t
3669 1f5841b1fcd7 treat Set-Cookie as a header that forbids caching Igor Sysoev <igor@sysoev.ru> parents: 3667 diff changeset	4145 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	4146 ngx_uint_t offset)
1f5841b1fcd7 treat Set-Cookie as a header that forbids caching Igor Sysoev <igor@sysoev.ru> parents: 3667 diff changeset	4147 {
5677 3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4148 ngx_array_t *pa;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4149 ngx_table_elt_t **ph;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4150 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	4151
1f5841b1fcd7 treat Set-Cookie as a header that forbids caching Igor Sysoev <igor@sysoev.ru> parents: 3667 diff changeset	4152 u = r->upstream;
5677 3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4153 pa = &u->headers_in.cookies;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4154
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4155 if (pa->elts == NULL) {
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4156 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	4157 {
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4158 return NGX_ERROR;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4159 }
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4160 }
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4161
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4162 ph = ngx_array_push(pa);
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4163 if (ph == NULL) {
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4164 return NGX_ERROR;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4165 }
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4166
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4167 *ph = h;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4168
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4169 #if (NGX_HTTP_CACHE)
3669 1f5841b1fcd7 treat Set-Cookie as a header that forbids caching Igor Sysoev <igor@sysoev.ru> parents: 3667 diff changeset	4170 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	4171 u->cacheable = 0;
1f5841b1fcd7 treat Set-Cookie as a header that forbids caching Igor Sysoev <igor@sysoev.ru> parents: 3667 diff changeset	4172 }
1f5841b1fcd7 treat Set-Cookie as a header that forbids caching Igor Sysoev <igor@sysoev.ru> parents: 3667 diff changeset	4173 #endif
1f5841b1fcd7 treat Set-Cookie as a header that forbids caching Igor Sysoev <igor@sysoev.ru> parents: 3667 diff changeset	4174
1f5841b1fcd7 treat Set-Cookie as a header that forbids caching Igor Sysoev <igor@sysoev.ru> parents: 3667 diff changeset	4175 return NGX_OK;
1f5841b1fcd7 treat Set-Cookie as a header that forbids caching Igor Sysoev <igor@sysoev.ru> parents: 3667 diff changeset	4176 }
1f5841b1fcd7 treat Set-Cookie as a header that forbids caching Igor Sysoev <igor@sysoev.ru> parents: 3667 diff changeset	4177
1f5841b1fcd7 treat Set-Cookie as a header that forbids caching Igor Sysoev <igor@sysoev.ru> parents: 3667 diff changeset	4178
1f5841b1fcd7 treat Set-Cookie as a header that forbids caching Igor Sysoev <igor@sysoev.ru> parents: 3667 diff changeset	4179 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	4180 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	4181 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	4182 {
2786 4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	4183 ngx_array_t *pa;
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	4184 ngx_table_elt_t **ph;
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	4185 ngx_http_upstream_t *u;
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	4186
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	4187 u = r->upstream;
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	4188 pa = &u->headers_in.cache_control;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4189
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4190 if (pa->elts == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4191 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	4192 {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4193 return NGX_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4194 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4195 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4196
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4197 ph = ngx_array_push(pa);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4198 if (ph == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4199 return NGX_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4200 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4201
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4202 *ph = h;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4203
2708 4c658be4ab63 fix building --without-http-cache, introduced in r2664 and later Igor Sysoev <igor@sysoev.ru> parents: 2704 diff changeset	4204 #if (NGX_HTTP_CACHE)
4c658be4ab63 fix building --without-http-cache, introduced in r2664 and later Igor Sysoev <igor@sysoev.ru> parents: 2704 diff changeset	4205 {
5911 88d55e5934f7 Cache: add support for Cache-Control's s-maxage response directive. Piotr Sikora <piotr@cloudflare.com> parents: 5905 diff changeset	4206 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	4207 ngx_int_t n;
4c658be4ab63 fix building --without-http-cache, introduced in r2664 and later Igor Sysoev <igor@sysoev.ru> parents: 2704 diff changeset	4208
2786 4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	4209 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	4210 return NGX_OK;
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	4211 }
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	4212
2669 5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	4213 if (r->cache == NULL) {
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	4214 return NGX_OK;
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	4215 }
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	4216
5500 6a3ab6fdd70f Upstream: Cache-Control preferred over Expires. Maxim Dounin <mdounin@mdounin.ru> parents: 5489 diff changeset	4217 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	4218 return NGX_OK;
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	4219 }
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	4220
5911 88d55e5934f7 Cache: add support for Cache-Control's s-maxage response directive. Piotr Sikora <piotr@cloudflare.com> parents: 5905 diff changeset	4221 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	4222 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	4223
88d55e5934f7 Cache: add support for Cache-Control's s-maxage response directive. Piotr Sikora <piotr@cloudflare.com> parents: 5905 diff changeset	4224 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	4225 \|\| 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	4226 \|\| 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	4227 {
2786 4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	4228 u->cacheable = 0;
2669 5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	4229 return NGX_OK;
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	4230 }
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	4231
5911 88d55e5934f7 Cache: add support for Cache-Control's s-maxage response directive. Piotr Sikora <piotr@cloudflare.com> parents: 5905 diff changeset	4232 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	4233 offset = 9;
88d55e5934f7 Cache: add support for Cache-Control's s-maxage response directive. Piotr Sikora <piotr@cloudflare.com> parents: 5905 diff changeset	4234
88d55e5934f7 Cache: add support for Cache-Control's s-maxage response directive. Piotr Sikora <piotr@cloudflare.com> parents: 5905 diff changeset	4235 if (p == NULL) {
88d55e5934f7 Cache: add support for Cache-Control's s-maxage response directive. Piotr Sikora <piotr@cloudflare.com> parents: 5905 diff changeset	4236 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	4237 offset = 8;
88d55e5934f7 Cache: add support for Cache-Control's s-maxage response directive. Piotr Sikora <piotr@cloudflare.com> parents: 5905 diff changeset	4238 }
2669 5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	4239
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	4240 if (p == NULL) {
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	4241 return NGX_OK;
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	4242 }
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	4243
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	4244 n = 0;
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	4245
5911 88d55e5934f7 Cache: add support for Cache-Control's s-maxage response directive. Piotr Sikora <piotr@cloudflare.com> parents: 5905 diff changeset	4246 for (p += offset; p < last; p++) {
3198 48bfb7dc981b test comma separator in "Cache-Control" Igor Sysoev <igor@sysoev.ru> parents: 3195 diff changeset	4247 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	4248 break;
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	4249 }
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	4250
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	4251 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	4252 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	4253 continue;
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	4254 }
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	4255
2786 4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	4256 u->cacheable = 0;
2669 5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	4257 return NGX_OK;
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	4258 }
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	4259
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	4260 if (n == 0) {
2786 4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	4261 u->cacheable = 0;
2669 5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	4262 return NGX_OK;
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	4263 }
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	4264
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	4265 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	4266 }
4c658be4ab63 fix building --without-http-cache, introduced in r2664 and later Igor Sysoev <igor@sysoev.ru> parents: 2704 diff changeset	4267 #endif
4c658be4ab63 fix building --without-http-cache, introduced in r2664 and later Igor Sysoev <igor@sysoev.ru> parents: 2704 diff changeset	4268
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4269 return NGX_OK;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4270 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4271
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4272
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4273 static ngx_int_t
2666 81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	4274 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	4275 ngx_uint_t offset)
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	4276 {
2786 4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	4277 ngx_http_upstream_t *u;
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	4278
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	4279 u = r->upstream;
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	4280 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	4281
4c658be4ab63 fix building --without-http-cache, introduced in r2664 and later Igor Sysoev <igor@sysoev.ru> parents: 2704 diff changeset	4282 #if (NGX_HTTP_CACHE)
4c658be4ab63 fix building --without-http-cache, introduced in r2664 and later Igor Sysoev <igor@sysoev.ru> parents: 2704 diff changeset	4283 {
2666 81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	4284 time_t expires;
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	4285
2786 4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	4286 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	4287 return NGX_OK;
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	4288 }
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	4289
2666 81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	4290 if (r->cache == NULL) {
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	4291 return NGX_OK;
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	4292 }
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	4293
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	4294 if (r->cache->valid_sec != 0) {
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	4295 return NGX_OK;
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	4296 }
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	4297
6180 8b6fa4842133 Moved ngx_http_parse_time() to core, renamed accordingly. Maxim Dounin <mdounin@mdounin.ru> parents: 6147 diff changeset	4298 expires = ngx_parse_http_time(h->value.data, h->value.len);
2666 81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	4299
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	4300 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	4301 u->cacheable = 0;
2666 81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	4302 return NGX_OK;
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	4303 }
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	4304
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	4305 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	4306 }
4c658be4ab63 fix building --without-http-cache, introduced in r2664 and later Igor Sysoev <igor@sysoev.ru> parents: 2704 diff changeset	4307 #endif
2666 81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	4308
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	4309 return NGX_OK;
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	4310 }
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	4311
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	4312
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	4313 static ngx_int_t
2663 09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	4314 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	4315 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	4316 {
2786 4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	4317 ngx_http_upstream_t *u;
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	4318
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	4319 u = r->upstream;
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	4320 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	4321
4c658be4ab63 fix building --without-http-cache, introduced in r2664 and later Igor Sysoev <igor@sysoev.ru> parents: 2704 diff changeset	4322 #if (NGX_HTTP_CACHE)
4c658be4ab63 fix building --without-http-cache, introduced in r2664 and later Igor Sysoev <igor@sysoev.ru> parents: 2704 diff changeset	4323 {
2663 09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	4324 u_char *p;
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	4325 size_t len;
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	4326 ngx_int_t n;
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	4327
2786 4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	4328 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	4329 return NGX_OK;
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	4330 }
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	4331
2663 09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	4332 if (r->cache == NULL) {
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	4333 return NGX_OK;
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	4334 }
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	4335
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	4336 len = h->value.len;
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	4337 p = h->value.data;
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	4338
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	4339 if (p[0] != '@') {
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	4340 n = ngx_atoi(p, len);
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	4341
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	4342 switch (n) {
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	4343 case 0:
2786 4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	4344 u->cacheable = 0;
4546 4988fa232629 For the sake of case/switch code readability, 'fall through' Maxim Konovalov <maxim@nginx.com> parents: 4499 diff changeset	4345 /* fall through */
4988fa232629 For the sake of case/switch code readability, 'fall through' Maxim Konovalov <maxim@nginx.com> parents: 4499 diff changeset	4346
2663 09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	4347 case NGX_ERROR:
2667 c1ac00c2bc75 update r2664 Igor Sysoev <igor@sysoev.ru> parents: 2666 diff changeset	4348 return NGX_OK;
2663 09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	4349
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	4350 default:
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	4351 r->cache->valid_sec = ngx_time() + n;
2667 c1ac00c2bc75 update r2664 Igor Sysoev <igor@sysoev.ru> parents: 2666 diff changeset	4352 return NGX_OK;
2663 09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	4353 }
2667 c1ac00c2bc75 update r2664 Igor Sysoev <igor@sysoev.ru> parents: 2666 diff changeset	4354 }
c1ac00c2bc75 update r2664 Igor Sysoev <igor@sysoev.ru> parents: 2666 diff changeset	4355
c1ac00c2bc75 update r2664 Igor Sysoev <igor@sysoev.ru> parents: 2666 diff changeset	4356 p++;
c1ac00c2bc75 update r2664 Igor Sysoev <igor@sysoev.ru> parents: 2666 diff changeset	4357 len--;
c1ac00c2bc75 update r2664 Igor Sysoev <igor@sysoev.ru> parents: 2666 diff changeset	4358
c1ac00c2bc75 update r2664 Igor Sysoev <igor@sysoev.ru> parents: 2666 diff changeset	4359 n = ngx_atoi(p, len);
c1ac00c2bc75 update r2664 Igor Sysoev <igor@sysoev.ru> parents: 2666 diff changeset	4360
c1ac00c2bc75 update r2664 Igor Sysoev <igor@sysoev.ru> parents: 2666 diff changeset	4361 if (n != NGX_ERROR) {
c1ac00c2bc75 update r2664 Igor Sysoev <igor@sysoev.ru> parents: 2666 diff changeset	4362 r->cache->valid_sec = n;
2663 09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	4363 }
2708 4c658be4ab63 fix building --without-http-cache, introduced in r2664 and later Igor Sysoev <igor@sysoev.ru> parents: 2704 diff changeset	4364 }
4c658be4ab63 fix building --without-http-cache, introduced in r2664 and later Igor Sysoev <igor@sysoev.ru> parents: 2704 diff changeset	4365 #endif
2663 09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	4366
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	4367 return NGX_OK;
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	4368 }
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	4369
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	4370
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	4371 static ngx_int_t
527 7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	4372 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	4373 ngx_uint_t offset)
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	4374 {
4197 cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	4375 ngx_int_t n;
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	4376 ngx_http_upstream_t *u;
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	4377
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	4378 u = r->upstream;
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	4379 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	4380
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	4381 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	4382 return NGX_OK;
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	4383 }
527 7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	4384
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	4385 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	4386
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	4387 if (n != NGX_ERROR) {
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	4388 r->limit_rate = (size_t) n;
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	4389 }
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	4390
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	4391 return NGX_OK;
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	4392 }
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	4393
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	4394
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	4395 static ngx_int_t
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4396 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	4397 ngx_uint_t offset)
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4398 {
4197 cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	4399 u_char c0, c1, c2;
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	4400 ngx_http_upstream_t *u;
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	4401
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	4402 u = r->upstream;
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	4403
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	4404 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	4405 return NGX_OK;
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	4406 }
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	4407
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	4408 if (u->conf->change_buffering) {
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4409
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4410 if (h->value.len == 2) {
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4411 c0 = ngx_tolower(h->value.data[0]);
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4412 c1 = ngx_tolower(h->value.data[1]);
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4413
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4414 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	4415 u->buffering = 0;
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4416 }
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4417
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4418 } else if (h->value.len == 3) {
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4419 c0 = ngx_tolower(h->value.data[0]);
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4420 c1 = ngx_tolower(h->value.data[1]);
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4421 c2 = ngx_tolower(h->value.data[2]);
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4422
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4423 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	4424 u->buffering = 1;
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4425 }
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4426 }
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4427 }
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4428
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4429 return NGX_OK;
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4430 }
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4431
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4432
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4433 static ngx_int_t
657 400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4434 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	4435 ngx_uint_t offset)
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4436 {
4197 cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	4437 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	4438 return NGX_OK;
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	4439 }
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	4440
657 400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4441 r->headers_out.override_charset = &h->value;
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4442
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4443 return NGX_OK;
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4444 }
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4445
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4446
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4447 static ngx_int_t
4124 0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	4448 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	4449 ngx_uint_t offset)
0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	4450 {
0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	4451 r->upstream->headers_in.connection = h;
0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	4452
0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	4453 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	4454 (u_char *) "close", 5 - 1)
0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	4455 != NULL)
0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	4456 {
0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	4457 r->upstream->headers_in.connection_close = 1;
0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	4458 }
0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	4459
0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	4460 return NGX_OK;
0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	4461 }
0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	4462
0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	4463
0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	4464 static ngx_int_t
4123 0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	4465 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	4466 ngx_table_elt_t *h, ngx_uint_t offset)
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	4467 {
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	4468 r->upstream->headers_in.transfer_encoding = h;
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	4469
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	4470 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	4471 (u_char *) "chunked", 7 - 1)
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	4472 != NULL)
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	4473 {
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	4474 r->upstream->headers_in.chunked = 1;
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	4475 }
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	4476
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	4477 return NGX_OK;
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	4478 }
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	4479
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	4480
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	4481 static ngx_int_t
5877 60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	4482 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	4483 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	4484 {
60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	4485 ngx_http_upstream_t *u;
60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	4486
60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	4487 u = r->upstream;
60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	4488 u->headers_in.vary = h;
60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	4489
60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	4490 #if (NGX_HTTP_CACHE)
60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	4491
60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	4492 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	4493 return NGX_OK;
60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	4494 }
60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	4495
5878 2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5877 diff changeset	4496 if (r->cache == NULL) {
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5877 diff changeset	4497 return NGX_OK;
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5877 diff changeset	4498 }
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5877 diff changeset	4499
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5877 diff changeset	4500 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	4501 \|\| (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	4502 {
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5877 diff changeset	4503 u->cacheable = 0;
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5877 diff changeset	4504 }
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5877 diff changeset	4505
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5877 diff changeset	4506 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	4507
60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	4508 #endif
60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	4509
60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	4510 return NGX_OK;
60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	4511 }
60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	4512
60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	4513
60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	4514 static ngx_int_t
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4515 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	4516 ngx_uint_t offset)
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4517 {
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4518 ngx_table_elt_t ho, *ph;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4519
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4520 ho = ngx_list_push(&r->headers_out.headers);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4521 if (ho == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4522 return NGX_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4523 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4524
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4525 ho = h;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4526
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4527 if (offset) {
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4528 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	4529 *ph = ho;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4530 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4531
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4532 return NGX_OK;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4533 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4534
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4535
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4536 static ngx_int_t
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4537 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	4538 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	4539 {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4540 ngx_array_t *pa;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4541 ngx_table_elt_t ho, *ph;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4542
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4543 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	4544
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4545 if (pa->elts == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4546 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	4547 {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4548 return NGX_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4549 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4550 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4551
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4552 ph = ngx_array_push(pa);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4553 if (ph == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4554 return NGX_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4555 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4556
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4557 ho = ngx_list_push(&r->headers_out.headers);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4558 if (ho == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4559 return NGX_ERROR;
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
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4562 ho = h;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4563 *ph = ho;
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 return NGX_OK;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4566 }
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
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4569 static ngx_int_t
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4570 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	4571 ngx_uint_t offset)
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4572 {
657 400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4573 u_char p, last;
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4574
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4575 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	4576 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	4577 r->headers_out.content_type_lowcase = NULL;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4578
657 400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4579 for (p = h->value.data; *p; p++) {
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4580
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4581 if (*p != ';') {
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4582 continue;
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4583 }
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4584
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4585 last = p;
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4586
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4587 while (++p == ' ') { / void */ }
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4588
1968 3c540ad3021f fix segfault Igor Sysoev <igor@sysoev.ru> parents: 1959 diff changeset	4589 if (*p == '\0') {
3c540ad3021f fix segfault Igor Sysoev <igor@sysoev.ru> parents: 1959 diff changeset	4590 return NGX_OK;
3c540ad3021f fix segfault Igor Sysoev <igor@sysoev.ru> parents: 1959 diff changeset	4591 }
3c540ad3021f fix segfault Igor Sysoev <igor@sysoev.ru> parents: 1959 diff changeset	4592
1107 db7c468c447d ngx_strcasecmp()/ngx_strncasecmp() Igor Sysoev <igor@sysoev.ru> parents: 1098 diff changeset	4593 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	4594 continue;
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4595 }
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4596
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4597 p += 8;
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4598
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4599 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	4600
2244 f5a9f35e8344 strip charset name quotes Igor Sysoev <igor@sysoev.ru> parents: 2184 diff changeset	4601 if (*p == '"') {
f5a9f35e8344 strip charset name quotes Igor Sysoev <igor@sysoev.ru> parents: 2184 diff changeset	4602 p++;
f5a9f35e8344 strip charset name quotes Igor Sysoev <igor@sysoev.ru> parents: 2184 diff changeset	4603 }
f5a9f35e8344 strip charset name quotes Igor Sysoev <igor@sysoev.ru> parents: 2184 diff changeset	4604
f5a9f35e8344 strip charset name quotes Igor Sysoev <igor@sysoev.ru> parents: 2184 diff changeset	4605 last = h->value.data + h->value.len;
f5a9f35e8344 strip charset name quotes Igor Sysoev <igor@sysoev.ru> parents: 2184 diff changeset	4606
f5a9f35e8344 strip charset name quotes Igor Sysoev <igor@sysoev.ru> parents: 2184 diff changeset	4607 if (*(last - 1) == '"') {
f5a9f35e8344 strip charset name quotes Igor Sysoev <igor@sysoev.ru> parents: 2184 diff changeset	4608 last--;
f5a9f35e8344 strip charset name quotes Igor Sysoev <igor@sysoev.ru> parents: 2184 diff changeset	4609 }
f5a9f35e8344 strip charset name quotes Igor Sysoev <igor@sysoev.ru> parents: 2184 diff changeset	4610
f5a9f35e8344 strip charset name quotes Igor Sysoev <igor@sysoev.ru> parents: 2184 diff changeset	4611 r->headers_out.charset.len = last - p;
657 400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4612 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	4613
c6c42497106c fix segfault if upstream sends trailing ";" in "charset=" Igor Sysoev <igor@sysoev.ru> parents: 1109 diff changeset	4614 return NGX_OK;
657 400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4615 }
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4616
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4617 return NGX_OK;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4618 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4619
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4620
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4621 static ngx_int_t
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4622 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	4623 ngx_uint_t offset)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4624 {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4625 ngx_table_elt_t *ho;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4626
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4627 ho = ngx_list_push(&r->headers_out.headers);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4628 if (ho == NULL) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4629 return NGX_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4630 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4631
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4632 ho = h;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4633
3004 4121acaf7a04 fix handling "Last-Modified" and "Accept-Ranges" for upstream responses Igor Sysoev <igor@sysoev.ru> parents: 3003 diff changeset	4634 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	4635
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4636 #if (NGX_HTTP_CACHE)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4637
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	4638 if (r->upstream->cacheable) {
5732 d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	4639 r->headers_out.last_modified_time =
d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	4640 r->upstream->headers_in.last_modified_time;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4641 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4642
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4643 #endif
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4644
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4645 return NGX_OK;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4646 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4647
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4648
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4649 static ngx_int_t
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4650 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	4651 ngx_uint_t offset)
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4652 {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4653 ngx_int_t rc;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4654 ngx_table_elt_t *ho;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4655
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4656 ho = ngx_list_push(&r->headers_out.headers);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4657 if (ho == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4658 return NGX_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4659 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4660
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4661 ho = h;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4662
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4663 if (r->upstream->rewrite_redirect) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4664 rc = r->upstream->rewrite_redirect(r, ho, 0);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4665
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	4666 if (rc == NGX_DECLINED) {
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	4667 return NGX_OK;
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	4668 }
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	4669
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4670 if (rc == NGX_OK) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4671 r->headers_out.location = ho;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4672
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4673 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	4674 "rewritten location: \"%V\"", &ho->value);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4675 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4676
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4677 return rc;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4678 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4679
1653 ea681a6a0c61 set r->headers_out.location for non-local redirects Igor Sysoev <igor@sysoev.ru> parents: 1640 diff changeset	4680 if (ho->value.data[0] != '/') {
ea681a6a0c61 set r->headers_out.location for non-local redirects Igor Sysoev <igor@sysoev.ru> parents: 1640 diff changeset	4681 r->headers_out.location = ho;
ea681a6a0c61 set r->headers_out.location for non-local redirects Igor Sysoev <igor@sysoev.ru> parents: 1640 diff changeset	4682 }
ea681a6a0c61 set r->headers_out.location for non-local redirects Igor Sysoev <igor@sysoev.ru> parents: 1640 diff changeset	4683
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4684 /*
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4685 * 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	4686 * 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	4687 */
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4688
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4689 return NGX_OK;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4690 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4691
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4692
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4693 static ngx_int_t
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4694 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	4695 ngx_uint_t offset)
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4696 {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4697 u_char *p;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4698 ngx_int_t rc;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4699 ngx_table_elt_t *ho;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4700
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4701 ho = ngx_list_push(&r->headers_out.headers);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4702 if (ho == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4703 return NGX_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4704 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4705
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4706 ho = h;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4707
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4708 if (r->upstream->rewrite_redirect) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4709
1549 099d8470e6c3 pass length clearly Igor Sysoev <igor@sysoev.ru> parents: 1543 diff changeset	4710 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	4711
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4712 if (p) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4713 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	4714
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4715 } else {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4716 return NGX_OK;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4717 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4718
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	4719 if (rc == NGX_DECLINED) {
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	4720 return NGX_OK;
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	4721 }
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	4722
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4723 if (rc == NGX_OK) {
1654 e5c547a225bd r->headers_out.refresh Igor Sysoev <igor@sysoev.ru> parents: 1653 diff changeset	4724 r->headers_out.refresh = ho;
e5c547a225bd r->headers_out.refresh Igor Sysoev <igor@sysoev.ru> parents: 1653 diff changeset	4725
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4726 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	4727 "rewritten refresh: \"%V\"", &ho->value);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4728 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4729
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4730 return rc;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4731 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4732
1654 e5c547a225bd r->headers_out.refresh Igor Sysoev <igor@sysoev.ru> parents: 1653 diff changeset	4733 r->headers_out.refresh = ho;
e5c547a225bd r->headers_out.refresh Igor Sysoev <igor@sysoev.ru> parents: 1653 diff changeset	4734
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4735 return NGX_OK;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4736 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4737
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4738
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4739 static ngx_int_t
4464 7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	4740 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	4741 ngx_uint_t offset)
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	4742 {
4650 b38fea6f9a15 Fixed returned value handling from the cookie rewrite handler. Valentin Bartenev <vbart@nginx.com> parents: 4572 diff changeset	4743 ngx_int_t rc;
4464 7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	4744 ngx_table_elt_t *ho;
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	4745
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	4746 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	4747 if (ho == NULL) {
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	4748 return NGX_ERROR;
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	4749 }
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	4750
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	4751 ho = h;
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	4752
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	4753 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	4754 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	4755
b38fea6f9a15 Fixed returned value handling from the cookie rewrite handler. Valentin Bartenev <vbart@nginx.com> parents: 4572 diff changeset	4756 if (rc == NGX_DECLINED) {
b38fea6f9a15 Fixed returned value handling from the cookie rewrite handler. Valentin Bartenev <vbart@nginx.com> parents: 4572 diff changeset	4757 return NGX_OK;
b38fea6f9a15 Fixed returned value handling from the cookie rewrite handler. Valentin Bartenev <vbart@nginx.com> parents: 4572 diff changeset	4758 }
b38fea6f9a15 Fixed returned value handling from the cookie rewrite handler. Valentin Bartenev <vbart@nginx.com> parents: 4572 diff changeset	4759
b38fea6f9a15 Fixed returned value handling from the cookie rewrite handler. Valentin Bartenev <vbart@nginx.com> parents: 4572 diff changeset	4760 #if (NGX_DEBUG)
b38fea6f9a15 Fixed returned value handling from the cookie rewrite handler. Valentin Bartenev <vbart@nginx.com> parents: 4572 diff changeset	4761 if (rc == NGX_OK) {
b38fea6f9a15 Fixed returned value handling from the cookie rewrite handler. Valentin Bartenev <vbart@nginx.com> parents: 4572 diff changeset	4762 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	4763 "rewritten cookie: \"%V\"", &ho->value);
b38fea6f9a15 Fixed returned value handling from the cookie rewrite handler. Valentin Bartenev <vbart@nginx.com> parents: 4572 diff changeset	4764 }
b38fea6f9a15 Fixed returned value handling from the cookie rewrite handler. Valentin Bartenev <vbart@nginx.com> parents: 4572 diff changeset	4765 #endif
b38fea6f9a15 Fixed returned value handling from the cookie rewrite handler. Valentin Bartenev <vbart@nginx.com> parents: 4572 diff changeset	4766
b38fea6f9a15 Fixed returned value handling from the cookie rewrite handler. Valentin Bartenev <vbart@nginx.com> parents: 4572 diff changeset	4767 return rc;
4464 7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	4768 }
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	4769
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	4770 return NGX_OK;
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	4771 }
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	4772
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	4773
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	4774 static ngx_int_t
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4775 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	4776 ngx_table_elt_t *h, ngx_uint_t offset)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4777 {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4778 ngx_table_elt_t *ho;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4779
5874 2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5869 diff changeset	4780 if (r->upstream->conf->force_ranges) {
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5869 diff changeset	4781 return NGX_OK;
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5869 diff changeset	4782 }
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5869 diff changeset	4783
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4784 #if (NGX_HTTP_CACHE)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4785
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4786 if (r->cached) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4787 r->allow_ranges = 1;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4788 return NGX_OK;
5621 345e4fd4bb64 Range filter: single_range flag in request. Maxim Dounin <mdounin@mdounin.ru> parents: 5581 diff changeset	4789 }
345e4fd4bb64 Range filter: single_range flag in request. Maxim Dounin <mdounin@mdounin.ru> parents: 5581 diff changeset	4790
345e4fd4bb64 Range filter: single_range flag in request. Maxim Dounin <mdounin@mdounin.ru> parents: 5581 diff changeset	4791 if (r->upstream->cacheable) {
345e4fd4bb64 Range filter: single_range flag in request. Maxim Dounin <mdounin@mdounin.ru> parents: 5581 diff changeset	4792 r->allow_ranges = 1;
345e4fd4bb64 Range filter: single_range flag in request. Maxim Dounin <mdounin@mdounin.ru> parents: 5581 diff changeset	4793 r->single_range = 1;
345e4fd4bb64 Range filter: single_range flag in request. Maxim Dounin <mdounin@mdounin.ru> parents: 5581 diff changeset	4794 return NGX_OK;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4795 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4796
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4797 #endif
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4798
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4799 ho = ngx_list_push(&r->headers_out.headers);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4800 if (ho == NULL) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4801 return NGX_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4802 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4803
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4804 ho = h;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4805
3004 4121acaf7a04 fix handling "Last-Modified" and "Accept-Ranges" for upstream responses Igor Sysoev <igor@sysoev.ru> parents: 3003 diff changeset	4806 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	4807
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4808 return NGX_OK;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4809 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4810
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4811
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4812 #if (NGX_HTTP_GZIP)
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4813
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4814 static ngx_int_t
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4815 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	4816 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	4817 {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4818 ngx_table_elt_t *ho;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4819
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4820 ho = ngx_list_push(&r->headers_out.headers);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4821 if (ho == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4822 return NGX_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4823 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4824
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4825 ho = h;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4826
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4827 r->headers_out.content_encoding = ho;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4828
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4829 return NGX_OK;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4830 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4831
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4832 #endif
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4833
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4834
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	4835 static ngx_int_t
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4836 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	4837 {
880 3b763d36e055 axe old % log format Igor Sysoev <igor@sysoev.ru> parents: 850 diff changeset	4838 ngx_http_variable_t var, v;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4839
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4840 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	4841 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	4842 if (var == NULL) {
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4843 return NGX_ERROR;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4844 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4845
637 e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 629 diff changeset	4846 var->get_handler = v->get_handler;
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4847 var->data = v->data;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4848 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4849
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4850 return NGX_OK;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4851 }
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4852
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4853
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4854 static ngx_int_t
1181 ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4855 ngx_http_upstream_addr_variable(ngx_http_request_t *r,
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4856 ngx_http_variable_value_t *v, uintptr_t data)
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4857 {
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4858 u_char *p;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4859 size_t len;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4860 ngx_uint_t i;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4861 ngx_http_upstream_state_t *state;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4862
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4863 v->valid = 1;
1565 4c43e25d11ea fix English grammar Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	4864 v->no_cacheable = 0;
1181 ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4865 v->not_found = 0;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4866
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4867 if (r->upstream_states == NULL \|\| r->upstream_states->nelts == 0) {
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4868 v->not_found = 1;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4869 return NGX_OK;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4870 }
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4871
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4872 len = 0;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4873 state = r->upstream_states->elts;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4874
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4875 for (i = 0; i < r->upstream_states->nelts; i++) {
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4876 if (state[i].peer) {
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4877 len += state[i].peer->len + 2;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4878
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4879 } else {
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4880 len += 3;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4881 }
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4882 }
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4883
2049 2a92804f4109 ) back out r2040 Igor Sysoev <igor@sysoev.ru>* parents: 1973 diff changeset	4884 p = ngx_pnalloc(r->pool, len);
1181 ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4885 if (p == NULL) {
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4886 return NGX_ERROR;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4887 }
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4888
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4889 v->data = p;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4890
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4891 i = 0;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4892
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4893 for ( ;; ) {
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4894 if (state[i].peer) {
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4895 p = ngx_cpymem(p, state[i].peer->data, state[i].peer->len);
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4896 }
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4897
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4898 if (++i == r->upstream_states->nelts) {
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4899 break;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4900 }
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4901
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4902 if (state[i].peer) {
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4903 *p++ = ',';
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4904 *p++ = ' ';
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4905
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4906 } else {
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4907 *p++ = ' ';
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4908 *p++ = ':';
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4909 *p++ = ' ';
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4910
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4911 if (++i == r->upstream_states->nelts) {
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4912 break;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4913 }
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4914
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4915 continue;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4916 }
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4917 }
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4918
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4919 v->len = p - v->data;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4920
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4921 return NGX_OK;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4922 }
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4923
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4924
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4925 static ngx_int_t
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4926 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	4927 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	4928 {
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4929 u_char *p;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4930 size_t len;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4931 ngx_uint_t i;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4932 ngx_http_upstream_state_t *state;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4933
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4934 v->valid = 1;
1565 4c43e25d11ea fix English grammar Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	4935 v->no_cacheable = 0;
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4936 v->not_found = 0;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4937
1168 4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4938 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	4939 v->not_found = 1;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4940 return NGX_OK;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4941 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4942
1168 4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4943 len = r->upstream_states->nelts * (3 + 2);
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4944
2049 2a92804f4109 ) back out r2040 Igor Sysoev <igor@sysoev.ru>* parents: 1973 diff changeset	4945 p = ngx_pnalloc(r->pool, len);
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4946 if (p == NULL) {
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4947 return NGX_ERROR;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4948 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4949
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4950 v->data = p;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4951
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4952 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	4953 state = r->upstream_states->elts;
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4954
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4955 for ( ;; ) {
1168 4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4956 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	4957 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	4958
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4959 } else {
1168 4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4960 *p++ = '-';
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4961 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4962
1168 4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4963 if (++i == r->upstream_states->nelts) {
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4964 break;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4965 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4966
1168 4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4967 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	4968 *p++ = ',';
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4969 *p++ = ' ';
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4970
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4971 } else {
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4972 *p++ = ' ';
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4973 *p++ = ':';
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4974 *p++ = ' ';
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4975
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4976 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	4977 break;
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4978 }
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4979
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4980 continue;
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4981 }
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4982 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4983
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4984 v->len = p - v->data;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4985
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4986 return NGX_OK;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4987 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4988
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4989
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4990 static ngx_int_t
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4991 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	4992 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	4993 {
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4994 u_char *p;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4995 size_t len;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4996 ngx_uint_t i;
889 a9a7e4b1a72b the previous fix does not actually fix overflow Igor Sysoev <igor@sysoev.ru> parents: 888 diff changeset	4997 ngx_msec_int_t ms;
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4998 ngx_http_upstream_state_t *state;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4999
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5000 v->valid = 1;
1565 4c43e25d11ea fix English grammar Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	5001 v->no_cacheable = 0;
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5002 v->not_found = 0;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5003
1168 4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	5004 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	5005 v->not_found = 1;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5006 return NGX_OK;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5007 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5008
1168 4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	5009 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	5010
2049 2a92804f4109 ) back out r2040 Igor Sysoev <igor@sysoev.ru>* parents: 1973 diff changeset	5011 p = ngx_pnalloc(r->pool, len);
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5012 if (p == NULL) {
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5013 return NGX_ERROR;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5014 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5015
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5016 v->data = p;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5017
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5018 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	5019 state = r->upstream_states->elts;
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5020
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5021 for ( ;; ) {
1168 4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	5022 if (state[i].status) {
5964 0a198a517eaf Upstream: $upstream_header_time variable. Vladimir Homutov <vl@nginx.com> parents: 5960 diff changeset	5023
6147 74b6ef56ea56 Upstream: $upstream_connect_time. Ruslan Ermilov <ru@nginx.com> parents: 6146 diff changeset	5024 if (data == 1 && state[i].header_time != (ngx_msec_t) -1) {
6146 59fc60585f1e Upstream: times to obtain header/response are stored as ngx_msec_t. Ruslan Ermilov <ru@nginx.com> parents: 6125 diff changeset	5025 ms = state[i].header_time;
5964 0a198a517eaf Upstream: $upstream_header_time variable. Vladimir Homutov <vl@nginx.com> parents: 5960 diff changeset	5026
6147 74b6ef56ea56 Upstream: $upstream_connect_time. Ruslan Ermilov <ru@nginx.com> parents: 6146 diff changeset	5027 } else if (data == 2 && state[i].connect_time != (ngx_msec_t) -1) {
74b6ef56ea56 Upstream: $upstream_connect_time. Ruslan Ermilov <ru@nginx.com> parents: 6146 diff changeset	5028 ms = state[i].connect_time;
74b6ef56ea56 Upstream: $upstream_connect_time. Ruslan Ermilov <ru@nginx.com> parents: 6146 diff changeset	5029
5964 0a198a517eaf Upstream: $upstream_header_time variable. Vladimir Homutov <vl@nginx.com> parents: 5960 diff changeset	5030 } else {
6146 59fc60585f1e Upstream: times to obtain header/response are stored as ngx_msec_t. Ruslan Ermilov <ru@nginx.com> parents: 6125 diff changeset	5031 ms = state[i].response_time;
5964 0a198a517eaf Upstream: $upstream_header_time variable. Vladimir Homutov <vl@nginx.com> parents: 5960 diff changeset	5032 }
0a198a517eaf Upstream: $upstream_header_time variable. Vladimir Homutov <vl@nginx.com> parents: 5960 diff changeset	5033
3515 76d252724db5 use ngx_min() and ngx_max() Igor Sysoev <igor@sysoev.ru> parents: 3514 diff changeset	5034 ms = ngx_max(ms, 0);
5368 cd46297325bd Upstream: fixed $upstream_response_time format specifiers. Maxim Dounin <mdounin@mdounin.ru> parents: 5353 diff changeset	5035 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	5036
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	5037 } else {
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	5038 *p++ = '-';
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5039 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5040
1168 4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	5041 if (++i == r->upstream_states->nelts) {
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5042 break;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5043 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5044
1168 4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	5045 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	5046 *p++ = ',';
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	5047 *p++ = ' ';
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	5048
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	5049 } else {
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	5050 *p++ = ' ';
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	5051 *p++ = ':';
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	5052 *p++ = ' ';
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	5053
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	5054 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	5055 break;
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	5056 }
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	5057
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	5058 continue;
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	5059 }
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5060 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5061
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5062 v->len = p - v->data;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5063
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5064 return NGX_OK;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5065 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5066
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5067
2402 cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5068 static ngx_int_t
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5069 ngx_http_upstream_response_length_variable(ngx_http_request_t *r,
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5070 ngx_http_variable_value_t *v, uintptr_t data)
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5071 {
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5072 u_char *p;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5073 size_t len;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5074 ngx_uint_t i;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5075 ngx_http_upstream_state_t *state;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5076
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5077 v->valid = 1;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5078 v->no_cacheable = 0;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5079 v->not_found = 0;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5080
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5081 if (r->upstream_states == NULL \|\| r->upstream_states->nelts == 0) {
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5082 v->not_found = 1;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5083 return NGX_OK;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5084 }
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5085
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5086 len = r->upstream_states->nelts * (NGX_OFF_T_LEN + 2);
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5087
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5088 p = ngx_pnalloc(r->pool, len);
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5089 if (p == NULL) {
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5090 return NGX_ERROR;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5091 }
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5092
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5093 v->data = p;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5094
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5095 i = 0;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5096 state = r->upstream_states->elts;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5097
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5098 for ( ;; ) {
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5099 p = ngx_sprintf(p, "%O", state[i].response_length);
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5100
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5101 if (++i == r->upstream_states->nelts) {
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5102 break;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5103 }
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5104
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5105 if (state[i].peer) {
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5106 *p++ = ',';
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5107 *p++ = ' ';
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5108
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5109 } else {
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5110 *p++ = ' ';
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5111 *p++ = ':';
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5112 *p++ = ' ';
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5113
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5114 if (++i == r->upstream_states->nelts) {
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5115 break;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5116 }
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5117
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5118 continue;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5119 }
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5120 }
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5121
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5122 v->len = p - v->data;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5123
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5124 return NGX_OK;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5125 }
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5126
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5127
1162 f59d15404269 $upstream_http_... variables Igor Sysoev <igor@sysoev.ru> parents: 1153 diff changeset	5128 ngx_int_t
f59d15404269 $upstream_http_... variables Igor Sysoev <igor@sysoev.ru> parents: 1153 diff changeset	5129 ngx_http_upstream_header_variable(ngx_http_request_t *r,
f59d15404269 $upstream_http_... variables Igor Sysoev <igor@sysoev.ru> parents: 1153 diff changeset	5130 ngx_http_variable_value_t *v, uintptr_t data)
f59d15404269 $upstream_http_... variables Igor Sysoev <igor@sysoev.ru> parents: 1153 diff changeset	5131 {
f59d15404269 $upstream_http_... variables Igor Sysoev <igor@sysoev.ru> parents: 1153 diff changeset	5132 if (r->upstream == NULL) {
f59d15404269 $upstream_http_... variables Igor Sysoev <igor@sysoev.ru> parents: 1153 diff changeset	5133 v->not_found = 1;
f59d15404269 $upstream_http_... variables Igor Sysoev <igor@sysoev.ru> parents: 1153 diff changeset	5134 return NGX_OK;
f59d15404269 $upstream_http_... variables Igor Sysoev <igor@sysoev.ru> parents: 1153 diff changeset	5135 }
f59d15404269 $upstream_http_... variables Igor Sysoev <igor@sysoev.ru> parents: 1153 diff changeset	5136
f59d15404269 $upstream_http_... variables Igor Sysoev <igor@sysoev.ru> parents: 1153 diff changeset	5137 return ngx_http_variable_unknown_header(v, (ngx_str_t *) data,
f59d15404269 $upstream_http_... variables Igor Sysoev <igor@sysoev.ru> parents: 1153 diff changeset	5138 &r->upstream->headers_in.headers.part,
f59d15404269 $upstream_http_... variables Igor Sysoev <igor@sysoev.ru> parents: 1153 diff changeset	5139 sizeof("upstream_http_") - 1);
f59d15404269 $upstream_http_... variables Igor Sysoev <igor@sysoev.ru> parents: 1153 diff changeset	5140 }
f59d15404269 $upstream_http_... variables Igor Sysoev <igor@sysoev.ru> parents: 1153 diff changeset	5141
f59d15404269 $upstream_http_... variables Igor Sysoev <igor@sysoev.ru> parents: 1153 diff changeset	5142
5677 3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	5143 ngx_int_t
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	5144 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	5145 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	5146 {
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	5147 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	5148
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	5149 ngx_str_t cookie, s;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	5150
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	5151 if (r->upstream == NULL) {
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	5152 v->not_found = 1;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	5153 return NGX_OK;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	5154 }
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	5155
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	5156 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	5157 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	5158
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	5159 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	5160 &s, &cookie)
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	5161 == NGX_DECLINED)
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	5162 {
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	5163 v->not_found = 1;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	5164 return NGX_OK;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	5165 }
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	5166
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	5167 v->len = cookie.len;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	5168 v->valid = 1;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	5169 v->no_cacheable = 0;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	5170 v->not_found = 0;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	5171 v->data = cookie.data;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	5172
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	5173 return NGX_OK;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	5174 }
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	5175
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	5176
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	5177 #if (NGX_HTTP_CACHE)
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	5178
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	5179 ngx_int_t
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	5180 ngx_http_upstream_cache_status(ngx_http_request_t *r,
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	5181 ngx_http_variable_value_t *v, uintptr_t data)
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	5182 {
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	5183 ngx_uint_t n;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	5184
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	5185 if (r->upstream == NULL \|\| r->upstream->cache_status == 0) {
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	5186 v->not_found = 1;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	5187 return NGX_OK;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	5188 }
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	5189
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	5190 n = r->upstream->cache_status - 1;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	5191
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	5192 v->valid = 1;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	5193 v->no_cacheable = 0;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	5194 v->not_found = 0;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	5195 v->len = ngx_http_cache_status[n].len;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	5196 v->data = ngx_http_cache_status[n].data;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	5197
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	5198 return NGX_OK;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	5199 }
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	5200
5441 43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	5201
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	5202 static ngx_int_t
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	5203 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	5204 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	5205 {
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	5206 u_char *p;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	5207
5453 b7b8e2fa7ebd Fixed null pointer dereference with $upstream_cache_last_modified. Ruslan Ermilov <ru@nginx.com> parents: 5441 diff changeset	5208 if (r->upstream == NULL
b7b8e2fa7ebd Fixed null pointer dereference with $upstream_cache_last_modified. Ruslan Ermilov <ru@nginx.com> parents: 5441 diff changeset	5209 \|\| !r->upstream->conf->cache_revalidate
5441 43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	5210 \|\| r->upstream->cache_status != NGX_HTTP_CACHE_EXPIRED
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	5211 \|\| r->cache->last_modified == -1)
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	5212 {
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	5213 v->not_found = 1;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	5214 return NGX_OK;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	5215 }
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	5216
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	5217 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	5218 if (p == NULL) {
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	5219 return NGX_ERROR;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	5220 }
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	5221
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	5222 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	5223 v->valid = 1;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	5224 v->no_cacheable = 0;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	5225 v->not_found = 0;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	5226 v->data = p;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	5227
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	5228 return NGX_OK;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	5229 }
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	5230
5738 c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	5231
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	5232 static ngx_int_t
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	5233 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	5234 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	5235 {
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	5236 if (r->upstream == NULL
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	5237 \|\| !r->upstream->conf->cache_revalidate
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	5238 \|\| 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	5239 \|\| r->cache->etag.len == 0)
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	5240 {
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	5241 v->not_found = 1;
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	5242 return NGX_OK;
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	5243 }
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	5244
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	5245 v->valid = 1;
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	5246 v->no_cacheable = 0;
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	5247 v->not_found = 0;
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	5248 v->len = r->cache->etag.len;
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	5249 v->data = r->cache->etag.data;
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	5250
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	5251 return NGX_OK;
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	5252 }
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	5253
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	5254 #endif
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	5255
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	5256
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5257 static char *
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5258 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	5259 {
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5260 char *rv;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5261 void *mconf;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5262 ngx_str_t *value;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5263 ngx_url_t u;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5264 ngx_uint_t m;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5265 ngx_conf_t pcf;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5266 ngx_http_module_t *module;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5267 ngx_http_conf_ctx_t ctx, http_ctx;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5268 ngx_http_upstream_srv_conf_t *uscf;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5269
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5270 ngx_memzero(&u, sizeof(ngx_url_t));
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5271
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5272 value = cf->args->elts;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5273 u.host = value[1];
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5274 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	5275 u.no_port = 1;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5276
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5277 uscf = ngx_http_upstream_add(cf, &u, NGX_HTTP_UPSTREAM_CREATE
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5278 \|NGX_HTTP_UPSTREAM_WEIGHT
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5279 \|NGX_HTTP_UPSTREAM_MAX_FAILS
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5280 \|NGX_HTTP_UPSTREAM_FAIL_TIMEOUT
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5281 \|NGX_HTTP_UPSTREAM_DOWN
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5282 \|NGX_HTTP_UPSTREAM_BACKUP);
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5283 if (uscf == NULL) {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5284 return NGX_CONF_ERROR;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5285 }
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5286
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5287
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5288 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	5289 if (ctx == NULL) {
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5290 return NGX_CONF_ERROR;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5291 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5292
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5293 http_ctx = cf->ctx;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5294 ctx->main_conf = http_ctx->main_conf;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5295
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5296 /* the upstream{}'s srv_conf */
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5297
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5298 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	5299 if (ctx->srv_conf == NULL) {
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5300 return NGX_CONF_ERROR;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5301 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5302
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5303 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	5304
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5305 uscf->srv_conf = ctx->srv_conf;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5306
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5307
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5308 /* the upstream{}'s loc_conf */
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5309
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5310 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	5311 if (ctx->loc_conf == NULL) {
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5312 return NGX_CONF_ERROR;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5313 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5314
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5315 for (m = 0; ngx_modules[m]; m++) {
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5316 if (ngx_modules[m]->type != NGX_HTTP_MODULE) {
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5317 continue;
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
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5320 module = ngx_modules[m]->ctx;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5321
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5322 if (module->create_srv_conf) {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5323 mconf = module->create_srv_conf(cf);
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5324 if (mconf == NULL) {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5325 return NGX_CONF_ERROR;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5326 }
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5327
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5328 ctx->srv_conf[ngx_modules[m]->ctx_index] = mconf;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5329 }
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5330
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5331 if (module->create_loc_conf) {
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5332 mconf = module->create_loc_conf(cf);
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5333 if (mconf == NULL) {
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5334 return NGX_CONF_ERROR;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5335 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5336
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5337 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	5338 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5339 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5340
5728 63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	5341 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	5342 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	5343 if (uscf->servers == NULL) {
63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	5344 return NGX_CONF_ERROR;
63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	5345 }
63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	5346
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5347
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5348 /* parse inside upstream{} */
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 pcf = *cf;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5351 cf->ctx = ctx;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5352 cf->cmd_type = NGX_HTTP_UPS_CONF;
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 rv = ngx_conf_parse(cf, NULL);
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5355
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5356 *cf = pcf;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5357
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5358 if (rv != NGX_CONF_OK) {
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5359 return rv;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5360 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5361
5728 63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	5362 if (uscf->servers->nelts == 0) {
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5363 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	5364 "no servers are inside upstream");
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5365 return NGX_CONF_ERROR;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5366 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5367
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5368 return rv;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5369 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5370
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5371
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5372 static char *
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5373 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	5374 {
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5375 ngx_http_upstream_srv_conf_t *uscf = conf;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5376
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5377 time_t fail_timeout;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5378 ngx_str_t *value, s;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5379 ngx_url_t u;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5380 ngx_int_t weight, max_fails;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5381 ngx_uint_t i;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5382 ngx_http_upstream_server_t *us;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5383
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5384 us = ngx_array_push(uscf->servers);
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5385 if (us == NULL) {
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5386 return NGX_CONF_ERROR;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5387 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5388
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5389 ngx_memzero(us, sizeof(ngx_http_upstream_server_t));
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5390
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5391 value = cf->args->elts;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5392
663 6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 659 diff changeset	5393 weight = 1;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5394 max_fails = 1;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5395 fail_timeout = 10;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5396
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5397 for (i = 2; i < cf->args->nelts; i++) {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5398
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5399 if (ngx_strncmp(value[i].data, "weight=", 7) == 0) {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5400
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5401 if (!(uscf->flags & NGX_HTTP_UPSTREAM_WEIGHT)) {
5818 fe8bafab5b49 Upstream: improved configuration parser diagnostics. Ruslan Ermilov <ru@nginx.com> parents: 5774 diff changeset	5402 goto not_supported;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5403 }
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5404
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5405 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	5406
6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 659 diff changeset	5407 if (weight == NGX_ERROR \|\| weight == 0) {
6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 659 diff changeset	5408 goto invalid;
6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 659 diff changeset	5409 }
6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 659 diff changeset	5410
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5411 continue;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5412 }
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5413
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5414 if (ngx_strncmp(value[i].data, "max_fails=", 10) == 0) {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5415
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5416 if (!(uscf->flags & NGX_HTTP_UPSTREAM_MAX_FAILS)) {
5818 fe8bafab5b49 Upstream: improved configuration parser diagnostics. Ruslan Ermilov <ru@nginx.com> parents: 5774 diff changeset	5417 goto not_supported;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5418 }
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5419
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5420 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	5421
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5422 if (max_fails == NGX_ERROR) {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5423 goto invalid;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5424 }
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5425
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5426 continue;
663 6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 659 diff changeset	5427 }
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5428
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5429 if (ngx_strncmp(value[i].data, "fail_timeout=", 13) == 0) {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5430
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5431 if (!(uscf->flags & NGX_HTTP_UPSTREAM_FAIL_TIMEOUT)) {
5818 fe8bafab5b49 Upstream: improved configuration parser diagnostics. Ruslan Ermilov <ru@nginx.com> parents: 5774 diff changeset	5432 goto not_supported;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5433 }
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5434
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5435 s.len = value[i].len - 13;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5436 s.data = &value[i].data[13];
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5437
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5438 fail_timeout = ngx_parse_time(&s, 1);
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5439
4474 41f640a693de Time parsing cleanup. Maxim Dounin <mdounin@mdounin.ru> parents: 4469 diff changeset	5440 if (fail_timeout == (time_t) NGX_ERROR) {
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5441 goto invalid;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5442 }
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5443
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5444 continue;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5445 }
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5446
5410 16b68c724438 Upstream: fixed "down" and "backup" parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 5392 diff changeset	5447 if (ngx_strcmp(value[i].data, "backup") == 0) {
1378 0be898896d1a backup upstream servers Igor Sysoev <igor@sysoev.ru> parents: 1340 diff changeset	5448
0be898896d1a backup upstream servers Igor Sysoev <igor@sysoev.ru> parents: 1340 diff changeset	5449 if (!(uscf->flags & NGX_HTTP_UPSTREAM_BACKUP)) {
5818 fe8bafab5b49 Upstream: improved configuration parser diagnostics. Ruslan Ermilov <ru@nginx.com> parents: 5774 diff changeset	5450 goto not_supported;
1378 0be898896d1a backup upstream servers Igor Sysoev <igor@sysoev.ru> parents: 1340 diff changeset	5451 }
0be898896d1a backup upstream servers Igor Sysoev <igor@sysoev.ru> parents: 1340 diff changeset	5452
0be898896d1a backup upstream servers Igor Sysoev <igor@sysoev.ru> parents: 1340 diff changeset	5453 us->backup = 1;
0be898896d1a backup upstream servers Igor Sysoev <igor@sysoev.ru> parents: 1340 diff changeset	5454
0be898896d1a backup upstream servers Igor Sysoev <igor@sysoev.ru> parents: 1340 diff changeset	5455 continue;
0be898896d1a backup upstream servers Igor Sysoev <igor@sysoev.ru> parents: 1340 diff changeset	5456 }
0be898896d1a backup upstream servers Igor Sysoev <igor@sysoev.ru> parents: 1340 diff changeset	5457
5410 16b68c724438 Upstream: fixed "down" and "backup" parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 5392 diff changeset	5458 if (ngx_strcmp(value[i].data, "down") == 0) {
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5459
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5460 if (!(uscf->flags & NGX_HTTP_UPSTREAM_DOWN)) {
5818 fe8bafab5b49 Upstream: improved configuration parser diagnostics. Ruslan Ermilov <ru@nginx.com> parents: 5774 diff changeset	5461 goto not_supported;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5462 }
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5463
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5464 us->down = 1;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5465
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5466 continue;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5467 }
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5468
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5469 goto invalid;
663 6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 659 diff changeset	5470 }
6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 659 diff changeset	5471
5728 63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	5472 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	5473
63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	5474 u.url = value[1];
63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	5475 u.default_port = 80;
63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	5476
63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	5477 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	5478 if (u.err) {
63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	5479 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	5480 "%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	5481 }
63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	5482
63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	5483 return NGX_CONF_ERROR;
63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	5484 }
63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	5485
5717 efc84a5723b3 Upstream: generic hash module. Roman Arutyunyan <arut@nginx.com> parents: 5682 diff changeset	5486 us->name = u.url;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5487 us->addrs = u.addrs;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5488 us->naddrs = u.naddrs;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5489 us->weight = weight;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5490 us->max_fails = max_fails;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5491 us->fail_timeout = fail_timeout;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5492
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5493 return NGX_CONF_OK;
663 6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 659 diff changeset	5494
6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 659 diff changeset	5495 invalid:
6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 659 diff changeset	5496
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5497 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5498 "invalid parameter \"%V\"", &value[i]);
663 6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 659 diff changeset	5499
6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 659 diff changeset	5500 return NGX_CONF_ERROR;
5818 fe8bafab5b49 Upstream: improved configuration parser diagnostics. Ruslan Ermilov <ru@nginx.com> parents: 5774 diff changeset	5501
fe8bafab5b49 Upstream: improved configuration parser diagnostics. Ruslan Ermilov <ru@nginx.com> parents: 5774 diff changeset	5502 not_supported:
fe8bafab5b49 Upstream: improved configuration parser diagnostics. Ruslan Ermilov <ru@nginx.com> parents: 5774 diff changeset	5503
fe8bafab5b49 Upstream: improved configuration parser diagnostics. Ruslan Ermilov <ru@nginx.com> parents: 5774 diff changeset	5504 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
fe8bafab5b49 Upstream: improved configuration parser diagnostics. Ruslan Ermilov <ru@nginx.com> parents: 5774 diff changeset	5505 "balancing method does not support parameter \"%V\"",
fe8bafab5b49 Upstream: improved configuration parser diagnostics. Ruslan Ermilov <ru@nginx.com> parents: 5774 diff changeset	5506 &value[i]);
fe8bafab5b49 Upstream: improved configuration parser diagnostics. Ruslan Ermilov <ru@nginx.com> parents: 5774 diff changeset	5507
fe8bafab5b49 Upstream: improved configuration parser diagnostics. Ruslan Ermilov <ru@nginx.com> parents: 5774 diff changeset	5508 return NGX_CONF_ERROR;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5509 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5510
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5511
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5512 ngx_http_upstream_srv_conf_t *
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5513 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	5514 {
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5515 ngx_uint_t i;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5516 ngx_http_upstream_server_t *us;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5517 ngx_http_upstream_srv_conf_t uscf, *uscfp;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5518 ngx_http_upstream_main_conf_t *umcf;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5519
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5520 if (!(flags & NGX_HTTP_UPSTREAM_CREATE)) {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5521
1559 fe11e2a3946d use pool instead of ngx_conf_t Igor Sysoev <igor@sysoev.ru> parents: 1558 diff changeset	5522 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	5523 if (u->err) {
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5524 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	5525 "%s in upstream \"%V\"", u->err, &u->url);
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5526 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5527
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5528 return NULL;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5529 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5530 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5531
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5532 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	5533
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5534 uscfp = umcf->upstreams.elts;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5535
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5536 for (i = 0; i < umcf->upstreams.nelts; i++) {
906 a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	5537
a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	5538 if (uscfp[i]->host.len != u->host.len
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5539 \|\| 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	5540 != 0)
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5541 {
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5542 continue;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5543 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5544
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5545 if ((flags & NGX_HTTP_UPSTREAM_CREATE)
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5546 && (uscfp[i]->flags & NGX_HTTP_UPSTREAM_CREATE))
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5547 {
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5548 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5549 "duplicate upstream \"%V\"", &u->host);
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5550 return NULL;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5551 }
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5552
5005 c9059bd5445b Fixed "proxy_pass" with IP address and no port (ticket #276). Ruslan Ermilov <ru@nginx.com> parents: 4990 diff changeset	5553 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	5554 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
906 a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	5555 "upstream \"%V\" may not have port %d",
a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	5556 &u->host, u->port);
a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	5557 return NULL;
a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	5558 }
a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	5559
5005 c9059bd5445b Fixed "proxy_pass" with IP address and no port (ticket #276). Ruslan Ermilov <ru@nginx.com> parents: 4990 diff changeset	5560 if ((flags & NGX_HTTP_UPSTREAM_CREATE) && !uscfp[i]->no_port) {
906 a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	5561 ngx_log_error(NGX_LOG_WARN, cf->log, 0,
a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	5562 "upstream \"%V\" may not have port %d in %s:%ui",
a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	5563 &u->host, uscfp[i]->port,
1489 56f1ea5baabb u_char* is enough to keep file name Igor Sysoev <igor@sysoev.ru> parents: 1469 diff changeset	5564 uscfp[i]->file_name, uscfp[i]->line);
906 a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	5565 return NULL;
a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	5566 }
a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	5567
5005 c9059bd5445b Fixed "proxy_pass" with IP address and no port (ticket #276). Ruslan Ermilov <ru@nginx.com> parents: 4990 diff changeset	5568 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	5569 && 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	5570 {
906 a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	5571 continue;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5572 }
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5573
1340 32cdba6f2ec1 fix case when two directives Igor Sysoev <igor@sysoev.ru> parents: 1295 diff changeset	5574 if (uscfp[i]->default_port && u->default_port
32cdba6f2ec1 fix case when two directives Igor Sysoev <igor@sysoev.ru> parents: 1295 diff changeset	5575 && uscfp[i]->default_port != u->default_port)
32cdba6f2ec1 fix case when two directives Igor Sysoev <igor@sysoev.ru> parents: 1295 diff changeset	5576 {
32cdba6f2ec1 fix case when two directives Igor Sysoev <igor@sysoev.ru> parents: 1295 diff changeset	5577 continue;
32cdba6f2ec1 fix case when two directives Igor Sysoev <igor@sysoev.ru> parents: 1295 diff changeset	5578 }
32cdba6f2ec1 fix case when two directives Igor Sysoev <igor@sysoev.ru> parents: 1295 diff changeset	5579
4152 65c1c241d70e Better handling of late upstream creation. Maxim Dounin <mdounin@mdounin.ru> parents: 4151 diff changeset	5580 if (flags & NGX_HTTP_UPSTREAM_CREATE) {
65c1c241d70e Better handling of late upstream creation. Maxim Dounin <mdounin@mdounin.ru> parents: 4151 diff changeset	5581 uscfp[i]->flags = flags;
65c1c241d70e Better handling of late upstream creation. Maxim Dounin <mdounin@mdounin.ru> parents: 4151 diff changeset	5582 }
65c1c241d70e Better handling of late upstream creation. Maxim Dounin <mdounin@mdounin.ru> parents: 4151 diff changeset	5583
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5584 return uscfp[i];
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5585 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5586
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5587 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	5588 if (uscf == NULL) {
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5589 return NULL;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5590 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5591
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5592 uscf->flags = flags;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5593 uscf->host = u->host;
1489 56f1ea5baabb u_char* is enough to keep file name Igor Sysoev <igor@sysoev.ru> parents: 1469 diff changeset	5594 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	5595 uscf->line = cf->conf_file->line;
906 a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	5596 uscf->port = u->port;
a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	5597 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	5598 uscf->no_port = u->no_port;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5599
5977 26c127bab5ef Upstream: detect port absence in fastcgi_pass with IP literal. Ruslan Ermilov <ru@nginx.com> parents: 5968 diff changeset	5600 if (u->naddrs == 1 && (u->port \|\| u->family == AF_UNIX)) {
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5601 uscf->servers = ngx_array_create(cf->pool, 1,
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5602 sizeof(ngx_http_upstream_server_t));
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5603 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	5604 return NULL;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5605 }
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5606
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5607 us = ngx_array_push(uscf->servers);
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5608 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	5609 return NULL;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5610 }
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5611
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5612 ngx_memzero(us, sizeof(ngx_http_upstream_server_t));
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5613
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5614 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	5615 us->naddrs = 1;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5616 }
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5617
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5618 uscfp = ngx_array_push(&umcf->upstreams);
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5619 if (uscfp == NULL) {
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5620 return NULL;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5621 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5622
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5623 *uscfp = uscf;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5624
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5625 return uscf;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5626 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5627
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5628
3271 fcd98af88df3 proxy_bind, fastcgi_bind, and memcached_bind Igor Sysoev <igor@sysoev.ru> parents: 3198 diff changeset	5629 char *
3399 ac9c0380337d fix typo Igor Sysoev <igor@sysoev.ru> parents: 3369 diff changeset	5630 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	5631 void *conf)
fcd98af88df3 proxy_bind, fastcgi_bind, and memcached_bind Igor Sysoev <igor@sysoev.ru> parents: 3198 diff changeset	5632 {
fcd98af88df3 proxy_bind, fastcgi_bind, and memcached_bind Igor Sysoev <igor@sysoev.ru> parents: 3198 diff changeset	5633 char *p = conf;
fcd98af88df3 proxy_bind, fastcgi_bind, and memcached_bind Igor Sysoev <igor@sysoev.ru> parents: 3198 diff changeset	5634
5008 fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5635 ngx_int_t rc;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5636 ngx_str_t *value;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5637 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	5638 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	5639 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	5640
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5641 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	5642
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5643 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	5644 return "is duplicate";
3271 fcd98af88df3 proxy_bind, fastcgi_bind, and memcached_bind Igor Sysoev <igor@sysoev.ru> parents: 3198 diff changeset	5645 }
fcd98af88df3 proxy_bind, fastcgi_bind, and memcached_bind Igor Sysoev <igor@sysoev.ru> parents: 3198 diff changeset	5646
3272 98f49b2bcae8 change ngx_parse_addr() interface Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	5647 value = cf->args->elts;
98f49b2bcae8 change ngx_parse_addr() interface Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	5648
5008 fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5649 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	5650 *plocal = NULL;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5651 return NGX_CONF_OK;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5652 }
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5653
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5654 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	5655
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5656 ccv.cf = cf;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5657 ccv.value = &value[1];
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5658 ccv.complex_value = &cv;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5659
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5660 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	5661 return NGX_CONF_ERROR;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5662 }
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5663
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5664 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	5665 if (local == NULL) {
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5666 return NGX_CONF_ERROR;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5667 }
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5668
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5669 *plocal = local;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5670
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5671 if (cv.lengths) {
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5672 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	5673 if (local->value == NULL) {
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5674 return NGX_CONF_ERROR;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5675 }
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5676
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5677 *local->value = cv;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5678
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5679 return NGX_CONF_OK;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5680 }
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5681
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5682 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	5683 if (local->addr == NULL) {
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5684 return NGX_CONF_ERROR;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5685 }
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5686
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5687 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	5688
98f49b2bcae8 change ngx_parse_addr() interface Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	5689 switch (rc) {
98f49b2bcae8 change ngx_parse_addr() interface Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	5690 case NGX_OK:
5008 fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5691 local->addr->name = value[1];
3272 98f49b2bcae8 change ngx_parse_addr() interface Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	5692 return NGX_CONF_OK;
98f49b2bcae8 change ngx_parse_addr() interface Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	5693
98f49b2bcae8 change ngx_parse_addr() interface Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	5694 case NGX_DECLINED:
98f49b2bcae8 change ngx_parse_addr() interface Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	5695 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
98f49b2bcae8 change ngx_parse_addr() interface Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	5696 "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	5697 /* fall through */
4988fa232629 For the sake of case/switch code readability, 'fall through' Maxim Konovalov <maxim@nginx.com> parents: 4499 diff changeset	5698
3272 98f49b2bcae8 change ngx_parse_addr() interface Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	5699 default:
98f49b2bcae8 change ngx_parse_addr() interface Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	5700 return NGX_CONF_ERROR;
98f49b2bcae8 change ngx_parse_addr() interface Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	5701 }
3271 fcd98af88df3 proxy_bind, fastcgi_bind, and memcached_bind Igor Sysoev <igor@sysoev.ru> parents: 3198 diff changeset	5702 }
fcd98af88df3 proxy_bind, fastcgi_bind, and memcached_bind Igor Sysoev <igor@sysoev.ru> parents: 3198 diff changeset	5703
fcd98af88df3 proxy_bind, fastcgi_bind, and memcached_bind Igor Sysoev <igor@sysoev.ru> parents: 3198 diff changeset	5704
5008 fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5705 static ngx_addr_t *
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5706 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	5707 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	5708 {
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5709 ngx_int_t rc;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5710 ngx_str_t val;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5711 ngx_addr_t *addr;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5712
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5713 if (local == NULL) {
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5714 return NULL;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5715 }
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5716
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5717 if (local->value == NULL) {
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5718 return local->addr;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5719 }
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5720
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5721 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	5722 return NULL;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5723 }
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5724
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5725 if (val.len == 0) {
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5726 return NULL;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5727 }
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5728
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5729 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	5730 if (addr == NULL) {
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5731 return NULL;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5732 }
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5733
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5734 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	5735
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5736 switch (rc) {
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5737 case NGX_OK:
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5738 addr->name = val;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5739 return addr;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5740
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5741 case NGX_DECLINED:
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5742 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	5743 "invalid local address \"%V\"", &val);
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5744 /* fall through */
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5745
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5746 default:
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5747 return NULL;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5748 }
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5749 }
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5750
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5751
4328 d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5752 char *
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5753 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	5754 void *conf)
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5755 {
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5756 char *p = conf;
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5757
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5758 ngx_str_t *value;
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5759 ngx_array_t **a;
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5760 ngx_http_upstream_param_t *param;
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5761
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5762 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	5763
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5764 if (*a == NULL) {
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5765 *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	5766 if (*a == NULL) {
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5767 return NGX_CONF_ERROR;
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5768 }
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5769 }
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5770
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5771 param = ngx_array_push(*a);
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5772 if (param == NULL) {
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5773 return NGX_CONF_ERROR;
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5774 }
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5775
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5776 value = cf->args->elts;
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5777
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5778 param->key = value[1];
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5779 param->value = value[2];
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5780 param->skip_empty = 0;
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5781
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5782 if (cf->args->nelts == 4) {
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5783 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	5784 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	5785 "invalid parameter \"%V\"", &value[3]);
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5786 return NGX_CONF_ERROR;
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5787 }
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5788
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5789 param->skip_empty = 1;
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5790 }
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5791
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5792 return NGX_CONF_OK;
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5793 }
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5794
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5795
1701 40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5796 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	5797 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	5798 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	5799 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	5800 {
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5801 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	5802 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	5803 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	5804 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	5805
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5806 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	5807 && 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	5808 {
4769 f88555d76886 Upstream: hide_headers/pass_headers inheritance fix. Maxim Dounin <mdounin@mdounin.ru> parents: 4766 diff changeset	5809 conf->hide_headers = prev->hide_headers;
f88555d76886 Upstream: hide_headers/pass_headers inheritance fix. Maxim Dounin <mdounin@mdounin.ru> parents: 4766 diff changeset	5810 conf->pass_headers = prev->pass_headers;
f88555d76886 Upstream: hide_headers/pass_headers inheritance fix. Maxim Dounin <mdounin@mdounin.ru> parents: 4766 diff changeset	5811
1701 40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5812 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	5813
2929 37b7cd336fdf inherit proxy_set_header, proxy_hide_header, and fastcgi_hide_header Igor Sysoev <igor@sysoev.ru> parents: 2927 diff changeset	5814 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	5815 #if (NGX_HTTP_CACHE)
5949 634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5947 diff changeset	5816 && ((conf->cache == 0) == (prev->cache == 0))
2949 fe484c0be7c0 fix building --without-http-cache, broken in r2930 Igor Sysoev <igor@sysoev.ru> parents: 2929 diff changeset	5817 #endif
fe484c0be7c0 fix building --without-http-cache, broken in r2930 Igor Sysoev <igor@sysoev.ru> parents: 2929 diff changeset	5818 )
2929 37b7cd336fdf inherit proxy_set_header, proxy_hide_header, and fastcgi_hide_header Igor Sysoev <igor@sysoev.ru> parents: 2927 diff changeset	5819 {
1701 40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5820 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	5821 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5822
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5823 } else {
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5824 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	5825 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	5826 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5827
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5828 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	5829 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	5830 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5831 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5832
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5833 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	5834 != NGX_OK)
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5835 {
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5836 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	5837 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5838
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5839 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	5840 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	5841 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	5842 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	5843 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5844
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5845 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	5846 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	5847 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	5848 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5849
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5850 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	5851
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5852 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	5853
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5854 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	5855
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5856 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	5857
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5858 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	5859 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	5860 goto exist;
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5861 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5862 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5863
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5864 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	5865 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	5866 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	5867 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5868
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5869 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	5870 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	5871 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	5872
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5873 exist:
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5874
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5875 continue;
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5876 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5877 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5878
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5879 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	5880
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5881 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	5882 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	5883
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5884 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	5885 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	5886
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5887 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	5888 continue;
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5889 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5890
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5891 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	5892 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	5893 break;
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5894 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5895 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5896 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5897 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5898
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5899 hash->hash = &conf->hide_headers_hash;
1706 9242e21d2f8d style fix: remove trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 1705 diff changeset	5900 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	5901 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	5902 hash->temp_pool = NULL;
1706 9242e21d2f8d style fix: remove trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 1705 diff changeset	5903
1701 40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5904 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	5905 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5906
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5907
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5908 static void *
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5909 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	5910 {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5911 ngx_http_upstream_main_conf_t *umcf;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5912
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5913 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	5914 if (umcf == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5915 return NULL;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5916 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5917
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5918 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	5919 sizeof(ngx_http_upstream_srv_conf_t *))
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5920 != NGX_OK)
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5921 {
2912 c7d57b539248 return NULL instead of NGX_CONF_ERROR on a create conf failure Igor Sysoev <igor@sysoev.ru> parents: 2882 diff changeset	5922 return NULL;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5923 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5924
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5925 return umcf;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5926 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5927
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5928
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5929 static char *
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5930 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	5931 {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5932 ngx_http_upstream_main_conf_t *umcf = conf;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5933
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5934 ngx_uint_t i;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5935 ngx_array_t headers_in;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5936 ngx_hash_key_t *hk;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5937 ngx_hash_init_t hash;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5938 ngx_http_upstream_init_pt init;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5939 ngx_http_upstream_header_t *header;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5940 ngx_http_upstream_srv_conf_t **uscfp;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5941
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5942 uscfp = umcf->upstreams.elts;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5943
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5944 for (i = 0; i < umcf->upstreams.nelts; i++) {
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5945
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5946 init = uscfp[i]->peer.init_upstream ? uscfp[i]->peer.init_upstream:
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5947 ngx_http_upstream_init_round_robin;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5948
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5949 if (init(cf, uscfp[i]) != NGX_OK) {
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5950 return NGX_CONF_ERROR;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5951 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5952 }
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5953
663 6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 659 diff changeset	5954
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5955 /* upstream_headers_in_hash */
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5956
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5957 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	5958 != NGX_OK)
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5959 {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5960 return NGX_CONF_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5961 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5962
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5963 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	5964 hk = ngx_array_push(&headers_in);
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5965 if (hk == NULL) {
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5966 return NGX_CONF_ERROR;
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5967 }
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5968
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5969 hk->key = header->name;
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5970 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	5971 hk->value = header;
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5972 }
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5973
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5974 hash.hash = &umcf->headers_in_hash;
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5975 hash.key = ngx_hash_key_lc;
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5976 hash.max_size = 512;
751 bae59a740c40 align hash bucket size to cache line Igor Sysoev <igor@sysoev.ru> parents: 750 diff changeset	5977 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	5978 hash.name = "upstream_headers_in_hash";
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5979 hash.pool = cf->pool;
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5980 hash.temp_pool = NULL;
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5981
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5982 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	5983 return NGX_CONF_ERROR;
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5984 }
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5985
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5986 return NGX_CONF_OK;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5987 }

Mercurial > hg > nginx

annotate src/http/ngx_http_upstream.c @ 6292:f72d3129cd35