nginx: src/http/ngx_http_upstream.c annotate

annotate src/http/ngx_http_upstream.c @ 5730:c8bdde1c8c97

Upstream: no need to clear r->headers_out.last_modified_time. Clearing of the r->headers_out.last_modified_time field if a response isn't cacheable in ngx_http_upstream_send_response() was introduced in 3b6afa999c2f, the commit to enable not modified filter for cacheable responses. It doesn't make sense though, as at this point header was already sent, and not modified filter was already executed. Therefore, the line was removed to simplify code.

author	Maxim Dounin <mdounin@mdounin.ru>
date	Thu, 26 Jun 2014 02:19:58 +0400
parents	63d7d69d0fe4
children	02674312be45

rev	line source
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2 /*
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3 * Copyright (C) Igor Sysoev
4412 d620f497c50f Copyright updated. Maxim Konovalov <maxim@nginx.com> parents: 4385 diff changeset	4 * Copyright (C) Nginx, Inc.
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	5 */
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	6
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	7
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	8 #include <ngx_config.h>
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	9 #include <ngx_core.h>
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	10 #include <ngx_http.h>
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	11
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	12
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	13 #if (NGX_HTTP_CACHE)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	14 static ngx_int_t ngx_http_upstream_cache(ngx_http_request_t *r,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	15 ngx_http_upstream_t *u);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	16 static ngx_int_t ngx_http_upstream_cache_send(ngx_http_request_t *r,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	17 ngx_http_upstream_t *u);
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	18 static ngx_int_t ngx_http_upstream_cache_status(ngx_http_request_t *r,
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	19 ngx_http_variable_value_t *v, uintptr_t data);
5441 43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	20 static ngx_int_t ngx_http_upstream_cache_last_modified(ngx_http_request_t *r,
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	21 ngx_http_variable_value_t *v, uintptr_t data);
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	22 #endif
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	23
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	24 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	25 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	26 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	27 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	28 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	29 ngx_event_t *ev);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	30 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	31 ngx_http_upstream_t *u);
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	32 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	33 ngx_http_upstream_t *u);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	34 static void ngx_http_upstream_send_request(ngx_http_request_t *r,
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	35 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	36 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	37 ngx_http_upstream_t *u);
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	38 static void ngx_http_upstream_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	39 ngx_http_upstream_t *u);
2268 33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	40 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	41 ngx_http_upstream_t *u);
2267 920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	42 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	43 ngx_http_upstream_t *u);
1153 c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	44 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	45 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	46 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	47 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	48 ngx_http_upstream_t *u);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	49 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	50 ngx_http_upstream_t *u);
5072 7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	51 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	52 ngx_http_upstream_t *u);
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	53 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	54 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	55 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	56 ngx_http_upstream_t *u);
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	57 static void ngx_http_upstream_upgraded_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	58 ngx_http_upstream_t *u);
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	59 static void ngx_http_upstream_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	60 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	61 static void
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	62 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	63 static void
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	64 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	65 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	66 static void
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	67 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	68 ngx_uint_t do_write);
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	69 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	70 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	71 ssize_t bytes);
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	72 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	73 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	74 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	75 static void ngx_http_upstream_process_request(ngx_http_request_t *r);
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	76 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	77 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	78 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	79 ngx_http_upstream_t *u);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	80 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	81 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	82 static void ngx_http_upstream_cleanup(void *data);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	83 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	84 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	85
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	86 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	87 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	88 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	89 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	90 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	91 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	92 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	93 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	94 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	95 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	96 ngx_table_elt_t *h, ngx_uint_t offset);
2666 81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	97 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	98 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	99 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	100 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	101 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	102 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	103 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	104 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	105 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	106 ngx_table_elt_t *h, ngx_uint_t offset);
4124 0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	107 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	108 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	109 static ngx_int_t
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	110 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	111 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	112 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	113 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	114 static ngx_int_t
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	115 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	116 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	117 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	118 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	119 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	120 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	121 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	122 ngx_table_elt_t *h, ngx_uint_t offset);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	123 static ngx_int_t ngx_http_upstream_rewrite_refresh(ngx_http_request_t *r,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	124 ngx_table_elt_t *h, ngx_uint_t offset);
4464 7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	125 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	126 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	127 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	128 ngx_table_elt_t *h, ngx_uint_t offset);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	129
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	130 #if (NGX_HTTP_GZIP)
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	131 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	132 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	133 #endif
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	134
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	135 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	136 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	137 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	138 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	139 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	140 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	141 ngx_http_variable_value_t *v, uintptr_t data);
2402 cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	142 static ngx_int_t ngx_http_upstream_response_length_variable(
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	143 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	144
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	145 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	146 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	147 void *conf);
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	148
5008 fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	149 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	150 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	151
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	152 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	153 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	154
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	155 #if (NGX_HTTP_SSL)
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	156 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	157 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	158 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	159 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	160 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	161 #endif
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	162
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	163
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	164 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	165
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	166 { ngx_string("Status"),
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	167 ngx_http_upstream_process_header_line,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	168 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	169 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	170
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	171 { ngx_string("Content-Type"),
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	172 ngx_http_upstream_process_header_line,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	173 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	174 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	175
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	176 { ngx_string("Content-Length"),
4117 103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	177 ngx_http_upstream_process_content_length,
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	178 offsetof(ngx_http_upstream_headers_in_t, content_length),
4117 103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	179 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	180
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	181 { ngx_string("Date"),
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	182 ngx_http_upstream_process_header_line,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	183 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	184 ngx_http_upstream_copy_header_line,
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	185 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	186
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	187 { ngx_string("Last-Modified"),
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	188 ngx_http_upstream_process_header_line,
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	189 offsetof(ngx_http_upstream_headers_in_t, last_modified),
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	190 ngx_http_upstream_copy_last_modified, 0, 0 },
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	191
3037 0278f13b04c5 process upstream ETag header Igor Sysoev <igor@sysoev.ru> parents: 3032 diff changeset	192 { ngx_string("ETag"),
0278f13b04c5 process upstream ETag header Igor Sysoev <igor@sysoev.ru> parents: 3032 diff changeset	193 ngx_http_upstream_process_header_line,
0278f13b04c5 process upstream ETag header Igor Sysoev <igor@sysoev.ru> parents: 3032 diff changeset	194 offsetof(ngx_http_upstream_headers_in_t, etag),
0278f13b04c5 process upstream ETag header Igor Sysoev <igor@sysoev.ru> parents: 3032 diff changeset	195 ngx_http_upstream_copy_header_line,
0278f13b04c5 process upstream ETag header Igor Sysoev <igor@sysoev.ru> parents: 3032 diff changeset	196 offsetof(ngx_http_headers_out_t, etag), 0 },
0278f13b04c5 process upstream ETag header Igor Sysoev <igor@sysoev.ru> parents: 3032 diff changeset	197
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	198 { ngx_string("Server"),
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	199 ngx_http_upstream_process_header_line,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	200 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	201 ngx_http_upstream_copy_header_line,
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	202 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	203
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	204 { ngx_string("WWW-Authenticate"),
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	205 ngx_http_upstream_process_header_line,
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	206 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	207 ngx_http_upstream_copy_header_line, 0, 0 },
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	208
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	209 { ngx_string("Location"),
2140 dce5ddef5af9 if upstream sent a location header without status use 302 Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	210 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	211 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	212 ngx_http_upstream_rewrite_location, 0, 0 },
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	213
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	214 { ngx_string("Refresh"),
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	215 ngx_http_upstream_ignore_header_line, 0,
515 417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	216 ngx_http_upstream_rewrite_refresh, 0, 0 },
417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	217
417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	218 { ngx_string("Set-Cookie"),
5677 3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	219 ngx_http_upstream_process_set_cookie,
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	220 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	221 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	222
c3bd8cdabb8f nginx-0.1.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	223 { ngx_string("Content-Disposition"),
c3bd8cdabb8f nginx-0.1.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	224 ngx_http_upstream_ignore_header_line, 0,
c3bd8cdabb8f nginx-0.1.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	225 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	226
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	227 { 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	228 ngx_http_upstream_process_cache_control, 0,
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	229 ngx_http_upstream_copy_multi_header_lines,
515 417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	230 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	231
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	232 { ngx_string("Expires"),
2666 81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	233 ngx_http_upstream_process_expires, 0,
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	234 ngx_http_upstream_copy_header_line,
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	235 offsetof(ngx_http_headers_out_t, expires), 1 },
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	236
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	237 { ngx_string("Accept-Ranges"),
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	238 ngx_http_upstream_process_header_line,
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	239 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	240 ngx_http_upstream_copy_allow_ranges,
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	241 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	242
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	243 { ngx_string("Connection"),
4124 0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	244 ngx_http_upstream_process_connection, 0,
515 417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	245 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	246
641 5e8fb59c18c1 nginx-0.3.42-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	247 { ngx_string("Keep-Alive"),
5e8fb59c18c1 nginx-0.3.42-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	248 ngx_http_upstream_ignore_header_line, 0,
5e8fb59c18c1 nginx-0.3.42-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	249 ngx_http_upstream_ignore_header_line, 0, 0 },
5e8fb59c18c1 nginx-0.3.42-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	250
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	251 { ngx_string("X-Powered-By"),
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	252 ngx_http_upstream_ignore_header_line, 0,
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	253 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	254
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	255 { ngx_string("X-Accel-Expires"),
2664 f903114355d4 zero field Igor Sysoev <igor@sysoev.ru> parents: 2663 diff changeset	256 ngx_http_upstream_process_accel_expires, 0,
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	257 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	258
417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	259 { ngx_string("X-Accel-Redirect"),
417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	260 ngx_http_upstream_process_header_line,
417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	261 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	262 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	263
527 7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	264 { ngx_string("X-Accel-Limit-Rate"),
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	265 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	266 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	267
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	268 { ngx_string("X-Accel-Buffering"),
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	269 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	270 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	271
657 400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	272 { ngx_string("X-Accel-Charset"),
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	273 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	274 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	275
4123 0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	276 { ngx_string("Transfer-Encoding"),
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	277 ngx_http_upstream_process_transfer_encoding, 0,
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	278 ngx_http_upstream_ignore_header_line, 0, 0 },
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	279
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	280 #if (NGX_HTTP_GZIP)
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	281 { ngx_string("Content-Encoding"),
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	282 ngx_http_upstream_process_header_line,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	283 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	284 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	285 #endif
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	286
515 417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	287 { 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	288 };
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	289
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	290
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	291 static ngx_command_t ngx_http_upstream_commands[] = {
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	292
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	293 { ngx_string("upstream"),
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	294 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	295 ngx_http_upstream,
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	296 0,
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	297 0,
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	298 NULL },
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	299
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	300 { ngx_string("server"),
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	301 NGX_HTTP_UPS_CONF\|NGX_CONF_1MORE,
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	302 ngx_http_upstream_server,
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	303 NGX_HTTP_SRV_CONF_OFFSET,
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	304 0,
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	305 NULL },
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_null_command
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	308 };
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	309
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	310
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	311 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	312 ngx_http_upstream_add_variables, /* preconfiguration */
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	313 NULL, /* postconfiguration */
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	314
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	315 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	316 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	317
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	318 NULL, /* create server configuration */
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	319 NULL, /* merge server configuration */
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	320
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	321 NULL, /* create location configuration */
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	322 NULL /* merge location configuration */
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	323 };
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	324
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	325
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	326 ngx_module_t ngx_http_upstream_module = {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	327 NGX_MODULE_V1,
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	328 &ngx_http_upstream_module_ctx, /* module context */
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	329 ngx_http_upstream_commands, /* module directives */
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	330 NGX_HTTP_MODULE, /* module type */
541 b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 537 diff changeset	331 NULL, /* init master */
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	332 NULL, /* init module */
541 b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 537 diff changeset	333 NULL, /* init process */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 537 diff changeset	334 NULL, /* init thread */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 537 diff changeset	335 NULL, /* exit thread */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 537 diff changeset	336 NULL, /* exit process */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 537 diff changeset	337 NULL, /* exit master */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 537 diff changeset	338 NGX_MODULE_V1_PADDING
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
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	341
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	342 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	343
1181 ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	344 { 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	345 ngx_http_upstream_addr_variable, 0,
3898 bd1222fb0192 allow to use $upstream_... variables in SSI Igor Sysoev <igor@sysoev.ru> parents: 3879 diff changeset	346 NGX_HTTP_VAR_NOCACHEABLE, 0 },
1181 ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	347
637 e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 629 diff changeset	348 { 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	349 ngx_http_upstream_status_variable, 0,
3898 bd1222fb0192 allow to use $upstream_... variables in SSI Igor Sysoev <igor@sysoev.ru> parents: 3879 diff changeset	350 NGX_HTTP_VAR_NOCACHEABLE, 0 },
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	351
637 e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 629 diff changeset	352 { 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	353 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	354 NGX_HTTP_VAR_NOCACHEABLE, 0 },
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	355
2402 cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	356 { ngx_string("upstream_response_length"), NULL,
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	357 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	358 NGX_HTTP_VAR_NOCACHEABLE, 0 },
2402 cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	359
2957 b4f39842523b fix building --without-http-cache, broken in r2953 Igor Sysoev <igor@sysoev.ru> parents: 2953 diff changeset	360 #if (NGX_HTTP_CACHE)
b4f39842523b fix building --without-http-cache, broken in r2953 Igor Sysoev <igor@sysoev.ru> parents: 2953 diff changeset	361
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	362 { ngx_string("upstream_cache_status"), NULL,
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	363 ngx_http_upstream_cache_status, 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 },
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	365
5441 43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	366 { ngx_string("upstream_cache_last_modified"), NULL,
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	367 ngx_http_upstream_cache_last_modified, 0,
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	368 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	369
2957 b4f39842523b fix building --without-http-cache, broken in r2953 Igor Sysoev <igor@sysoev.ru> parents: 2953 diff changeset	370 #endif
b4f39842523b fix building --without-http-cache, broken in r2953 Igor Sysoev <igor@sysoev.ru> parents: 2953 diff changeset	371
637 e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 629 diff changeset	372 { 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	373 };
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	374
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	375
2268 33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	376 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	377 { 500, NGX_HTTP_UPSTREAM_FT_HTTP_500 },
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	378 { 502, NGX_HTTP_UPSTREAM_FT_HTTP_502 },
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	379 { 503, NGX_HTTP_UPSTREAM_FT_HTTP_503 },
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	380 { 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	381 { 403, NGX_HTTP_UPSTREAM_FT_HTTP_403 },
2268 33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	382 { 404, NGX_HTTP_UPSTREAM_FT_HTTP_404 },
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	383 { 0, 0 }
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	384 };
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	385
2875 6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2874 diff changeset	386
6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2874 diff changeset	387 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	388 { ngx_string("GET"), NGX_HTTP_GET},
6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2874 diff changeset	389 { ngx_string("HEAD"), NGX_HTTP_HEAD },
6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2874 diff changeset	390 { ngx_string("POST"), NGX_HTTP_POST },
6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2874 diff changeset	391 { ngx_null_string, 0 }
6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2874 diff changeset	392 };
6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2874 diff changeset	393
6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2874 diff changeset	394
3667 12bd9e26fadb use shared ngx_http_upstream_ignore_headers_masks[] Igor Sysoev <igor@sysoev.ru> parents: 3527 diff changeset	395 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	396 { 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	397 { 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	398 { 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	399 { 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	400 { 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	401 { 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	402 { 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	403 { ngx_string("Set-Cookie"), NGX_HTTP_UPSTREAM_IGN_SET_COOKIE },
3667 12bd9e26fadb use shared ngx_http_upstream_ignore_headers_masks[] Igor Sysoev <igor@sysoev.ru> parents: 3527 diff changeset	404 { ngx_null_string, 0 }
12bd9e26fadb use shared ngx_http_upstream_ignore_headers_masks[] Igor Sysoev <igor@sysoev.ru> parents: 3527 diff changeset	405 };
12bd9e26fadb use shared ngx_http_upstream_ignore_headers_masks[] Igor Sysoev <igor@sysoev.ru> parents: 3527 diff changeset	406
12bd9e26fadb use shared ngx_http_upstream_ignore_headers_masks[] Igor Sysoev <igor@sysoev.ru> parents: 3527 diff changeset	407
3006 95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	408 ngx_int_t
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	409 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	410 {
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	411 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	412
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	413 u = r->upstream;
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	414
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	415 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	416 r->main->count++;
3006 95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	417 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	418 }
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	419
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	420 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	421 if (u == NULL) {
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	422 return NGX_ERROR;
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	423 }
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	424
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	425 r->upstream = u;
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	426
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	427 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	428 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	429 #if (NGX_THREADS)
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	430 u->peer.lock = &r->connection->lock;
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	431 #endif
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	432
3056 d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	433 #if (NGX_HTTP_CACHE)
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	434 r->cache = NULL;
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	435 #endif
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	436
4117 103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	437 u->headers_in.content_length_n = -1;
103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	438
3006 95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	439 return NGX_OK;
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	440 }
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
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	443 void
31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	444 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	445 {
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	446 ngx_connection_t *c;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	447
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	448 c = r->connection;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	449
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	450 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	451 "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	452
5121 c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: 5113 diff changeset	453 #if (NGX_HTTP_SPDY)
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: 5113 diff changeset	454 if (r->spdy_stream) {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: 5113 diff changeset	455 ngx_http_upstream_init_request(r);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: 5113 diff changeset	456 return;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: 5113 diff changeset	457 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: 5113 diff changeset	458 #endif
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: 5113 diff changeset	459
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	460 if (c->read->timer_set) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	461 ngx_del_timer(c->read);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	462 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	463
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	464 if (ngx_event_flags & NGX_USE_CLEAR_EVENT) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	465
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	466 if (!c->write->active) {
531 c3bd8cdabb8f nginx-0.1.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	467 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	468 == NGX_ERROR)
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	469 {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	470 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	471 return;
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 }
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
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	476 ngx_http_upstream_init_request(r);
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	477 }
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	478
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	479
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	480 static void
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	481 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	482 {
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	483 ngx_str_t *host;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	484 ngx_uint_t i;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	485 ngx_resolver_ctx_t *ctx, temp;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	486 ngx_http_cleanup_t *cln;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	487 ngx_http_upstream_t *u;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	488 ngx_http_core_loc_conf_t *clcf;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	489 ngx_http_upstream_srv_conf_t uscf, *uscfp;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	490 ngx_http_upstream_main_conf_t *umcf;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	491
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	492 if (r->aio) {
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	493 return;
537 c9ad0d9c7d59 nginx-0.1.43-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 531 diff changeset	494 }
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	495
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	496 u = r->upstream;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	497
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	498 #if (NGX_HTTP_CACHE)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	499
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	500 if (u->conf->cache) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	501 ngx_int_t rc;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	502
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	503 rc = ngx_http_upstream_cache(r, u);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	504
3055 92b6cfaa3c27 fix sending a cached file using AIO Igor Sysoev <igor@sysoev.ru> parents: 3053 diff changeset	505 if (rc == NGX_BUSY) {
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	506 r->write_event_handler = ngx_http_upstream_init_request;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	507 return;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	508 }
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	509
3055 92b6cfaa3c27 fix sending a cached file using AIO Igor Sysoev <igor@sysoev.ru> parents: 3053 diff changeset	510 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	511
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	512 if (rc == NGX_DONE) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	513 return;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	514 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	515
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	516 if (rc != NGX_DECLINED) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	517 ngx_http_finalize_request(r, rc);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	518 return;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	519 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	520 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	521
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	522 #endif
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	523
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	524 u->store = (u->conf->store \|\| u->conf->store_lengths);
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	525
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	526 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	527 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	528 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	529 }
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	530
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	531 if (r->request_body) {
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	532 u->request_bufs = r->request_body->bufs;
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
537 c9ad0d9c7d59 nginx-0.1.43-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 531 diff changeset	535 if (u->create_request(r) != NGX_OK) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	536 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	537 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	538 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	539
5008 fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	540 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	541
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	542 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	543
3053 0d253659da12 directio_alignment Igor Sysoev <igor@sysoev.ru> parents: 3052 diff changeset	544 u->output.alignment = clcf->directio_alignment;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	545 u->output.pool = r->pool;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	546 u->output.bufs.num = 1;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	547 u->output.bufs.size = clcf->client_body_buffer_size;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	548 u->output.output_filter = ngx_chain_writer;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	549 u->output.filter_ctx = &u->writer;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	550
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	551 u->writer.pool = r->pool;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	552
1168 4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	553 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	554
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	555 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	556 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	557 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	558 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	559 return;
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	560 }
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	561
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	562 } else {
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	563
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	564 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	565 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	566 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	567 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	568 return;
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	569 }
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	570
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	571 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	572 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	573
593 425af804d968 nginx-0.3.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 591 diff changeset	574 cln = ngx_http_cleanup_add(r, 0);
569 174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	575 if (cln == NULL) {
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	576 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	577 return;
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	578 }
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	579
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	580 cln->handler = ngx_http_upstream_cleanup;
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	581 cln->data = r;
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	582 u->cleanup = &cln->handler;
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	583
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	584 if (u->resolved == NULL) {
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	585
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	586 uscf = u->conf->upstream;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	587
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	588 } else {
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	589
5660 7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	590 #if (NGX_HTTP_SSL)
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	591 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	592 #endif
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	593
2422 7af1e5fe102c variable support for unix sockets in fastcgi_pass and proxy_pass Igor Sysoev <igor@sysoev.ru> parents: 2413 diff changeset	594 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	595
7af1e5fe102c variable support for unix sockets in fastcgi_pass and proxy_pass Igor Sysoev <igor@sysoev.ru> parents: 2413 diff changeset	596 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	597 != NGX_OK)
7af1e5fe102c variable support for unix sockets in fastcgi_pass and proxy_pass Igor Sysoev <igor@sysoev.ru> parents: 2413 diff changeset	598 {
3169 b1013d768911 fix request counter in resolver handling, the bug was introduced in r3050 Igor Sysoev <igor@sysoev.ru> parents: 3161 diff changeset	599 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	600 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	601 return;
7af1e5fe102c variable support for unix sockets in fastcgi_pass and proxy_pass Igor Sysoev <igor@sysoev.ru> parents: 2413 diff changeset	602 }
7af1e5fe102c variable support for unix sockets in fastcgi_pass and proxy_pass Igor Sysoev <igor@sysoev.ru> parents: 2413 diff changeset	603
7af1e5fe102c variable support for unix sockets in fastcgi_pass and proxy_pass Igor Sysoev <igor@sysoev.ru> parents: 2413 diff changeset	604 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	605
7af1e5fe102c variable support for unix sockets in fastcgi_pass and proxy_pass Igor Sysoev <igor@sysoev.ru> parents: 2413 diff changeset	606 return;
7af1e5fe102c variable support for unix sockets in fastcgi_pass and proxy_pass Igor Sysoev <igor@sysoev.ru> parents: 2413 diff changeset	607 }
7af1e5fe102c variable support for unix sockets in fastcgi_pass and proxy_pass Igor Sysoev <igor@sysoev.ru> parents: 2413 diff changeset	608
1705 d22095839d86 optimize r->upstream usage Igor Sysoev <igor@sysoev.ru> parents: 1701 diff changeset	609 host = &u->resolved->host;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	610
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	611 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	612
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	613 uscfp = umcf->upstreams.elts;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	614
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	615 for (i = 0; i < umcf->upstreams.nelts; i++) {
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	616
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	617 uscf = uscfp[i];
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	618
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	619 if (uscf->host.len == host->len
2285 c77f4710595c fix r1913 Igor Sysoev <igor@sysoev.ru> parents: 2268 diff changeset	620 && ((uscf->port == 0 && u->resolved->no_port)
1912 68b426b43c31 fix r1903 Igor Sysoev <igor@sysoev.ru> parents: 1908 diff changeset	621 \|\| 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	622 && 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	623 {
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	624 goto found;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	625 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	626 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	627
3879 502a6b0acf3f fix case when a host in fastcgi_pass, scgi_pass, and uwsgi_pass Igor Sysoev <igor@sysoev.ru> parents: 3713 diff changeset	628 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	629 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	630 "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	631 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	632 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	633 return;
502a6b0acf3f fix case when a host in fastcgi_pass, scgi_pass, and uwsgi_pass Igor Sysoev <igor@sysoev.ru> parents: 3713 diff changeset	634 }
502a6b0acf3f fix case when a host in fastcgi_pass, scgi_pass, and uwsgi_pass Igor Sysoev <igor@sysoev.ru> parents: 3713 diff changeset	635
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	636 temp.name = *host;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	637
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	638 ctx = ngx_resolve_start(clcf->resolver, &temp);
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	639 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	640 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	641 NGX_HTTP_INTERNAL_SERVER_ERROR);
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	642 return;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	643 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	644
1683 1e0b028055ec allow to use IP addresses without defined resolver Igor Sysoev <igor@sysoev.ru> parents: 1658 diff changeset	645 if (ctx == NGX_NO_RESOLVER) {
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	646 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	647 "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	648
3169 b1013d768911 fix request counter in resolver handling, the bug was introduced in r3050 Igor Sysoev <igor@sysoev.ru> parents: 3161 diff changeset	649 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	650 return;
1e0b028055ec allow to use IP addresses without defined resolver Igor Sysoev <igor@sysoev.ru> parents: 1658 diff changeset	651 }
1e0b028055ec allow to use IP addresses without defined resolver Igor Sysoev <igor@sysoev.ru> parents: 1658 diff changeset	652
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	653 ctx->name = *host;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	654 ctx->handler = ngx_http_upstream_resolve_handler;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	655 ctx->data = r;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	656 ctx->timeout = clcf->resolver_timeout;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	657
1959 4f16186f5603 quick resolving handles u->resolved->ctx by itself Igor Sysoev <igor@sysoev.ru> parents: 1958 diff changeset	658 u->resolved->ctx = ctx;
4f16186f5603 quick resolving handles u->resolved->ctx by itself Igor Sysoev <igor@sysoev.ru> parents: 1958 diff changeset	659
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	660 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	661 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	662 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	663 NGX_HTTP_INTERNAL_SERVER_ERROR);
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	664 return;
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
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	667 return;
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
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	670 found:
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	671
4964 2464ccebdb52 Upstream: fixed SIGSEGV with the "if" directive. Maxim Dounin <mdounin@mdounin.ru> parents: 4916 diff changeset	672 if (uscf == NULL) {
2464ccebdb52 Upstream: fixed SIGSEGV with the "if" directive. Maxim Dounin <mdounin@mdounin.ru> parents: 4916 diff changeset	673 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	674 "no upstream configuration");
2464ccebdb52 Upstream: fixed SIGSEGV with the "if" directive. Maxim Dounin <mdounin@mdounin.ru> parents: 4916 diff changeset	675 ngx_http_upstream_finalize_request(r, u,
2464ccebdb52 Upstream: fixed SIGSEGV with the "if" directive. Maxim Dounin <mdounin@mdounin.ru> parents: 4916 diff changeset	676 NGX_HTTP_INTERNAL_SERVER_ERROR);
2464ccebdb52 Upstream: fixed SIGSEGV with the "if" directive. Maxim Dounin <mdounin@mdounin.ru> parents: 4916 diff changeset	677 return;
2464ccebdb52 Upstream: fixed SIGSEGV with the "if" directive. Maxim Dounin <mdounin@mdounin.ru> parents: 4916 diff changeset	678 }
2464ccebdb52 Upstream: fixed SIGSEGV with the "if" directive. Maxim Dounin <mdounin@mdounin.ru> parents: 4916 diff changeset	679
5682 110b50657d77 Upstream: restored workaround for "if". Maxim Dounin <mdounin@mdounin.ru> parents: 5677 diff changeset	680 #if (NGX_HTTP_SSL)
110b50657d77 Upstream: restored workaround for "if". Maxim Dounin <mdounin@mdounin.ru> parents: 5677 diff changeset	681 u->ssl_name = uscf->host;
110b50657d77 Upstream: restored workaround for "if". Maxim Dounin <mdounin@mdounin.ru> parents: 5677 diff changeset	682 #endif
110b50657d77 Upstream: restored workaround for "if". Maxim Dounin <mdounin@mdounin.ru> parents: 5677 diff changeset	683
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	684 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	685 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	686 NGX_HTTP_INTERNAL_SERVER_ERROR);
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	687 return;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	688 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	689
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	690 ngx_http_upstream_connect(r, u);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	691 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	692
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	693
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	694 #if (NGX_HTTP_CACHE)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	695
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	696 static ngx_int_t
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	697 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	698 {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	699 ngx_int_t rc;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	700 ngx_http_cache_t *c;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	701
3056 d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	702 c = r->cache;
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	703
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	704 if (c == NULL) {
3056 d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	705
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	706 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	707 return NGX_DECLINED;
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	708 }
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	709
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	710 if (r->method & NGX_HTTP_HEAD) {
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	711 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	712 }
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	713
3698 d11227f0107f rename ngx_http_file_cache_create() to ngx_http_file_cache_new() Igor Sysoev <igor@sysoev.ru> parents: 3697 diff changeset	714 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	715 return NGX_ERROR;
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	716 }
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	717
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	718 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	719 return NGX_ERROR;
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	720 }
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	721
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	722 /* TODO: add keys */
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	723
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	724 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	725
3976 215fe9223419 update r3945 with more descriptive error message Igor Sysoev <igor@sysoev.ru> parents: 3963 diff changeset	726 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	727 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	728 "%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	729 "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	730 &u->conf->module, u->conf->buffer_size,
215fe9223419 update r3945 with more descriptive error message Igor Sysoev <igor@sysoev.ru> parents: 3963 diff changeset	731 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	732
f1f194ceab16 fix segfault if cache key is larger than upstream buffer size Igor Sysoev <igor@sysoev.ru> parents: 3940 diff changeset	733 r->cache = NULL;
f1f194ceab16 fix segfault if cache key is larger than upstream buffer size Igor Sysoev <igor@sysoev.ru> parents: 3940 diff changeset	734 return NGX_DECLINED;
f1f194ceab16 fix segfault if cache key is larger than upstream buffer size Igor Sysoev <igor@sysoev.ru> parents: 3940 diff changeset	735 }
f1f194ceab16 fix segfault if cache key is larger than upstream buffer size Igor Sysoev <igor@sysoev.ru> parents: 3940 diff changeset	736
4176 2b5151a2300b Fixed cache bypass caching of non-cacheable replies (ticket #21). Maxim Dounin <mdounin@mdounin.ru> parents: 4152 diff changeset	737 u->cacheable = 1;
2b5151a2300b Fixed cache bypass caching of non-cacheable replies (ticket #21). Maxim Dounin <mdounin@mdounin.ru> parents: 4152 diff changeset	738
3917 2a70484a6580 fix a broken cached response if bypass/no_cache directive values are different, Igor Sysoev <igor@sysoev.ru> parents: 3898 diff changeset	739 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	740
2a70484a6580 fix a broken cached response if bypass/no_cache directive values are different, Igor Sysoev <igor@sysoev.ru> parents: 3898 diff changeset	741 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	742 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	743
2a70484a6580 fix a broken cached response if bypass/no_cache directive values are different, Igor Sysoev <igor@sysoev.ru> parents: 3898 diff changeset	744 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	745 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	746 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	747
2a70484a6580 fix a broken cached response if bypass/no_cache directive values are different, Igor Sysoev <igor@sysoev.ru> parents: 3898 diff changeset	748 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	749 break;
2a70484a6580 fix a broken cached response if bypass/no_cache directive values are different, Igor Sysoev <igor@sysoev.ru> parents: 3898 diff changeset	750 }
2a70484a6580 fix a broken cached response if bypass/no_cache directive values are different, Igor Sysoev <igor@sysoev.ru> parents: 3898 diff changeset	751
3697 3c442bd5597b ngx_http_file_cache_create() Igor Sysoev <igor@sysoev.ru> parents: 3692 diff changeset	752 c = r->cache;
3c442bd5597b ngx_http_file_cache_create() Igor Sysoev <igor@sysoev.ru> parents: 3692 diff changeset	753
3056 d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	754 c->min_uses = u->conf->cache_min_uses;
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	755 c->body_start = u->conf->buffer_size;
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	756 c->file_cache = u->conf->cache->data;
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	757
4385 70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4375 diff changeset	758 c->lock = u->conf->cache_lock;
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4375 diff changeset	759 c->lock_timeout = u->conf->cache_lock_timeout;
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4375 diff changeset	760
3056 d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	761 u->cache_status = NGX_HTTP_CACHE_MISS;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	762 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	763
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	764 rc = ngx_http_file_cache_open(r);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	765
2926 80a314b63c56 delete useless r->cache->uses Igor Sysoev <igor@sysoev.ru> parents: 2912 diff changeset	766 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	767 "http upstream cache: %i", rc);
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	768
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	769 switch (rc) {
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	770
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	771 case NGX_HTTP_CACHE_UPDATING:
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	772
2927 55ceaef03d34 proxy_cache_use_stale/fastcgi_cache_use_stale updating Igor Sysoev <igor@sysoev.ru> parents: 2926 diff changeset	773 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	774 u->cache_status = rc;
2927 55ceaef03d34 proxy_cache_use_stale/fastcgi_cache_use_stale updating Igor Sysoev <igor@sysoev.ru> parents: 2926 diff changeset	775 rc = NGX_OK;
55ceaef03d34 proxy_cache_use_stale/fastcgi_cache_use_stale updating Igor Sysoev <igor@sysoev.ru> parents: 2926 diff changeset	776
55ceaef03d34 proxy_cache_use_stale/fastcgi_cache_use_stale updating Igor Sysoev <igor@sysoev.ru> parents: 2926 diff changeset	777 } else {
55ceaef03d34 proxy_cache_use_stale/fastcgi_cache_use_stale updating Igor Sysoev <igor@sysoev.ru> parents: 2926 diff changeset	778 rc = NGX_HTTP_CACHE_STALE;
55ceaef03d34 proxy_cache_use_stale/fastcgi_cache_use_stale updating Igor Sysoev <igor@sysoev.ru> parents: 2926 diff changeset	779 }
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	780
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	781 break;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	782
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	783 case NGX_OK:
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	784 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	785 }
55ceaef03d34 proxy_cache_use_stale/fastcgi_cache_use_stale updating Igor Sysoev <igor@sysoev.ru> parents: 2926 diff changeset	786
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	787 switch (rc) {
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	788
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	789 case NGX_OK:
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	790
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	791 rc = ngx_http_upstream_cache_send(r, u);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	792
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	793 if (rc != NGX_HTTP_UPSTREAM_INVALID_HEADER) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	794 return rc;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	795 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	796
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	797 break;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	798
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	799 case NGX_HTTP_CACHE_STALE:
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	800
2665 4d627567c324 fix r2664: ..._cache_valid did not work for stale responses Igor Sysoev <igor@sysoev.ru> parents: 2664 diff changeset	801 c->valid_sec = 0;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	802 u->buffer.start = NULL;
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	803 u->cache_status = NGX_HTTP_CACHE_EXPIRED;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	804
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	805 break;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	806
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	807 case NGX_DECLINED:
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	808
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	809 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	810 u->buffer.start = NULL;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	811
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	812 } else {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	813 u->buffer.pos = u->buffer.start + c->header_start;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	814 u->buffer.last = u->buffer.pos;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	815 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	816
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	817 break;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	818
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	819 case NGX_HTTP_CACHE_SCARCE:
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 u->cacheable = 0;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	822
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	823 break;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	824
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	825 case NGX_AGAIN:
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	826
3055 92b6cfaa3c27 fix sending a cached file using AIO Igor Sysoev <igor@sysoev.ru> parents: 3053 diff changeset	827 return NGX_BUSY;
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	828
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	829 case NGX_ERROR:
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	830
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	831 return NGX_ERROR;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	832
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	833 default:
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	834
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	835 /* 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	836
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	837 u->cache_status = NGX_HTTP_CACHE_HIT;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	838
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	839 return rc;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	840 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	841
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	842 r->cached = 0;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	843
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	844 return NGX_DECLINED;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	845 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	846
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	847
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	848 static ngx_int_t
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	849 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	850 {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	851 ngx_int_t rc;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	852 ngx_http_cache_t *c;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	853
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	854 r->cached = 1;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	855 c = r->cache;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	856
3369 479468a7d982 fix handling cached HTTP/0.9 response Igor Sysoev <igor@sysoev.ru> parents: 3272 diff changeset	857 if (c->header_start == c->body_start) {
479468a7d982 fix handling cached HTTP/0.9 response Igor Sysoev <igor@sysoev.ru> parents: 3272 diff changeset	858 r->http_version = NGX_HTTP_VERSION_9;
479468a7d982 fix handling cached HTTP/0.9 response Igor Sysoev <igor@sysoev.ru> parents: 3272 diff changeset	859 return ngx_http_cache_send(r);
479468a7d982 fix handling cached HTTP/0.9 response Igor Sysoev <igor@sysoev.ru> parents: 3272 diff changeset	860 }
479468a7d982 fix handling cached HTTP/0.9 response Igor Sysoev <igor@sysoev.ru> parents: 3272 diff changeset	861
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	862 /* TODO: cache stack */
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 u->buffer = *c->buf;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	865 u->buffer.pos += c->header_start;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	866
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	867 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	868 u->headers_in.content_length_n = -1;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	869
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	870 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	871 sizeof(ngx_table_elt_t))
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	872 != NGX_OK)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	873 {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	874 return NGX_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	875 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	876
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	877 rc = u->process_header(r);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	878
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	879 if (rc == NGX_OK) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	880
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	881 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	882 return NGX_DONE;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	883 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	884
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	885 return ngx_http_cache_send(r);
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
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	888 if (rc == NGX_ERROR) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	889 return NGX_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	890 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	891
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	892 /* rc == NGX_HTTP_UPSTREAM_INVALID_HEADER */
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 /* TODO: delete file */
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 rc;
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 #endif
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	900
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	901
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	902 static void
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	903 ngx_http_upstream_resolve_handler(ngx_resolver_ctx_t *ctx)
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	904 {
5113 08b36f2afc3f Upstream: fixed previous commit. Maxim Dounin <mdounin@mdounin.ru> parents: 5112 diff changeset	905 ngx_connection_t *c;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	906 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	907 ngx_http_upstream_t *u;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	908 ngx_http_upstream_resolved_t *ur;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	909
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	910 r = ctx->data;
5113 08b36f2afc3f Upstream: fixed previous commit. Maxim Dounin <mdounin@mdounin.ru> parents: 5112 diff changeset	911 c = r->connection;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	912
3169 b1013d768911 fix request counter in resolver handling, the bug was introduced in r3050 Igor Sysoev <igor@sysoev.ru> parents: 3161 diff changeset	913 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	914 ur = u->resolved;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	915
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	916 if (ctx->state) {
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	917 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	918 "%V could not be resolved (%i: %s)",
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	919 &ctx->name, ctx->state,
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	920 ngx_resolver_strerror(ctx->state));
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	921
3169 b1013d768911 fix request counter in resolver handling, the bug was introduced in r3050 Igor Sysoev <igor@sysoev.ru> parents: 3161 diff changeset	922 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	923 goto failed;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	924 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	925
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	926 ur->naddrs = ctx->naddrs;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	927 ur->addrs = ctx->addrs;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	928
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	929 #if (NGX_DEBUG)
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	930 {
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5453 diff changeset	931 u_char text[NGX_SOCKADDR_STRLEN];
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5453 diff changeset	932 ngx_str_t addr;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	933 ngx_uint_t i;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	934
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5453 diff changeset	935 addr.data = text;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5453 diff changeset	936
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	937 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	938 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	939 text, NGX_SOCKADDR_STRLEN, 0);
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5453 diff changeset	940
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5453 diff changeset	941 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	942 "name was resolved to %V", &addr);
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	943 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	944 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	945 #endif
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	946
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	947 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	948 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	949 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	950 goto failed;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	951 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	952
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	953 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	954 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	955
b1013d768911 fix request counter in resolver handling, the bug was introduced in r3050 Igor Sysoev <igor@sysoev.ru> parents: 3161 diff changeset	956 ngx_http_upstream_connect(r, u);
5112 d3c15c7831eb Upstream: call ngx_http_run_posted_requests() on resolve errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5104 diff changeset	957
d3c15c7831eb Upstream: call ngx_http_run_posted_requests() on resolve errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5104 diff changeset	958 failed:
d3c15c7831eb Upstream: call ngx_http_run_posted_requests() on resolve errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5104 diff changeset	959
5113 08b36f2afc3f Upstream: fixed previous commit. Maxim Dounin <mdounin@mdounin.ru> parents: 5112 diff changeset	960 ngx_http_run_posted_requests(c);
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	961 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	962
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	963
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	964 static void
2377 87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	965 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	966 {
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	967 ngx_connection_t *c;
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	968 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	969 ngx_http_log_ctx_t *ctx;
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	970 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	971
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	972 c = ev->data;
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	973 r = c->data;
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	974
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	975 u = r->upstream;
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	976 c = r->connection;
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	977
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	978 ctx = c->log->data;
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	979 ctx->current_request = r;
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	980
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	981 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	982 "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	983
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	984 if (ev->write) {
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	985 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	986
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	987 } else {
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	988 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	989 }
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	990
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	991 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	992 }
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	993
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	994
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	995 static void
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	996 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	997 {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	998 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	999 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1000
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1001
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1002 static void
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1003 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	1004 {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1005 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	1006 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1007
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1008
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1009 static void
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1010 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	1011 ngx_event_t *ev)
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1012 {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1013 int n;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1014 char buf[1];
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1015 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	1016 ngx_int_t event;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1017 ngx_connection_t *c;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1018 ngx_http_upstream_t *u;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1019
527 7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	1020 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	1021 "http upstream check client, write event:%d, \"%V\"",
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	1022 ev->write, &r->uri);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1023
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1024 c = r->connection;
483 621229427cba nginx-0.1.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	1025 u = r->upstream;
621229427cba nginx-0.1.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	1026
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	1027 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	1028 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	1029
6ad4bba6313e delete level event of appropriate type, this should fix select()'s EBADF, Igor Sysoev <igor@sysoev.ru> parents: 2805 diff changeset	1030 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	1031
6ad4bba6313e delete level event of appropriate type, this should fix select()'s EBADF, Igor Sysoev <igor@sysoev.ru> parents: 2805 diff changeset	1032 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	1033 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	1034 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	1035 return;
6ad4bba6313e delete level event of appropriate type, this should fix select()'s EBADF, Igor Sysoev <igor@sysoev.ru> parents: 2805 diff changeset	1036 }
6ad4bba6313e delete level event of appropriate type, this should fix select()'s EBADF, Igor Sysoev <igor@sysoev.ru> parents: 2805 diff changeset	1037 }
6ad4bba6313e delete level event of appropriate type, this should fix select()'s EBADF, Igor Sysoev <igor@sysoev.ru> parents: 2805 diff changeset	1038
2757 9cc973b46af1 get a full response if the response is cacheable or storable even Igor Sysoev <igor@sysoev.ru> parents: 2708 diff changeset	1039 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	1040 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	1041 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	1042 }
2807 6ad4bba6313e delete level event of appropriate type, this should fix select()'s EBADF, Igor Sysoev <igor@sysoev.ru> parents: 2805 diff changeset	1043
527 7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	1044 return;
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	1045 }
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	1046
5121 c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: 5113 diff changeset	1047 #if (NGX_HTTP_SPDY)
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: 5113 diff changeset	1048 if (r->spdy_stream) {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: 5113 diff changeset	1049 return;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: 5113 diff changeset	1050 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: 5113 diff changeset	1051 #endif
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: 5113 diff changeset	1052
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1053 #if (NGX_HAVE_KQUEUE)
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1054
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1055 if (ngx_event_flags & NGX_USE_KQUEUE_EVENT) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1056
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1057 if (!ev->pending_eof) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1058 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1059 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1060
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1061 ev->eof = 1;
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	1062 c->error = 1;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1063
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1064 if (ev->kq_errno) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1065 ev->error = 1;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1066 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1067
2757 9cc973b46af1 get a full response if the response is cacheable or storable even Igor Sysoev <igor@sysoev.ru> parents: 2708 diff changeset	1068 if (!u->cacheable && u->peer.connection) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1069 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	1070 "kevent() reported that client prematurely closed "
527 7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	1071 "connection, so upstream connection is closed too");
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1072 ngx_http_upstream_finalize_request(r, u,
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1073 NGX_HTTP_CLIENT_CLOSED_REQUEST);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1074 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1075 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1076
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1077 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	1078 "kevent() reported that client prematurely closed "
75d2388bd6b9 Tweaked error messages. Ruslan Ermilov <ru@nginx.com> parents: 4176 diff changeset	1079 "connection");
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1080
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1081 if (u->peer.connection == NULL) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1082 ngx_http_upstream_finalize_request(r, u,
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1083 NGX_HTTP_CLIENT_CLOSED_REQUEST);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1084 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1085
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1086 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1087 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1088
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1089 #endif
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1090
5373 46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1091 #if (NGX_HAVE_EPOLLRDHUP)
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1092
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1093 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	1094 socklen_t len;
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1095
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1096 ev->eof = 1;
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1097 c->error = 1;
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1098
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1099 err = 0;
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1100 len = sizeof(ngx_err_t);
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1101
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1102 /*
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1103 * 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	1104 * 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	1105 */
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1106
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1107 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	1108 == -1)
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1109 {
5557 188481078faf Use ngx_socket_errno where appropriate. Piotr Sikora <piotr@cloudflare.com> parents: 5546 diff changeset	1110 err = ngx_socket_errno;
5373 46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1111 }
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1112
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1113 if (err) {
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1114 ev->error = 1;
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1115 }
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1116
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1117 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	1118 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	1119 "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	1120 "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	1121 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	1122 NGX_HTTP_CLIENT_CLOSED_REQUEST);
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1123 return;
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1124 }
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1125
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1126 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	1127 "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	1128 "connection");
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1129
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1130 if (u->peer.connection == NULL) {
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1131 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	1132 NGX_HTTP_CLIENT_CLOSED_REQUEST);
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1133 }
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1134
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1135 return;
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1136 }
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1137
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1138 #endif
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1139
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1140 n = recv(c->fd, buf, 1, MSG_PEEK);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1141
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1142 err = ngx_socket_errno;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1143
1109 1402dbb554c4 add debug logging Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	1144 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ev->log, err,
1402dbb554c4 add debug logging Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	1145 "http upstream recv(): %d", n);
1402dbb554c4 add debug logging Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	1146
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1147 if (ev->write && (n >= 0 \|\| err == NGX_EAGAIN)) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1148 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1149 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1150
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1151 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	1152
6ad4bba6313e delete level event of appropriate type, this should fix select()'s EBADF, Igor Sysoev <igor@sysoev.ru> parents: 2805 diff changeset	1153 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	1154
6ad4bba6313e delete level event of appropriate type, this should fix select()'s EBADF, Igor Sysoev <igor@sysoev.ru> parents: 2805 diff changeset	1155 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	1156 ngx_http_upstream_finalize_request(r, u,
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1157 NGX_HTTP_INTERNAL_SERVER_ERROR);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1158 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1159 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1160 }
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 (n > 0) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1163 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1164 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1165
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1166 if (n == -1) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1167 if (err == NGX_EAGAIN) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1168 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1169 }
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 ev->error = 1;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1172
483 621229427cba nginx-0.1.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	1173 } else { /* n == 0 */
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1174 err = 0;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1175 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1176
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	1177 ev->eof = 1;
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	1178 c->error = 1;
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	1179
2757 9cc973b46af1 get a full response if the response is cacheable or storable even Igor Sysoev <igor@sysoev.ru> parents: 2708 diff changeset	1180 if (!u->cacheable && u->peer.connection) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1181 ngx_log_error(NGX_LOG_INFO, ev->log, err,
4182 75d2388bd6b9 Tweaked error messages. Ruslan Ermilov <ru@nginx.com> parents: 4176 diff changeset	1182 "client prematurely closed connection, "
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1183 "so upstream connection is closed too");
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1184 ngx_http_upstream_finalize_request(r, u,
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1185 NGX_HTTP_CLIENT_CLOSED_REQUEST);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1186 return;
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
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1189 ngx_log_error(NGX_LOG_INFO, ev->log, err,
4182 75d2388bd6b9 Tweaked error messages. Ruslan Ermilov <ru@nginx.com> parents: 4176 diff changeset	1190 "client prematurely closed connection");
479 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 if (u->peer.connection == NULL) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1193 ngx_http_upstream_finalize_request(r, u,
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1194 NGX_HTTP_CLIENT_CLOSED_REQUEST);
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 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1197
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1198
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	1199 static void
31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	1200 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	1201 {
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1202 ngx_int_t rc;
665 5fd7a5e99047 nginx-0.3.54-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	1203 ngx_time_t *tp;
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1204 ngx_connection_t *c;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1205
483 621229427cba nginx-0.1.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	1206 r->connection->log->action = "connecting to upstream";
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1207
889 a9a7e4b1a72b the previous fix does not actually fix overflow Igor Sysoev <igor@sysoev.ru> parents: 888 diff changeset	1208 if (u->state && u->state->response_sec) {
665 5fd7a5e99047 nginx-0.3.54-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	1209 tp = ngx_timeofday();
889 a9a7e4b1a72b the previous fix does not actually fix overflow Igor Sysoev <igor@sysoev.ru> parents: 888 diff changeset	1210 u->state->response_sec = tp->sec - u->state->response_sec;
a9a7e4b1a72b the previous fix does not actually fix overflow Igor Sysoev <igor@sysoev.ru> parents: 888 diff changeset	1211 u->state->response_msec = tp->msec - u->state->response_msec;
665 5fd7a5e99047 nginx-0.3.54-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	1212 }
5fd7a5e99047 nginx-0.3.54-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	1213
1168 4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	1214 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	1215 if (u->state == NULL) {
5fd7a5e99047 nginx-0.3.54-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	1216 ngx_http_upstream_finalize_request(r, u,
5fd7a5e99047 nginx-0.3.54-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	1217 NGX_HTTP_INTERNAL_SERVER_ERROR);
5fd7a5e99047 nginx-0.3.54-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	1218 return;
5fd7a5e99047 nginx-0.3.54-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	1219 }
5fd7a5e99047 nginx-0.3.54-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	1220
5fd7a5e99047 nginx-0.3.54-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	1221 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	1222
5fd7a5e99047 nginx-0.3.54-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	1223 tp = ngx_timeofday();
889 a9a7e4b1a72b the previous fix does not actually fix overflow Igor Sysoev <igor@sysoev.ru> parents: 888 diff changeset	1224 u->state->response_sec = tp->sec;
a9a7e4b1a72b the previous fix does not actually fix overflow Igor Sysoev <igor@sysoev.ru> parents: 888 diff changeset	1225 u->state->response_msec = tp->msec;
665 5fd7a5e99047 nginx-0.3.54-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	1226
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1227 rc = ngx_event_connect_peer(&u->peer);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1228
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1229 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1230 "http upstream connect: %i", rc);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1231
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1232 if (rc == NGX_ERROR) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1233 ngx_http_upstream_finalize_request(r, u,
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1234 NGX_HTTP_INTERNAL_SERVER_ERROR);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1235 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1236 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1237
1707 f3188f6eae1f $upstream_addr did not contain last address, the bug was introduced in r1659 Igor Sysoev <igor@sysoev.ru> parents: 1706 diff changeset	1238 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	1239
543 511a89da35ad nginx-0.2.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 541 diff changeset	1240 if (rc == NGX_BUSY) {
511a89da35ad nginx-0.2.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 541 diff changeset	1241 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	1242 ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_NOLIVE);
0be898896d1a backup upstream servers Igor Sysoev <igor@sysoev.ru> parents: 1340 diff changeset	1243 return;
543 511a89da35ad nginx-0.2.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 541 diff changeset	1244 }
511a89da35ad nginx-0.2.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 541 diff changeset	1245
1378 0be898896d1a backup upstream servers Igor Sysoev <igor@sysoev.ru> parents: 1340 diff changeset	1246 if (rc == NGX_DECLINED) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1247 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	1248 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1249 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1250
5261 af60a210cb78 Upstream: updated list of ngx_event_connect_peer() return values. Ruslan Ermilov <ru@nginx.com> parents: 5231 diff changeset	1251 /* 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	1252
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1253 c = u->peer.connection;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1254
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1255 c->data = r;
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1256
2377 87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1257 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	1258 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	1259
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1260 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	1261 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	1262
1397 6c25a49e548a upstream sendfile bit was overridden by r->connection->sendfile Igor Sysoev <igor@sysoev.ru> parents: 1378 diff changeset	1263 c->sendfile &= r->connection->sendfile;
1958 3e9e4581fbba fix peer sendfile capability Igor Sysoev <igor@sysoev.ru> parents: 1947 diff changeset	1264 u->output.sendfile = c->sendfile;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1265
4116 9baf12ea5ca1 Upstream: separate pool for peer connections. Maxim Dounin <mdounin@mdounin.ru> parents: 4115 diff changeset	1266 if (c->pool == NULL) {
9baf12ea5ca1 Upstream: separate pool for peer connections. Maxim Dounin <mdounin@mdounin.ru> parents: 4115 diff changeset	1267
9baf12ea5ca1 Upstream: separate pool for peer connections. Maxim Dounin <mdounin@mdounin.ru> parents: 4115 diff changeset	1268 /* 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	1269
9baf12ea5ca1 Upstream: separate pool for peer connections. Maxim Dounin <mdounin@mdounin.ru> parents: 4115 diff changeset	1270 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	1271 if (c->pool == NULL) {
9baf12ea5ca1 Upstream: separate pool for peer connections. Maxim Dounin <mdounin@mdounin.ru> parents: 4115 diff changeset	1272 ngx_http_upstream_finalize_request(r, u,
9baf12ea5ca1 Upstream: separate pool for peer connections. Maxim Dounin <mdounin@mdounin.ru> parents: 4115 diff changeset	1273 NGX_HTTP_INTERNAL_SERVER_ERROR);
9baf12ea5ca1 Upstream: separate pool for peer connections. Maxim Dounin <mdounin@mdounin.ru> parents: 4115 diff changeset	1274 return;
9baf12ea5ca1 Upstream: separate pool for peer connections. Maxim Dounin <mdounin@mdounin.ru> parents: 4115 diff changeset	1275 }
9baf12ea5ca1 Upstream: separate pool for peer connections. Maxim Dounin <mdounin@mdounin.ru> parents: 4115 diff changeset	1276 }
9baf12ea5ca1 Upstream: separate pool for peer connections. Maxim Dounin <mdounin@mdounin.ru> parents: 4115 diff changeset	1277
2847 3e10674139e4 style fix Igor Sysoev <igor@sysoev.ru> parents: 2824 diff changeset	1278 c->log = r->connection->log;
4116 9baf12ea5ca1 Upstream: separate pool for peer connections. Maxim Dounin <mdounin@mdounin.ru> parents: 4115 diff changeset	1279 c->pool->log = c->log;
2847 3e10674139e4 style fix Igor Sysoev <igor@sysoev.ru> parents: 2824 diff changeset	1280 c->read->log = c->log;
3e10674139e4 style fix Igor Sysoev <igor@sysoev.ru> parents: 2824 diff changeset	1281 c->write->log = c->log;
479 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 /* 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	1284
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1285 u->writer.out = NULL;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1286 u->writer.last = &u->writer.out;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1287 u->writer.connection = c;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1288 u->writer.limit = 0;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1289
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1290 if (u->request_sent) {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1291 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	1292 ngx_http_upstream_finalize_request(r, u,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1293 NGX_HTTP_INTERNAL_SERVER_ERROR);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1294 return;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1295 }
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1296 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1297
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	1298 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	1299 && 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	1300 && 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	1301 && 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	1302 {
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1303 /*
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1304 * 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	1305 * 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	1306 */
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1307
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1308 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	1309 if (u->output.free == NULL) {
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1310 ngx_http_upstream_finalize_request(r, u,
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1311 NGX_HTTP_INTERNAL_SERVER_ERROR);
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1312 return;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1313 }
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1314
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1315 u->output.free->buf = r->request_body->buf;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1316 u->output.free->next = NULL;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1317 u->output.allocated = 1;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1318
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1319 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	1320 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	1321 r->request_body->buf->tag = u->output.tag;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1322 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1323
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1324 u->request_sent = 0;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1325
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1326 if (rc == NGX_AGAIN) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1327 ngx_add_timer(c->write, u->conf->connect_timeout);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1328 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1329 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1330
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1331 #if (NGX_HTTP_SSL)
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1332
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1333 if (u->ssl && c->ssl == NULL) {
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1334 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	1335 return;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1336 }
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1337
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1338 #endif
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1339
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1340 ngx_http_upstream_send_request(r, u);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1341 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1342
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1343
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1344 #if (NGX_HTTP_SSL)
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1345
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1346 static void
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1347 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	1348 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	1349 {
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	1350 ngx_int_t rc;
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1351
5305 12b750d35162 Upstream: reliably detect connection failures with SSL peers. Ruslan Ermilov <ru@nginx.com> parents: 5304 diff changeset	1352 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	1353 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	1354 return;
12b750d35162 Upstream: reliably detect connection failures with SSL peers. Ruslan Ermilov <ru@nginx.com> parents: 5304 diff changeset	1355 }
12b750d35162 Upstream: reliably detect connection failures with SSL peers. Ruslan Ermilov <ru@nginx.com> parents: 5304 diff changeset	1356
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1357 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	1358 NGX_SSL_BUFFER\|NGX_SSL_CLIENT)
2536 a6d6d762c554 small optimization: " == NGX_ERROR" > " != NGX_OK" Igor Sysoev <igor@sysoev.ru> parents: 2463 diff changeset	1359 != NGX_OK)
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1360 {
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1361 ngx_http_upstream_finalize_request(r, u,
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1362 NGX_HTTP_INTERNAL_SERVER_ERROR);
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1363 return;
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1364 }
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1365
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1366 c->sendfile = 0;
619 7a16e281c01f nginx-0.3.31-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 615 diff changeset	1367 u->output.sendfile = 0;
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1368
5661 060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1369 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	1370 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	1371 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	1372 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	1373 return;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1374 }
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1375 }
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1376
2184 274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2183 diff changeset	1377 if (u->conf->ssl_session_reuse) {
274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2183 diff changeset	1378 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	1379 ngx_http_upstream_finalize_request(r, u,
274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2183 diff changeset	1380 NGX_HTTP_INTERNAL_SERVER_ERROR);
274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2183 diff changeset	1381 return;
274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2183 diff changeset	1382 }
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1383 }
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1384
641 5e8fb59c18c1 nginx-0.3.42-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1385 r->connection->log->action = "SSL handshaking to upstream";
5e8fb59c18c1 nginx-0.3.42-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1386
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1387 rc = ngx_ssl_handshake(c);
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1388
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1389 if (rc == NGX_AGAIN) {
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1390 c->ssl->handler = ngx_http_upstream_ssl_handshake;
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1391 return;
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1392 }
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1393
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1394 ngx_http_upstream_ssl_handshake(c);
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1395 }
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1396
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1397
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1398 static void
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1399 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	1400 {
5661 060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1401 long rc;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1402 ngx_http_request_t *r;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1403 ngx_http_upstream_t *u;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1404
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1405 r = c->data;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1406 u = r->upstream;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1407
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1408 if (c->ssl->handshaked) {
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1409
5661 060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1410 if (u->conf->ssl_verify) {
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1411 rc = SSL_get_verify_result(c->ssl->connection);
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1412
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1413 if (rc != X509_V_OK) {
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1414 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	1415 "upstream SSL certificate verify error: (%l:%s)",
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1416 rc, X509_verify_cert_error_string(rc));
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1417 goto failed;
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1418 }
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1419
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1420 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	1421 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	1422 "upstream SSL certificate does not match \"%V\"",
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1423 &u->ssl_name);
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1424 goto failed;
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1425 }
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1426 }
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1427
2184 274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2183 diff changeset	1428 if (u->conf->ssl_session_reuse) {
274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2183 diff changeset	1429 u->peer.save_session(&u->peer, u->peer.data);
274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2183 diff changeset	1430 }
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	1431
2377 87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1432 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	1433 c->read->handler = ngx_http_upstream_handler;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1434
5340 13a5f4765887 Upstream: posted requests handling after ssl handshake errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5305 diff changeset	1435 c = r->connection;
13a5f4765887 Upstream: posted requests handling after ssl handshake errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5305 diff changeset	1436
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1437 ngx_http_upstream_send_request(r, u);
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1438
5340 13a5f4765887 Upstream: posted requests handling after ssl handshake errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5305 diff changeset	1439 ngx_http_run_posted_requests(c);
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1440 return;
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
5661 060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1443 failed:
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1444
5340 13a5f4765887 Upstream: posted requests handling after ssl handshake errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5305 diff changeset	1445 c = r->connection;
13a5f4765887 Upstream: posted requests handling after ssl handshake errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5305 diff changeset	1446
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1447 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	1448
5340 13a5f4765887 Upstream: posted requests handling after ssl handshake errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5305 diff changeset	1449 ngx_http_run_posted_requests(c);
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1450 }
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1451
5660 7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1452
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1453 static ngx_int_t
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1454 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	1455 ngx_connection_t *c)
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1456 {
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1457 u_char p, last;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1458 ngx_str_t name;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1459
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1460 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	1461 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	1462 return NGX_ERROR;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1463 }
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1464
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1465 } else {
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1466 name = u->ssl_name;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1467 }
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1468
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1469 if (name.len == 0) {
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1470 goto done;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1471 }
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1472
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1473 /*
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1474 * 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	1475 * 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	1476 */
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1477
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1478 p = name.data;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1479 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	1480
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1481 if (*p == '[') {
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1482 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	1483
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1484 if (p == NULL) {
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1485 p = name.data;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1486 }
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1487 }
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1488
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1489 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	1490
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1491 if (p != NULL) {
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1492 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	1493 }
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1494
5661 060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1495 if (!u->conf->ssl_server_name) {
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1496 goto done;
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1497 }
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1498
5660 7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1499 #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	1500
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1501 /* 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	1502
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1503 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	1504 goto done;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1505 }
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1506
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1507 if (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	1508 goto done;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1509 }
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1510
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1511 /*
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1512 * 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	1513 * 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	1514 */
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1515
5667 16405e02e612 Upstream: for ssl name, non-aligned memory allocation is enough. Ruslan Ermilov <ru@nginx.com> parents: 5661 diff changeset	1516 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	1517 if (p == NULL) {
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1518 return NGX_ERROR;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1519 }
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1520
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1521 (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	1522
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1523 name.data = p;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1524
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1525 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	1526 "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	1527
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1528 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	1529 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	1530 "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	1531 return NGX_ERROR;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1532 }
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1533
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1534 #endif
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1535
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1536 done:
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1537
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1538 u->ssl_name = name;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1539
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1540 return NGX_OK;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1541 }
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1542
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1543 #endif
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1544
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1545
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1546 static ngx_int_t
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	1547 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	1548 {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1549 ngx_chain_t *cl;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1550
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1551 if (u->reinit_request(r) != NGX_OK) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1552 return NGX_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1553 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1554
4120 42135dd1f0ea Upstream: keepalive flag. Maxim Dounin <mdounin@mdounin.ru> parents: 4119 diff changeset	1555 u->keepalive = 0;
5072 7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	1556 u->upgrade = 0;
4120 42135dd1f0ea Upstream: keepalive flag. Maxim Dounin <mdounin@mdounin.ru> parents: 4119 diff changeset	1557
1705 d22095839d86 optimize r->upstream usage Igor Sysoev <igor@sysoev.ru> parents: 1701 diff changeset	1558 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	1559 u->headers_in.content_length_n = -1;
1705 d22095839d86 optimize r->upstream usage Igor Sysoev <igor@sysoev.ru> parents: 1701 diff changeset	1560
d22095839d86 optimize r->upstream usage Igor Sysoev <igor@sysoev.ru> parents: 1701 diff changeset	1561 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	1562 sizeof(ngx_table_elt_t))
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1563 != NGX_OK)
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1564 {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1565 return NGX_ERROR;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1566 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1567
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1568 /* reinit the request chain */
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1569
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1570 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	1571 cl->buf->pos = cl->buf->start;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1572 cl->buf->file_pos = 0;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1573 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1574
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1575 /* reinit the subrequest's ngx_output_chain() context */
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1576
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1577 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	1578 && r != r->main && u->output.buf)
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1579 {
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1580 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	1581 if (u->output.free == NULL) {
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1582 return NGX_ERROR;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1583 }
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1584
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1585 u->output.free->buf = u->output.buf;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1586 u->output.free->next = NULL;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1587
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1588 u->output.buf->pos = u->output.buf->start;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1589 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	1590 }
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1591
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1592 u->output.buf = NULL;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1593 u->output.in = NULL;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1594 u->output.busy = NULL;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1595
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	1596 /* reinit u->buffer */
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1597
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1598 u->buffer.pos = u->buffer.start;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1599
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1600 #if (NGX_HTTP_CACHE)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1601
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1602 if (r->cache) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1603 u->buffer.pos += r->cache->header_start;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1604 }
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1605
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1606 #endif
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1607
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1608 u->buffer.last = u->buffer.pos;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1609
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1610 return NGX_OK;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1611 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1612
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1613
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	1614 static void
31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	1615 ngx_http_upstream_send_request(ngx_http_request_t r, ngx_http_upstream_t u)
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1616 {
1153 c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	1617 ngx_int_t rc;
483 621229427cba nginx-0.1.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	1618 ngx_connection_t *c;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1619
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1620 c = u->peer.connection;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1621
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1622 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	1623 "http upstream send request");
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1624
1153 c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	1625 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	1626 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	1627 return;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1628 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1629
483 621229427cba nginx-0.1.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	1630 c->log->action = "sending request to upstream";
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1631
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1632 rc = ngx_output_chain(&u->output, u->request_sent ? NULL : u->request_bufs);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1633
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1634 u->request_sent = 1;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1635
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1636 if (rc == NGX_ERROR) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1637 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	1638 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1639 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1640
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1641 if (c->write->timer_set) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1642 ngx_del_timer(c->write);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1643 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1644
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1645 if (rc == NGX_AGAIN) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1646 ngx_add_timer(c->write, u->conf->send_timeout);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1647
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	1648 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	1649 ngx_http_upstream_finalize_request(r, u,
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1650 NGX_HTTP_INTERNAL_SERVER_ERROR);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1651 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1652 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1653
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1654 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1655 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1656
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1657 /* rc == NGX_OK */
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1658
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1659 if (c->tcp_nopush == NGX_TCP_NOPUSH_SET) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1660 if (ngx_tcp_push(c->fd) == NGX_ERROR) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1661 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	1662 ngx_tcp_push_n " failed");
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1663 ngx_http_upstream_finalize_request(r, u,
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1664 NGX_HTTP_INTERNAL_SERVER_ERROR);
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1665 return;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1666 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1667
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1668 c->tcp_nopush = NGX_TCP_NOPUSH_UNSET;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1669 }
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1670
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1671 ngx_add_timer(c->read, u->conf->read_timeout);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1672
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1673 if (c->read->ready) {
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	1674 ngx_http_upstream_process_header(r, u);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1675 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1676 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1677
2377 87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1678 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	1679
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	1680 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	1681 ngx_http_upstream_finalize_request(r, u,
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1682 NGX_HTTP_INTERNAL_SERVER_ERROR);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1683 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1684 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1685 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1686
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1687
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	1688 static void
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	1689 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	1690 ngx_http_upstream_t *u)
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1691 {
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	1692 ngx_connection_t *c;
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	1693
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	1694 c = u->peer.connection;
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	1695
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	1696 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	1697 "http upstream send request handler");
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1698
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	1699 if (c->write->timedout) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1700 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	1701 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1702 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1703
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1704 #if (NGX_HTTP_SSL)
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1705
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1706 if (u->ssl && c->ssl == NULL) {
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1707 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	1708 return;
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1709 }
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1710
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1711 #endif
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1712
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	1713 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	1714 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	1715
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	1716 (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	1717
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	1718 return;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	1719 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	1720
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1721 ngx_http_upstream_send_request(r, u);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1722 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1723
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1724
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	1725 static void
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	1726 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	1727 {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1728 ssize_t n;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1729 ngx_int_t rc;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1730 ngx_connection_t *c;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1731
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	1732 c = u->peer.connection;
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	1733
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	1734 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	1735 "http upstream process header");
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1736
483 621229427cba nginx-0.1.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	1737 c->log->action = "reading response header from upstream";
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1738
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	1739 if (c->read->timedout) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1740 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	1741 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1742 }
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1743
1153 c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	1744 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	1745 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	1746 return;
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	1747 }
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	1748
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	1749 if (u->buffer.start == NULL) {
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	1750 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	1751 if (u->buffer.start == NULL) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1752 ngx_http_upstream_finalize_request(r, u,
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1753 NGX_HTTP_INTERNAL_SERVER_ERROR);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1754 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1755 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1756
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	1757 u->buffer.pos = u->buffer.start;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	1758 u->buffer.last = u->buffer.start;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	1759 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	1760 u->buffer.temporary = 1;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	1761
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	1762 u->buffer.tag = u->output.tag;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1763
1705 d22095839d86 optimize r->upstream usage Igor Sysoev <igor@sysoev.ru> parents: 1701 diff changeset	1764 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	1765 sizeof(ngx_table_elt_t))
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	1766 != NGX_OK)
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1767 {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1768 ngx_http_upstream_finalize_request(r, u,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1769 NGX_HTTP_INTERNAL_SERVER_ERROR);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1770 return;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1771 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1772
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1773 #if (NGX_HTTP_CACHE)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1774
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1775 if (r->cache) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1776 u->buffer.pos += r->cache->header_start;
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	1777 u->buffer.last = u->buffer.pos;
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 #endif
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1780 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1781
2360 64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1782 for ( ;; ) {
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1783
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1784 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	1785
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1786 if (n == NGX_AGAIN) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1787 #if 0
2360 64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1788 ngx_add_timer(rev, u->read_timeout);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1789 #endif
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1790
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	1791 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	1792 ngx_http_upstream_finalize_request(r, u,
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1793 NGX_HTTP_INTERNAL_SERVER_ERROR);
2360 64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1794 return;
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1795 }
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1796
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1797 return;
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1798 }
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1799
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1800 if (n == 0) {
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	1801 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	1802 "upstream prematurely closed connection");
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1803 }
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1804
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1805 if (n == NGX_ERROR \|\| n == 0) {
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1806 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	1807 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1808 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1809
2360 64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1810 u->buffer.last += n;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1811
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1812 #if 0
2360 64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1813 u->valid_header_in = 0;
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1814
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1815 u->peer.cached = 0;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1816 #endif
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1817
2360 64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1818 rc = u->process_header(r);
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1819
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1820 if (rc == NGX_AGAIN) {
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1821
4460 6299d1c4dbb4 Upstream: fixed "too big header" check. Maxim Dounin <mdounin@mdounin.ru> parents: 4412 diff changeset	1822 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	1823 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	1824 "upstream sent too big header");
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1825
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1826 ngx_http_upstream_next(r, u,
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1827 NGX_HTTP_UPSTREAM_FT_INVALID_HEADER);
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1828 return;
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1829 }
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1830
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1831 continue;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1832 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1833
2360 64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	1834 break;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1835 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1836
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1837 if (rc == NGX_HTTP_UPSTREAM_INVALID_HEADER) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1838 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	1839 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1840 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1841
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	1842 if (rc == NGX_ERROR) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1843 ngx_http_upstream_finalize_request(r, u,
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1844 NGX_HTTP_INTERNAL_SERVER_ERROR);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1845 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1846 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1847
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1848 /* rc == NGX_OK */
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1849
5209 07e515e65984 Upstream: allow to intercept responses with status 300. Ruslan Ermilov <ru@nginx.com> parents: 5169 diff changeset	1850 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	1851
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	1852 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	1853 return;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1854 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1855
2267 920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	1856 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	1857 return;
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	1858 }
31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	1859 }
31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	1860
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1861 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	1862 return;
417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	1863 }
417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	1864
777 4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	1865 if (!r->subrequest_in_memory) {
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	1866 ngx_http_upstream_send_response(r, u);
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	1867 return;
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	1868 }
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	1869
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	1870 /* subrequest content in memory */
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	1871
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	1872 if (u->input_filter == NULL) {
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	1873 u->input_filter_init = ngx_http_upstream_non_buffered_filter_init;
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	1874 u->input_filter = ngx_http_upstream_non_buffered_filter;
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	1875 u->input_filter_ctx = r;
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	1876 }
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	1877
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	1878 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	1879 ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
777 4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	1880 return;
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	1881 }
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	1882
2308 3f98400e31e9 memcached response was stored in variable with END Igor Sysoev <igor@sysoev.ru> parents: 2285 diff changeset	1883 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	1884
3f98400e31e9 memcached response was stored in variable with END Igor Sysoev <igor@sysoev.ru> parents: 2285 diff changeset	1885 if (n) {
5216 4a40163772a1 Upstream: made the assignment more obvious. Ruslan Ermilov <ru@nginx.com> parents: 5209 diff changeset	1886 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	1887
2402 cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	1888 u->state->response_length += n;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	1889
2308 3f98400e31e9 memcached response was stored in variable with END Igor Sysoev <igor@sysoev.ru> parents: 2285 diff changeset	1890 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	1891 ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	1892 return;
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	1893 }
5217 ddba4e308ecc Upstream: slightly optimized ngx_http_upstream_process_header(). Ruslan Ermilov <ru@nginx.com> parents: 5216 diff changeset	1894 }
ddba4e308ecc Upstream: slightly optimized ngx_http_upstream_process_header(). Ruslan Ermilov <ru@nginx.com> parents: 5216 diff changeset	1895
ddba4e308ecc Upstream: slightly optimized ngx_http_upstream_process_header(). Ruslan Ermilov <ru@nginx.com> parents: 5216 diff changeset	1896 if (u->length == 0) {
ddba4e308ecc Upstream: slightly optimized ngx_http_upstream_process_header(). Ruslan Ermilov <ru@nginx.com> parents: 5216 diff changeset	1897 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	1898 return;
777 4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	1899 }
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	1900
2377 87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1901 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	1902
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	1903 ngx_http_upstream_process_body_in_memory(r, u);
777 4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	1904 }
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	1905
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	1906
1153 c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	1907 static ngx_int_t
2268 33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	1908 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	1909 {
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	1910 ngx_uint_t status;
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	1911 ngx_http_upstream_next_t *un;
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	1912
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	1913 status = u->headers_in.status_n;
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	1914
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	1915 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	1916
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	1917 if (status != un->status) {
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	1918 continue;
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	1919 }
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	1920
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	1921 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	1922 ngx_http_upstream_next(r, u, un->mask);
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	1923 return NGX_OK;
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	1924 }
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	1925
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	1926 #if (NGX_HTTP_CACHE)
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	1927
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	1928 if (u->cache_status == NGX_HTTP_CACHE_EXPIRED
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	1929 && (u->conf->cache_use_stale & un->mask))
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	1930 {
2824 d106509491b5 fix building --without-http-cache Igor Sysoev <igor@sysoev.ru> parents: 2807 diff changeset	1931 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	1932
60551422e150 reinit proxy/fastcgi header parser before ngx_http_upstream_cache_send() Igor Sysoev <igor@sysoev.ru> parents: 2804 diff changeset	1933 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	1934
60551422e150 reinit proxy/fastcgi header parser before ngx_http_upstream_cache_send() Igor Sysoev <igor@sysoev.ru> parents: 2804 diff changeset	1935 if (rc == NGX_OK) {
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	1936 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	1937 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	1938 }
60551422e150 reinit proxy/fastcgi header parser before ngx_http_upstream_cache_send() Igor Sysoev <igor@sysoev.ru> parents: 2804 diff changeset	1939
60551422e150 reinit proxy/fastcgi header parser before ngx_http_upstream_cache_send() Igor Sysoev <igor@sysoev.ru> parents: 2804 diff changeset	1940 ngx_http_upstream_finalize_request(r, u, rc);
2268 33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	1941 return NGX_OK;
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	1942 }
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	1943
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	1944 #endif
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	1945 }
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	1946
5441 43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	1947 #if (NGX_HTTP_CACHE)
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	1948
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	1949 if (status == NGX_HTTP_NOT_MODIFIED
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	1950 && u->cache_status == NGX_HTTP_CACHE_EXPIRED
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	1951 && u->conf->cache_revalidate)
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	1952 {
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	1953 time_t now, valid;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	1954 ngx_int_t rc;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	1955
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	1956 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	1957 "http upstream not modified");
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	1958
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	1959 now = ngx_time();
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	1960 valid = r->cache->valid_sec;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	1961
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	1962 rc = u->reinit_request(r);
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	1963
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	1964 if (rc != NGX_OK) {
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	1965 ngx_http_upstream_finalize_request(r, u, rc);
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	1966 return NGX_OK;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	1967 }
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	1968
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	1969 u->cache_status = NGX_HTTP_CACHE_REVALIDATED;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	1970 rc = ngx_http_upstream_cache_send(r, u);
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	1971
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	1972 if (valid == 0) {
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	1973 valid = r->cache->valid_sec;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	1974 }
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	1975
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	1976 if (valid == 0) {
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	1977 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	1978 u->headers_in.status_n);
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	1979 if (valid) {
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	1980 valid = now + valid;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	1981 }
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	1982 }
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	1983
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	1984 if (valid) {
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	1985 r->cache->valid_sec = valid;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	1986 r->cache->date = now;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	1987
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	1988 ngx_http_file_cache_update_header(r);
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	1989 }
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	1990
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	1991 ngx_http_upstream_finalize_request(r, u, rc);
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	1992 return NGX_OK;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	1993 }
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	1994
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	1995 #endif
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	1996
2268 33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	1997 return NGX_DECLINED;
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	1998 }
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	1999
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2000
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2001 static ngx_int_t
2267 920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2002 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	2003 ngx_http_upstream_t *u)
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2004 {
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2005 ngx_int_t status;
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2006 ngx_uint_t i;
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2007 ngx_table_elt_t *h;
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2008 ngx_http_err_page_t *err_page;
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2009 ngx_http_core_loc_conf_t *clcf;
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2010
2441 0c117a89f399 in miss case memcached module returned END instead of default 404 page body Igor Sysoev <igor@sysoev.ru> parents: 2422 diff changeset	2011 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	2012
0c117a89f399 in miss case memcached module returned END instead of default 404 page body Igor Sysoev <igor@sysoev.ru> parents: 2422 diff changeset	2013 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	2014 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	2015 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	2016 }
0c117a89f399 in miss case memcached module returned END instead of default 404 page body Igor Sysoev <igor@sysoev.ru> parents: 2422 diff changeset	2017
2267 920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2018 if (!u->conf->intercept_errors) {
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2019 return NGX_DECLINED;
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2020 }
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2021
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2022 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	2023
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2024 if (clcf->error_pages == NULL) {
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2025 return NGX_DECLINED;
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2026 }
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2027
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2028 err_page = clcf->error_pages->elts;
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2029 for (i = 0; i < clcf->error_pages->nelts; i++) {
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2030
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2031 if (err_page[i].status == status) {
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2032
2953 aa12525236da fix segfault if there is error_page 401, proxy_intercept_errors is on Igor Sysoev <igor@sysoev.ru> parents: 2952 diff changeset	2033 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	2034 && 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	2035 {
2267 920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2036 h = ngx_list_push(&r->headers_out.headers);
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2037
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2038 if (h == NULL) {
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2039 ngx_http_upstream_finalize_request(r, u,
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2040 NGX_HTTP_INTERNAL_SERVER_ERROR);
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2041 return NGX_OK;
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2042 }
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2043
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2044 h = u->headers_in.www_authenticate;
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2045
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2046 r->headers_out.www_authenticate = h;
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2047 }
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2048
3706 ea908f6ae499 an intercepted error code was not cached Igor Sysoev <igor@sysoev.ru> parents: 3705 diff changeset	2049 #if (NGX_HTTP_CACHE)
ea908f6ae499 an intercepted error code was not cached Igor Sysoev <igor@sysoev.ru> parents: 3705 diff changeset	2050
3709 64777690c697 fix r3707: cache node should be freed be a response is not cached Igor Sysoev <igor@sysoev.ru> parents: 3708 diff changeset	2051 if (r->cache) {
3706 ea908f6ae499 an intercepted error code was not cached Igor Sysoev <igor@sysoev.ru> parents: 3705 diff changeset	2052 time_t valid;
ea908f6ae499 an intercepted error code was not cached Igor Sysoev <igor@sysoev.ru> parents: 3705 diff changeset	2053
ea908f6ae499 an intercepted error code was not cached Igor Sysoev <igor@sysoev.ru> parents: 3705 diff changeset	2054 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	2055
ea908f6ae499 an intercepted error code was not cached Igor Sysoev <igor@sysoev.ru> parents: 3705 diff changeset	2056 if (valid) {
ea908f6ae499 an intercepted error code was not cached Igor Sysoev <igor@sysoev.ru> parents: 3705 diff changeset	2057 r->cache->valid_sec = ngx_time() + valid;
ea908f6ae499 an intercepted error code was not cached Igor Sysoev <igor@sysoev.ru> parents: 3705 diff changeset	2058 r->cache->error = status;
ea908f6ae499 an intercepted error code was not cached Igor Sysoev <igor@sysoev.ru> parents: 3705 diff changeset	2059 }
ea908f6ae499 an intercepted error code was not cached Igor Sysoev <igor@sysoev.ru> parents: 3705 diff changeset	2060
3711 ce6ba077c270 several changes in cache cleanup handling: Igor Sysoev <igor@sysoev.ru> parents: 3709 diff changeset	2061 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	2062 }
ea908f6ae499 an intercepted error code was not cached Igor Sysoev <igor@sysoev.ru> parents: 3705 diff changeset	2063 #endif
2267 920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2064 ngx_http_upstream_finalize_request(r, u, status);
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2065
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2066 return NGX_OK;
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2067 }
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2068 }
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2069
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2070 return NGX_DECLINED;
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2071 }
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2072
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2073
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2074 static ngx_int_t
1153 c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2075 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	2076 {
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2077 int err;
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2078 socklen_t len;
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2079
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2080 #if (NGX_HAVE_KQUEUE)
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2081
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2082 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	2083 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	2084 if (c->write->pending_eof) {
e62219793beb Upstream: better detection of connect() failures with kqueue. Maxim Dounin <mdounin@mdounin.ru> parents: 4895 diff changeset	2085 err = c->write->kq_errno;
e62219793beb Upstream: better detection of connect() failures with kqueue. Maxim Dounin <mdounin@mdounin.ru> parents: 4895 diff changeset	2086
e62219793beb Upstream: better detection of connect() failures with kqueue. Maxim Dounin <mdounin@mdounin.ru> parents: 4895 diff changeset	2087 } else {
e62219793beb Upstream: better detection of connect() failures with kqueue. Maxim Dounin <mdounin@mdounin.ru> parents: 4895 diff changeset	2088 err = c->read->kq_errno;
e62219793beb Upstream: better detection of connect() failures with kqueue. Maxim Dounin <mdounin@mdounin.ru> parents: 4895 diff changeset	2089 }
e62219793beb Upstream: better detection of connect() failures with kqueue. Maxim Dounin <mdounin@mdounin.ru> parents: 4895 diff changeset	2090
1469 0a269c464eaf connection error should be logged with "connecting to upstream" action, Igor Sysoev <igor@sysoev.ru> parents: 1468 diff changeset	2091 c->log->action = "connecting to upstream";
4916 79c8e87b1fcb Trailing whitespace fix. Maxim Dounin <mdounin@mdounin.ru> parents: 4915 diff changeset	2092 (void) ngx_connection_error(c, err,
1166 bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2093 "kevent() reported that connect() failed");
bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2094 return NGX_ERROR;
bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2095 }
1153 c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2096
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2097 } else
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2098 #endif
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2099 {
1166 bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2100 err = 0;
bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2101 len = sizeof(int);
bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2102
bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2103 /*
bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2104 * 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	2105 * Solaris returns -1 and sets errno
bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2106 */
bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2107
bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2108 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	2109 == -1)
bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2110 {
5557 188481078faf Use ngx_socket_errno where appropriate. Piotr Sikora <piotr@cloudflare.com> parents: 5546 diff changeset	2111 err = ngx_socket_errno;
1166 bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2112 }
bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2113
bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2114 if (err) {
1469 0a269c464eaf connection error should be logged with "connecting to upstream" action, Igor Sysoev <igor@sysoev.ru> parents: 1468 diff changeset	2115 c->log->action = "connecting to upstream";
1166 bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2116 (void) ngx_connection_error(c, err, "connect() failed");
bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2117 return NGX_ERROR;
bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2118 }
1153 c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2119 }
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2120
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2121 return NGX_OK;
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2122 }
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2123
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2124
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2125 static ngx_int_t
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2126 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	2127 {
5489 6d357b2a9d6e Upstream: keep $upstream_http_x_accel_redirect intact. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	2128 ngx_str_t uri, args;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2129 ngx_uint_t i, flags;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2130 ngx_list_part_t *part;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2131 ngx_table_elt_t *h;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2132 ngx_http_upstream_header_t *hh;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2133 ngx_http_upstream_main_conf_t *umcf;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2134
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2135 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	2136
2786 4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	2137 if (u->headers_in.x_accel_redirect
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	2138 && !(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	2139 {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2140 ngx_http_upstream_finalize_request(r, u, NGX_DECLINED);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2141
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2142 part = &u->headers_in.headers.part;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2143 h = part->elts;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2144
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2145 for (i = 0; /* void */; i++) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2146
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2147 if (i >= part->nelts) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2148 if (part->next == NULL) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2149 break;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2150 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2151
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2152 part = part->next;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2153 h = part->elts;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2154 i = 0;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2155 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2156
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2157 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	2158 h[i].lowcase_key, h[i].key.len);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2159
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2160 if (hh && hh->redirect) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2161 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	2162 ngx_http_finalize_request(r,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2163 NGX_HTTP_INTERNAL_SERVER_ERROR);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2164 return NGX_DONE;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2165 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2166 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2167 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2168
5489 6d357b2a9d6e Upstream: keep $upstream_http_x_accel_redirect intact. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	2169 uri = u->headers_in.x_accel_redirect->value;
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3515 diff changeset	2170 ngx_str_null(&args);
3161 d430c6ab1c99 check unsafe Destination Igor Sysoev <igor@sysoev.ru> parents: 3120 diff changeset	2171 flags = NGX_HTTP_LOG_UNSAFE;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2172
5489 6d357b2a9d6e Upstream: keep $upstream_http_x_accel_redirect intact. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	2173 if (ngx_http_parse_unsafe_uri(r, &uri, &args, &flags) != NGX_OK) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2174 ngx_http_finalize_request(r, NGX_HTTP_NOT_FOUND);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2175 return NGX_DONE;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2176 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2177
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2178 if (r->method != NGX_HTTP_HEAD) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2179 r->method = NGX_HTTP_GET;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2180 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2181
5489 6d357b2a9d6e Upstream: keep $upstream_http_x_accel_redirect intact. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	2182 ngx_http_internal_redirect(r, &uri, &args);
3120 40b8b398dbbc fix request counter for X-Accel-Redirect, the bug was introduced in r3050 Igor Sysoev <igor@sysoev.ru> parents: 3112 diff changeset	2183 ngx_http_finalize_request(r, NGX_DONE);
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2184 return NGX_DONE;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2185 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2186
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2187 part = &u->headers_in.headers.part;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2188 h = part->elts;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2189
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2190 for (i = 0; /* void */; i++) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2191
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2192 if (i >= part->nelts) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2193 if (part->next == NULL) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2194 break;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2195 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2196
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2197 part = part->next;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2198 h = part->elts;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2199 i = 0;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2200 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2201
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2202 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	2203 h[i].lowcase_key, h[i].key.len))
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2204 {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2205 continue;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2206 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2207
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2208 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	2209 h[i].lowcase_key, h[i].key.len);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2210
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2211 if (hh) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2212 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	2213 ngx_http_upstream_finalize_request(r, u,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2214 NGX_HTTP_INTERNAL_SERVER_ERROR);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2215 return NGX_DONE;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2216 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2217
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2218 continue;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2219 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2220
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2221 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	2222 ngx_http_upstream_finalize_request(r, u,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2223 NGX_HTTP_INTERNAL_SERVER_ERROR);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2224 return NGX_DONE;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2225 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2226 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2227
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2228 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	2229 r->headers_out.server->hash = 0;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2230 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2231
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2232 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	2233 r->headers_out.date->hash = 0;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2234 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2235
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2236 r->headers_out.status = u->headers_in.status_n;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2237 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	2238
4117 103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	2239 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	2240
5300 f538a67c9f77 Upstream: u->length now defaults to -1 (API change). Maxim Dounin <mdounin@mdounin.ru> parents: 5299 diff changeset	2241 u->length = -1;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2242
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2243 return NGX_OK;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2244 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2245
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2246
777 4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2247 static void
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2248 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	2249 ngx_http_upstream_t *u)
777 4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2250 {
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2251 size_t size;
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2252 ssize_t n;
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2253 ngx_buf_t *b;
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2254 ngx_event_t *rev;
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2255 ngx_connection_t *c;
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2256
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2257 c = u->peer.connection;
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2258 rev = c->read;
777 4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2259
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2260 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2261 "http upstream process body on memory");
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2262
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2263 if (rev->timedout) {
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2264 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	2265 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	2266 return;
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2267 }
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2268
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2269 b = &u->buffer;
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2270
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2271 for ( ;; ) {
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2272
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2273 size = b->end - b->last;
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2274
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2275 if (size == 0) {
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2276 ngx_log_error(NGX_LOG_ALERT, c->log, 0,
3708 c1385a3b8093 fix typo Igor Sysoev <igor@sysoev.ru> parents: 3706 diff changeset	2277 "upstream buffer is too small to read response");
777 4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2278 ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2279 return;
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2280 }
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2281
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2282 n = c->recv(c, b->last, size);
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2283
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2284 if (n == NGX_AGAIN) {
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2285 break;
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2286 }
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2287
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2288 if (n == 0 \|\| n == NGX_ERROR) {
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2289 ngx_http_upstream_finalize_request(r, u, n);
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2290 return;
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2291 }
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2292
2402 cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	2293 u->state->response_length += n;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	2294
777 4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2295 if (u->input_filter(u->input_filter_ctx, n) == NGX_ERROR) {
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2296 ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2297 return;
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2298 }
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2299
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2300 if (!rev->ready) {
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2301 break;
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2302 }
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2303 }
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2304
4120 42135dd1f0ea Upstream: keepalive flag. Maxim Dounin <mdounin@mdounin.ru> parents: 4119 diff changeset	2305 if (u->length == 0) {
42135dd1f0ea Upstream: keepalive flag. Maxim Dounin <mdounin@mdounin.ru> parents: 4119 diff changeset	2306 ngx_http_upstream_finalize_request(r, u, 0);
42135dd1f0ea Upstream: keepalive flag. Maxim Dounin <mdounin@mdounin.ru> parents: 4119 diff changeset	2307 return;
42135dd1f0ea Upstream: keepalive flag. Maxim Dounin <mdounin@mdounin.ru> parents: 4119 diff changeset	2308 }
42135dd1f0ea Upstream: keepalive flag. Maxim Dounin <mdounin@mdounin.ru> parents: 4119 diff changeset	2309
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2310 if (ngx_handle_read_event(rev, 0) != NGX_OK) {
777 4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2311 ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2312 return;
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2313 }
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2314
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2315 if (rev->active) {
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2316 ngx_add_timer(rev, u->conf->read_timeout);
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2317
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2318 } else if (rev->timer_set) {
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2319 ngx_del_timer(rev);
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2320 }
681 7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 675 diff changeset	2321 }
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 675 diff changeset	2322
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 675 diff changeset	2323
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 675 diff changeset	2324 static void
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 675 diff changeset	2325 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	2326 {
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 675 diff changeset	2327 int tcp_nodelay;
2402 cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	2328 ssize_t n;
681 7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 675 diff changeset	2329 ngx_int_t rc;
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 675 diff changeset	2330 ngx_event_pipe_t *p;
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 675 diff changeset	2331 ngx_connection_t *c;
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 675 diff changeset	2332 ngx_http_core_loc_conf_t *clcf;
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 675 diff changeset	2333
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2334 rc = ngx_http_send_header(r);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2335
2701 756f73ca1e39 support HEAD in proxy cache Igor Sysoev <igor@sysoev.ru> parents: 2692 diff changeset	2336 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	2337 ngx_http_upstream_finalize_request(r, u, rc);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2338 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2339 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2340
5353 1608b1135a1d Upstream: setting u->header_sent before ngx_http_upstream_upgrade(). Maxim Dounin <mdounin@mdounin.ru> parents: 5340 diff changeset	2341 u->header_sent = 1;
1608b1135a1d Upstream: setting u->header_sent before ngx_http_upstream_upgrade(). Maxim Dounin <mdounin@mdounin.ru> parents: 5340 diff changeset	2342
5072 7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2343 if (u->upgrade) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2344 ngx_http_upstream_upgrade(r, u);
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2345 return;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2346 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2347
2704 ac1e2e199c9f shutdown client connection for cacheable header only responses Igor Sysoev <igor@sysoev.ru> parents: 2703 diff changeset	2348 c = r->connection;
ac1e2e199c9f shutdown client connection for cacheable header only responses Igor Sysoev <igor@sysoev.ru> parents: 2703 diff changeset	2349
2701 756f73ca1e39 support HEAD in proxy cache Igor Sysoev <igor@sysoev.ru> parents: 2692 diff changeset	2350 if (r->header_only) {
2704 ac1e2e199c9f shutdown client connection for cacheable header only responses Igor Sysoev <igor@sysoev.ru> parents: 2703 diff changeset	2351
2701 756f73ca1e39 support HEAD in proxy cache Igor Sysoev <igor@sysoev.ru> parents: 2692 diff changeset	2352 if (u->cacheable \|\| u->store) {
2704 ac1e2e199c9f shutdown client connection for cacheable header only responses Igor Sysoev <igor@sysoev.ru> parents: 2703 diff changeset	2353
ac1e2e199c9f shutdown client connection for cacheable header only responses Igor Sysoev <igor@sysoev.ru> parents: 2703 diff changeset	2354 if (ngx_shutdown_socket(c->fd, NGX_WRITE_SHUTDOWN) == -1) {
ac1e2e199c9f shutdown client connection for cacheable header only responses Igor Sysoev <igor@sysoev.ru> parents: 2703 diff changeset	2355 ngx_connection_error(c, ngx_socket_errno,
ac1e2e199c9f shutdown client connection for cacheable header only responses Igor Sysoev <igor@sysoev.ru> parents: 2703 diff changeset	2356 ngx_shutdown_socket_n " failed");
ac1e2e199c9f shutdown client connection for cacheable header only responses Igor Sysoev <igor@sysoev.ru> parents: 2703 diff changeset	2357 }
ac1e2e199c9f shutdown client connection for cacheable header only responses Igor Sysoev <igor@sysoev.ru> parents: 2703 diff changeset	2358
2701 756f73ca1e39 support HEAD in proxy cache Igor Sysoev <igor@sysoev.ru> parents: 2692 diff changeset	2359 r->read_event_handler = ngx_http_request_empty_handler;
756f73ca1e39 support HEAD in proxy cache Igor Sysoev <igor@sysoev.ru> parents: 2692 diff changeset	2360 r->write_event_handler = ngx_http_request_empty_handler;
2704 ac1e2e199c9f shutdown client connection for cacheable header only responses Igor Sysoev <igor@sysoev.ru> parents: 2703 diff changeset	2361 c->error = 1;
2701 756f73ca1e39 support HEAD in proxy cache Igor Sysoev <igor@sysoev.ru> parents: 2692 diff changeset	2362
756f73ca1e39 support HEAD in proxy cache Igor Sysoev <igor@sysoev.ru> parents: 2692 diff changeset	2363 } else {
756f73ca1e39 support HEAD in proxy cache Igor Sysoev <igor@sysoev.ru> parents: 2692 diff changeset	2364 ngx_http_upstream_finalize_request(r, u, rc);
756f73ca1e39 support HEAD in proxy cache Igor Sysoev <igor@sysoev.ru> parents: 2692 diff changeset	2365 return;
756f73ca1e39 support HEAD in proxy cache Igor Sysoev <igor@sysoev.ru> parents: 2692 diff changeset	2366 }
756f73ca1e39 support HEAD in proxy cache Igor Sysoev <igor@sysoev.ru> parents: 2692 diff changeset	2367 }
756f73ca1e39 support HEAD in proxy cache Igor Sysoev <igor@sysoev.ru> parents: 2692 diff changeset	2368
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	2369 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	2370 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	2371 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	2372 }
9c2f3ed7a247 nginx-0.3.3-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	2373
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2374 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	2375
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	2376 if (!u->buffering) {
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2377
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2378 if (u->input_filter == NULL) {
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2379 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	2380 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	2381 u->input_filter_ctx = r;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2382 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2383
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	2384 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	2385 r->write_event_handler =
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2386 ngx_http_upstream_process_non_buffered_downstream;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2387
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2388 r->limit_rate = 0;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2389
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2390 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	2391 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	2392 return;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2393 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2394
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	2395 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	2396 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	2397
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	2398 tcp_nodelay = 1;
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	2399
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	2400 if (setsockopt(c->fd, IPPROTO_TCP, TCP_NODELAY,
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	2401 (const void *) &tcp_nodelay, sizeof(int)) == -1)
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	2402 {
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	2403 ngx_connection_error(c, ngx_socket_errno,
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	2404 "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	2405 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	2406 return;
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	2407 }
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	2408
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	2409 c->tcp_nodelay = NGX_TCP_NODELAY_SET;
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	2410 }
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	2411
2402 cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	2412 n = u->buffer.last - u->buffer.pos;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	2413
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	2414 if (n) {
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2415 u->buffer.last = u->buffer.pos;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2416
2402 cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	2417 u->state->response_length += n;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	2418
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	2419 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	2420 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	2421 return;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2422 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2423
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	2424 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	2425
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2426 } else {
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2427 u->buffer.pos = u->buffer.start;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2428 u->buffer.last = u->buffer.start;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2429
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2430 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	2431 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	2432 return;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2433 }
1468 491e5059ea19 read EOF of header only responses in non-buffered proxying Igor Sysoev <igor@sysoev.ru> parents: 1397 diff changeset	2434
4120 42135dd1f0ea Upstream: keepalive flag. Maxim Dounin <mdounin@mdounin.ru> parents: 4119 diff changeset	2435 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	2436 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	2437 }
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2438 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2439
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2440 return;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2441 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2442
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2443 /* TODO: preallocate event_pipe bufs, look "Content-Length" */
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2444
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2445 #if (NGX_HTTP_CACHE)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2446
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2447 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	2448 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	2449 r->cache->file.fd = NGX_INVALID_FILE;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2450 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2451
3699 b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	2452 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	2453
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	2454 case NGX_ERROR:
5295 a489c31c9783 Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5294 diff changeset	2455 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	2456 return;
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	2457
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	2458 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	2459 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	2460 break;
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	2461
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	2462 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	2463
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	2464 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	2465
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	2466 r->cache->min_uses = u->conf->cache_min_uses;
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	2467 r->cache->body_start = u->conf->buffer_size;
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	2468 r->cache->file_cache = u->conf->cache->data;
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	2469
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	2470 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	2471 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	2472 return;
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	2473 }
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	2474 }
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	2475
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	2476 break;
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	2477 }
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	2478
1565 4c43e25d11ea fix English grammar Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	2479 if (u->cacheable) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2480 time_t now, valid;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2481
2663 09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	2482 now = ngx_time();
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	2483
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	2484 valid = r->cache->valid_sec;
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	2485
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	2486 if (valid == 0) {
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	2487 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	2488 u->headers_in.status_n);
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	2489 if (valid) {
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	2490 r->cache->valid_sec = now + valid;
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	2491 }
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	2492 }
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	2493
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2494 if (valid) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2495 r->cache->last_modified = r->headers_out.last_modified_time;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2496 r->cache->date = now;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2497 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	2498
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2499 ngx_http_file_cache_set_header(r, u->buffer.start);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2500
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2501 } else {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2502 u->cacheable = 0;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2503 }
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2504 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2505
2690 d3cffe32b930 add debug logging Igor Sysoev <igor@sysoev.ru> parents: 2669 diff changeset	2506 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
d3cffe32b930 add debug logging Igor Sysoev <igor@sysoev.ru> parents: 2669 diff changeset	2507 "http cacheable: %d", u->cacheable);
d3cffe32b930 add debug logging Igor Sysoev <igor@sysoev.ru> parents: 2669 diff changeset	2508
3083 ffe8bfb38184 clean cache updating state if a response has uncacheable code or Igor Sysoev <igor@sysoev.ru> parents: 3056 diff changeset	2509 if (u->cacheable == 0 && r->cache) {
3711 ce6ba077c270 several changes in cache cleanup handling: Igor Sysoev <igor@sysoev.ru> parents: 3709 diff changeset	2510 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	2511 }
ffe8bfb38184 clean cache updating state if a response has uncacheable code or Igor Sysoev <igor@sysoev.ru> parents: 3056 diff changeset	2512
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2513 #endif
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2514
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2515 p = u->pipe;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2516
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2517 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	2518 p->output_ctx = r;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2519 p->tag = u->output.tag;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2520 p->bufs = u->conf->bufs;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2521 p->busy_size = u->conf->busy_buffers_size;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2522 p->upstream = u->peer.connection;
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	2523 p->downstream = c;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2524 p->pool = r->pool;
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	2525 p->log = c->log;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2526
1565 4c43e25d11ea fix English grammar Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	2527 p->cacheable = u->cacheable \|\| u->store;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2528
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 487 diff changeset	2529 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	2530 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	2531 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	2532 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2533 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2534
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2535 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	2536 p->temp_file->file.log = c->log;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2537 p->temp_file->path = u->conf->temp_path;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2538 p->temp_file->pool = r->pool;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2539
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2540 if (p->cacheable) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2541 p->temp_file->persistent = 1;
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	2542
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2543 } else {
667 63a820b0bc6c nginx-0.3.55-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 665 diff changeset	2544 p->temp_file->log_level = NGX_LOG_WARN;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2545 p->temp_file->warn = "an upstream response is buffered "
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2546 "to a temporary file";
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2547 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2548
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2549 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	2550 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	2551
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 487 diff changeset	2552 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	2553 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	2554 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	2555 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2556 }
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	2557
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2558 p->preread_bufs->buf = &u->buffer;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2559 p->preread_bufs->next = NULL;
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2560 u->buffer.recycled = 1;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2561
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2562 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	2563
1565 4c43e25d11ea fix English grammar Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	2564 if (u->cacheable) {
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	2565
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2566 p->buf_to_file = ngx_calloc_buf(r->pool);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2567 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	2568 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	2569 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2570 }
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	2571
4895 508e61393b6c Event pipe: fixed handling of buf_to_file data. Maxim Dounin <mdounin@mdounin.ru> parents: 4769 diff changeset	2572 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	2573 p->buf_to_file->pos = u->buffer.start;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2574 p->buf_to_file->last = u->buffer.pos;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2575 p->buf_to_file->temporary = 1;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2576 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2577
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2578 if (ngx_event_flags & NGX_USE_AIO_EVENT) {
4499 778ef9c3fd2d Fixed spelling in single-line comments. Ruslan Ermilov <ru@nginx.com> parents: 4474 diff changeset	2579 /* 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	2580 p->single_buf = 1;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2581 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2582
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2583 /* 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	2584 p->free_bufs = 1;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2585
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2586 /*
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2587 * 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	2588 * as though these bytes were read
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2589 */
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2590 u->buffer.last = u->buffer.pos;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2591
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2592 if (u->conf->cyclic_temp_file) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2593
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2594 /*
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2595 * 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	2596 * 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	2597 * 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	2598 */
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2599
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2600 p->cyclic_temp_file = 1;
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	2601 c->sendfile = 0;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2602
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2603 } else {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2604 p->cyclic_temp_file = 0;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2605 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2606
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2607 p->read_timeout = u->conf->read_timeout;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2608 p->send_timeout = clcf->send_timeout;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2609 p->send_lowat = clcf->send_lowat;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2610
4119 b66712cde67d Upstream: pipe length and input_filter_init in buffered mode. Maxim Dounin <mdounin@mdounin.ru> parents: 4118 diff changeset	2611 p->length = -1;
b66712cde67d Upstream: pipe length and input_filter_init in buffered mode. Maxim Dounin <mdounin@mdounin.ru> parents: 4118 diff changeset	2612
b66712cde67d Upstream: pipe length and input_filter_init in buffered mode. Maxim Dounin <mdounin@mdounin.ru> parents: 4118 diff changeset	2613 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	2614 && 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	2615 {
5295 a489c31c9783 Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5294 diff changeset	2616 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	2617 return;
b66712cde67d Upstream: pipe length and input_filter_init in buffered mode. Maxim Dounin <mdounin@mdounin.ru> parents: 4118 diff changeset	2618 }
b66712cde67d Upstream: pipe length and input_filter_init in buffered mode. Maxim Dounin <mdounin@mdounin.ru> parents: 4118 diff changeset	2619
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	2620 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	2621 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	2622
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2623 ngx_http_upstream_process_upstream(r, u);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2624 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2625
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2626
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	2627 static void
5072 7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2628 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	2629 {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2630 int tcp_nodelay;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2631 ngx_connection_t *c;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2632 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	2633
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2634 c = r->connection;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2635 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	2636
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2637 /* 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	2638
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2639 r->keepalive = 0;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2640 c->log->action = "proxying upgraded connection";
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2641
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2642 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	2643 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	2644 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	2645 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	2646
5142 afea5259e05c Upstream: fixed tcp_nodelay with connection upgrade (ticket #325). Maxim Dounin <mdounin@mdounin.ru> parents: 5132 diff changeset	2647 if (clcf->tcp_nodelay) {
5072 7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2648 tcp_nodelay = 1;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2649
5142 afea5259e05c Upstream: fixed tcp_nodelay with connection upgrade (ticket #325). Maxim Dounin <mdounin@mdounin.ru> parents: 5132 diff changeset	2650 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	2651 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	2652
afea5259e05c Upstream: fixed tcp_nodelay with connection upgrade (ticket #325). Maxim Dounin <mdounin@mdounin.ru> parents: 5132 diff changeset	2653 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	2654 (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	2655 {
afea5259e05c Upstream: fixed tcp_nodelay with connection upgrade (ticket #325). Maxim Dounin <mdounin@mdounin.ru> parents: 5132 diff changeset	2656 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	2657 "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	2658 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	2659 return;
afea5259e05c Upstream: fixed tcp_nodelay with connection upgrade (ticket #325). Maxim Dounin <mdounin@mdounin.ru> parents: 5132 diff changeset	2660 }
afea5259e05c Upstream: fixed tcp_nodelay with connection upgrade (ticket #325). Maxim Dounin <mdounin@mdounin.ru> parents: 5132 diff changeset	2661
afea5259e05c Upstream: fixed tcp_nodelay with connection upgrade (ticket #325). Maxim Dounin <mdounin@mdounin.ru> parents: 5132 diff changeset	2662 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	2663 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2664
5142 afea5259e05c Upstream: fixed tcp_nodelay with connection upgrade (ticket #325). Maxim Dounin <mdounin@mdounin.ru> parents: 5132 diff changeset	2665 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	2666 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	2667 "tcp_nodelay");
afea5259e05c Upstream: fixed tcp_nodelay with connection upgrade (ticket #325). Maxim Dounin <mdounin@mdounin.ru> parents: 5132 diff changeset	2668
afea5259e05c Upstream: fixed tcp_nodelay with connection upgrade (ticket #325). Maxim Dounin <mdounin@mdounin.ru> parents: 5132 diff changeset	2669 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	2670 (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	2671 {
afea5259e05c Upstream: fixed tcp_nodelay with connection upgrade (ticket #325). Maxim Dounin <mdounin@mdounin.ru> parents: 5132 diff changeset	2672 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	2673 "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	2674 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	2675 return;
afea5259e05c Upstream: fixed tcp_nodelay with connection upgrade (ticket #325). Maxim Dounin <mdounin@mdounin.ru> parents: 5132 diff changeset	2676 }
afea5259e05c Upstream: fixed tcp_nodelay with connection upgrade (ticket #325). Maxim Dounin <mdounin@mdounin.ru> parents: 5132 diff changeset	2677
afea5259e05c Upstream: fixed tcp_nodelay with connection upgrade (ticket #325). Maxim Dounin <mdounin@mdounin.ru> parents: 5132 diff changeset	2678 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	2679 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2680 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2681
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2682 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	2683 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	2684 return;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2685 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2686
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2687 if (u->peer.connection->read->ready
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2688 \|\| u->buffer.pos != u->buffer.last)
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2689 {
5579 7586e7b2dbe9 Upstream: ngx_post_event() instead of upgraded call (ticket #503). Maxim Dounin <mdounin@mdounin.ru> parents: 5557 diff changeset	2690 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	2691 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	2692 return;
5072 7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2693 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2694
5532 17134d29782e Upstream: reading from a client after connection upgrade. Maxim Dounin <mdounin@mdounin.ru> parents: 5500 diff changeset	2695 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	2696 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2697
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2698
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2699 static void
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2700 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	2701 {
5073 52eb762c68a9 Proxy: fixed do_write handling in previous commit. Maxim Dounin <mdounin@mdounin.ru> parents: 5072 diff changeset	2702 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	2703 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2704
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2705
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2706 static void
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2707 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	2708 {
5073 52eb762c68a9 Proxy: fixed do_write handling in previous commit. Maxim Dounin <mdounin@mdounin.ru> parents: 5072 diff changeset	2709 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	2710 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2711
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2712
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2713 static void
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2714 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	2715 ngx_http_upstream_t *u)
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2716 {
5073 52eb762c68a9 Proxy: fixed do_write handling in previous commit. Maxim Dounin <mdounin@mdounin.ru> parents: 5072 diff changeset	2717 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	2718 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2719
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2720
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2721 static void
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2722 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	2723 ngx_http_upstream_t *u)
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2724 {
5073 52eb762c68a9 Proxy: fixed do_write handling in previous commit. Maxim Dounin <mdounin@mdounin.ru> parents: 5072 diff changeset	2725 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	2726 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2727
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2728
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2729 static void
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2730 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	2731 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	2732 {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2733 size_t size;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2734 ssize_t n;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2735 ngx_buf_t *b;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2736 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	2737 ngx_http_upstream_t *u;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2738 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	2739
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2740 c = r->connection;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2741 u = r->upstream;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2742
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2743 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	2744 "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	2745
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2746 downstream = c;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2747 upstream = u->peer.connection;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2748
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2749 if (downstream->write->timedout) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2750 c->timedout = 1;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2751 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	2752 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	2753 return;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2754 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2755
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2756 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	2757 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	2758 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	2759 return;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2760 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2761
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2762 if (from_upstream) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2763 src = upstream;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2764 dst = downstream;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2765 b = &u->buffer;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2766
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2767 } else {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2768 src = downstream;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2769 dst = upstream;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2770 b = &u->from_client;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2771
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2772 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	2773 b = r->header_in;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2774 b->end = b->last;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2775 do_write = 1;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2776 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2777
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2778 if (b->start == NULL) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2779 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	2780 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	2781 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	2782 return;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2783 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2784
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2785 b->pos = b->start;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2786 b->last = b->start;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2787 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	2788 b->temporary = 1;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2789 b->tag = u->output.tag;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2790 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2791 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2792
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2793 for ( ;; ) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2794
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2795 if (do_write) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2796
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2797 size = b->last - b->pos;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2798
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2799 if (size && dst->write->ready) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2800
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2801 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	2802
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2803 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	2804 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	2805 return;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2806 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2807
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2808 if (n > 0) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2809 b->pos += n;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2810
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2811 if (b->pos == b->last) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2812 b->pos = b->start;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2813 b->last = b->start;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2814 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2815 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2816 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2817 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2818
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2819 size = b->end - b->last;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2820
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2821 if (size && src->read->ready) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2822
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2823 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	2824
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2825 if (n == NGX_AGAIN \|\| n == 0) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2826 break;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2827 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2828
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2829 if (n > 0) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2830 do_write = 1;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2831 b->last += n;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2832
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2833 continue;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2834 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2835
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2836 if (n == NGX_ERROR) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2837 src->read->eof = 1;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2838 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2839 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2840
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2841 break;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2842 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2843
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2844 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	2845 \|\| (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	2846 \|\| (downstream->read->eof && upstream->read->eof))
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2847 {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2848 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	2849 "http upstream upgraded done");
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2850 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	2851 return;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2852 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2853
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2854 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	2855
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2856 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	2857 != NGX_OK)
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2858 {
5295 a489c31c9783 Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5294 diff changeset	2859 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	2860 return;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2861 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2862
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2863 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	2864 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	2865
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2866 } else if (upstream->write->timer_set) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2867 ngx_del_timer(upstream->write);
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2868 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2869
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2870 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	2871 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	2872 return;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2873 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2874
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2875 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	2876 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	2877
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2878 } else if (upstream->read->timer_set) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2879 ngx_del_timer(upstream->read);
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2880 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2881
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2882 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	2883 != NGX_OK)
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2884 {
5295 a489c31c9783 Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5294 diff changeset	2885 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	2886 return;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2887 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2888
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2889 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	2890 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	2891 return;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2892 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2893
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2894 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	2895 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	2896
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2897 } else if (downstream->write->timer_set) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2898 ngx_del_timer(downstream->write);
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2899 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2900 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2901
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2902
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2903 static void
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2904 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	2905 {
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	2906 ngx_event_t *wev;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	2907 ngx_connection_t *c;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	2908 ngx_http_upstream_t *u;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	2909
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	2910 c = r->connection;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	2911 u = r->upstream;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	2912 wev = c->write;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	2913
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	2914 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	2915 "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	2916
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	2917 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	2918
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	2919 if (wev->timedout) {
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	2920 c->timedout = 1;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	2921 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	2922 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	2923 return;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	2924 }
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	2925
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	2926 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	2927 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2928
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2929
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2930 static void
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2931 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	2932 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	2933 {
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2934 ngx_connection_t *c;
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2935
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2936 c = u->peer.connection;
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	2937
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	2938 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	2939 "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	2940
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	2941 c->log->action = "reading upstream";
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	2942
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2943 if (c->read->timedout) {
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	2944 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	2945 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	2946 return;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	2947 }
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	2948
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	2949 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	2950 }
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	2951
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	2952
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	2953 static void
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	2954 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	2955 ngx_uint_t do_write)
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2956 {
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2957 size_t size;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2958 ssize_t n;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2959 ngx_buf_t *b;
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	2960 ngx_int_t rc;
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	2961 ngx_connection_t downstream, upstream;
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2962 ngx_http_upstream_t *u;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2963 ngx_http_core_loc_conf_t *clcf;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2964
756 d904b5cb3bba fix building introduced by previous commit Igor Sysoev <igor@sysoev.ru> parents: 755 diff changeset	2965 u = r->upstream;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	2966 downstream = r->connection;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	2967 upstream = u->peer.connection;
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2968
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2969 b = &u->buffer;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2970
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	2971 do_write = do_write \|\| u->length == 0;
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2972
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2973 for ( ;; ) {
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2974
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2975 if (do_write) {
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2976
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2977 if (u->out_bufs \|\| u->busy_bufs) {
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	2978 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	2979
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	2980 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	2981 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	2982 return;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2983 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2984
4114 5db098f97e0e API change: ngx_chain_update_chains() now requires pool. Maxim Dounin <mdounin@mdounin.ru> parents: 3976 diff changeset	2985 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	2986 &u->out_bufs, u->output.tag);
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2987 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2988
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2989 if (u->busy_bufs == NULL) {
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2990
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2991 if (u->length == 0
5301 a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	2992 \|\| (upstream->read->eof && u->length == -1))
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2993 {
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2994 ngx_http_upstream_finalize_request(r, u, 0);
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2995 return;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2996 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2997
5301 a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	2998 if (upstream->read->eof) {
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	2999 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	3000 "upstream prematurely closed connection");
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3001
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3002 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	3003 NGX_HTTP_BAD_GATEWAY);
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3004 return;
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3005 }
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3006
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3007 if (upstream->read->error) {
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3008 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	3009 NGX_HTTP_BAD_GATEWAY);
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3010 return;
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3011 }
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3012
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3013 b->pos = b->start;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3014 b->last = b->start;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3015 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3016 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3017
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3018 size = b->end - b->last;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3019
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3020 if (size && upstream->read->ready) {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3021
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3022 n = upstream->recv(upstream, b->last, size);
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3023
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3024 if (n == NGX_AGAIN) {
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3025 break;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3026 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3027
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3028 if (n > 0) {
2402 cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	3029 u->state->response_length += n;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	3030
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3031 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	3032 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	3033 return;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3034 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3035 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3036
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3037 do_write = 1;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3038
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3039 continue;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3040 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3041
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3042 break;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3043 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3044
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3045 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	3046
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3047 if (downstream->data == r) {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3048 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	3049 != NGX_OK)
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	3050 {
5295 a489c31c9783 Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5294 diff changeset	3051 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	3052 return;
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	3053 }
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3054 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3055
1063 e2a6ecc5a3ae a non-active client connection must not closed after send timeout Igor Sysoev <igor@sysoev.ru> parents: 1031 diff changeset	3056 if (downstream->write->active && !downstream->write->ready) {
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3057 ngx_add_timer(downstream->write, clcf->send_timeout);
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3058
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3059 } else if (downstream->write->timer_set) {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3060 ngx_del_timer(downstream->write);
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3061 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3062
2377 87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	3063 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	3064 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	3065 return;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3066 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3067
1063 e2a6ecc5a3ae a non-active client connection must not closed after send timeout Igor Sysoev <igor@sysoev.ru> parents: 1031 diff changeset	3068 if (upstream->read->active && !upstream->read->ready) {
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3069 ngx_add_timer(upstream->read, u->conf->read_timeout);
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3070
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3071 } else if (upstream->read->timer_set) {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3072 ngx_del_timer(upstream->read);
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3073 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3074 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3075
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3076
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3077 static ngx_int_t
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3078 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	3079 {
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3080 return NGX_OK;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3081 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3082
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3083
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3084 static ngx_int_t
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3085 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	3086 {
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3087 ngx_http_request_t *r = data;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3088
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3089 ngx_buf_t *b;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3090 ngx_chain_t cl, *ll;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3091 ngx_http_upstream_t *u;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3092
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3093 u = r->upstream;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3094
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3095 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	3096 ll = &cl->next;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3097 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3098
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3099 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	3100 if (cl == NULL) {
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3101 return NGX_ERROR;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3102 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3103
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3104 *ll = cl;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3105
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3106 cl->buf->flush = 1;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3107 cl->buf->memory = 1;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3108
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3109 b = &u->buffer;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3110
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3111 cl->buf->pos = b->last;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3112 b->last += bytes;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3113 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	3114 cl->buf->tag = u->output.tag;
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3115
4118 dbddec65fdab Upstream: r->upstream->length type change to off_t. Maxim Dounin <mdounin@mdounin.ru> parents: 4117 diff changeset	3116 if (u->length == -1) {
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3117 return NGX_OK;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3118 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3119
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3120 u->length -= bytes;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3121
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3122 return NGX_OK;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3123 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3124
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3125
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3126 static void
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3127 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	3128 {
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3129 ngx_event_t *wev;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3130 ngx_connection_t *c;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3131 ngx_event_pipe_t *p;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3132 ngx_http_upstream_t *u;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3133
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3134 c = r->connection;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3135 u = r->upstream;
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3136 p = u->pipe;
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3137 wev = c->write;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3138
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3139 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	3140 "http upstream process downstream");
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3141
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3142 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	3143
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3144 if (wev->timedout) {
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3145
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3146 if (wev->delayed) {
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3147
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3148 wev->timedout = 0;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3149 wev->delayed = 0;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3150
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3151 if (!wev->ready) {
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3152 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	3153
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3154 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	3155 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	3156 }
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3157
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3158 return;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3159 }
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3160
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3161 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	3162 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	3163 return;
527 7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	3164 }
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3165
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3166 } else {
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3167 p->downstream_error = 1;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3168 c->timedout = 1;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3169 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	3170 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3171
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3172 } else {
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3173
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3174 if (wev->delayed) {
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3175
527 7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	3176 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	3177 "http downstream delayed");
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	3178
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3179 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	3180 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	3181 }
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	3182
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	3183 return;
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	3184 }
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	3185
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3186 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	3187 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	3188 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3189 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3190 }
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3191
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3192 ngx_http_upstream_process_request(r);
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3193 }
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3194
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3195
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3196 static void
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	3197 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	3198 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	3199 {
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	3200 ngx_connection_t *c;
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	3201
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	3202 c = u->peer.connection;
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3203
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3204 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	3205 "http upstream process upstream");
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3206
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3207 c->log->action = "reading upstream";
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3208
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	3209 if (c->read->timedout) {
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	3210 u->pipe->upstream_error = 1;
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3211 ngx_connection_error(c, NGX_ETIMEDOUT, "upstream timed out");
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3212
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3213 } else {
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	3214 if (ngx_event_pipe(u->pipe, 0) == NGX_ABORT) {
5297 0ae9a2958886 Upstream: NGX_ERROR after pipe errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5296 diff changeset	3215 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	3216 return;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3217 }
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3218 }
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3219
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3220 ngx_http_upstream_process_request(r);
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3221 }
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3222
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3223
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3224 static void
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3225 ngx_http_upstream_process_request(ngx_http_request_t *r)
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3226 {
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3227 ngx_temp_file_t *tf;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3228 ngx_event_pipe_t *p;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3229 ngx_http_upstream_t *u;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3230
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3231 u = r->upstream;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3232 p = u->pipe;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3233
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3234 if (u->peer.connection) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3235
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3236 if (u->store) {
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3237
2463 4bc8ea10d62b fix fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 2445 diff changeset	3238 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	3239
5298 a7b2db9119e0 Upstream: replaced u->pipe->temp_file with p->temp_file. Maxim Dounin <mdounin@mdounin.ru> parents: 5297 diff changeset	3240 tf = p->temp_file;
4469 24c0dca04eb9 Fix for proxy_store leaving temporary files for subrequests. Maxim Dounin <mdounin@mdounin.ru> parents: 4464 diff changeset	3241
2445 3c6af1fb7586 proxy/fastcgi_store did not delete incomplete files Igor Sysoev <igor@sysoev.ru> parents: 2441 diff changeset	3242 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	3243 && (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	3244 && (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	3245 \|\| 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	3246 {
3c6af1fb7586 proxy/fastcgi_store did not delete incomplete files Igor Sysoev <igor@sysoev.ru> parents: 2441 diff changeset	3247 ngx_http_upstream_store(r, u);
4469 24c0dca04eb9 Fix for proxy_store leaving temporary files for subrequests. Maxim Dounin <mdounin@mdounin.ru> parents: 4464 diff changeset	3248 u->store = 0;
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3249 }
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3250 }
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3251 }
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3252
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	3253 #if (NGX_HTTP_CACHE)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	3254
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	3255 if (u->cacheable) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	3256
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	3257 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	3258 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	3259
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	3260 } else if (p->upstream_eof) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	3261
5298 a7b2db9119e0 Upstream: replaced u->pipe->temp_file with p->temp_file. Maxim Dounin <mdounin@mdounin.ru> parents: 5297 diff changeset	3262 tf = p->temp_file;
4298 186f02886bed Upstream: don't cache unfinished responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4197 diff changeset	3263
5299 b779728b180c Upstream: fixed store/cache of unfinished responses. Maxim Dounin <mdounin@mdounin.ru> parents: 5298 diff changeset	3264 if (p->length == -1
b779728b180c Upstream: fixed store/cache of unfinished responses. Maxim Dounin <mdounin@mdounin.ru> parents: 5298 diff changeset	3265 && (u->headers_in.content_length_n == -1
b779728b180c Upstream: fixed store/cache of unfinished responses. Maxim Dounin <mdounin@mdounin.ru> parents: 5298 diff changeset	3266 \|\| u->headers_in.content_length_n
b779728b180c Upstream: fixed store/cache of unfinished responses. Maxim Dounin <mdounin@mdounin.ru> parents: 5298 diff changeset	3267 == 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	3268 {
186f02886bed Upstream: don't cache unfinished responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4197 diff changeset	3269 ngx_http_file_cache_update(r, tf);
186f02886bed Upstream: don't cache unfinished responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4197 diff changeset	3270
186f02886bed Upstream: don't cache unfinished responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4197 diff changeset	3271 } else {
186f02886bed Upstream: don't cache unfinished responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4197 diff changeset	3272 ngx_http_file_cache_free(r->cache, tf);
186f02886bed Upstream: don't cache unfinished responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4197 diff changeset	3273 }
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	3274
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	3275 } 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	3276 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	3277 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3278 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3279
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3280 #endif
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3281
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3282 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	3283 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	3284 "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	3285
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3286 if (p->upstream_done
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3287 \|\| (p->upstream_eof && p->length == -1))
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3288 {
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3289 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	3290 return;
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3291 }
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3292
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3293 if (p->upstream_eof) {
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3294 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	3295 "upstream prematurely closed connection");
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3296 }
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3297
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3298 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	3299 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3300 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3301 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3302
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3303 if (p->downstream_error) {
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3304 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	3305 "http upstream downstream error");
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3306
2757 9cc973b46af1 get a full response if the response is cacheable or storable even Igor Sysoev <igor@sysoev.ru> parents: 2708 diff changeset	3307 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	3308 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	3309 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3310 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3311 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3312
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3313
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	3314 static void
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3315 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	3316 {
1947 94b03bbd328e use ngx_ext_rename_file() in proxy/fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1916 diff changeset	3317 size_t root;
94b03bbd328e use ngx_ext_rename_file() in proxy/fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1916 diff changeset	3318 time_t lm;
94b03bbd328e use ngx_ext_rename_file() in proxy/fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1916 diff changeset	3319 ngx_str_t path;
94b03bbd328e use ngx_ext_rename_file() in proxy/fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1916 diff changeset	3320 ngx_temp_file_t *tf;
94b03bbd328e use ngx_ext_rename_file() in proxy/fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1916 diff changeset	3321 ngx_ext_rename_file_t ext;
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3322
1777 edaea30d83be optimization Igor Sysoev <igor@sysoev.ru> parents: 1707 diff changeset	3323 tf = u->pipe->temp_file;
edaea30d83be optimization Igor Sysoev <igor@sysoev.ru> parents: 1707 diff changeset	3324
edaea30d83be optimization Igor Sysoev <igor@sysoev.ru> parents: 1707 diff changeset	3325 if (tf->file.fd == NGX_INVALID_FILE) {
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3326
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3327 /* create file for empty 200 response */
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3328
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3329 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	3330 if (tf == NULL) {
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3331 return;
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3332 }
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3333
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3334 tf->file.fd = NGX_INVALID_FILE;
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3335 tf->file.log = r->connection->log;
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3336 tf->path = u->conf->temp_path;
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3337 tf->pool = r->pool;
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3338 tf->persistent = 1;
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3339
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3340 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	3341 tf->persistent, tf->clean, tf->access)
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3342 != NGX_OK)
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3343 {
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3344 return;
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3345 }
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3346
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3347 u->pipe->temp_file = tf;
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3348 }
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3349
1947 94b03bbd328e use ngx_ext_rename_file() in proxy/fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1916 diff changeset	3350 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	3351 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	3352 ext.time = -1;
94b03bbd328e use ngx_ext_rename_file() in proxy/fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1916 diff changeset	3353 ext.create_path = 1;
94b03bbd328e use ngx_ext_rename_file() in proxy/fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1916 diff changeset	3354 ext.delete_file = 1;
94b03bbd328e use ngx_ext_rename_file() in proxy/fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1916 diff changeset	3355 ext.log = r->connection->log;
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3356
1705 d22095839d86 optimize r->upstream usage Igor Sysoev <igor@sysoev.ru> parents: 1701 diff changeset	3357 if (u->headers_in.last_modified) {
d22095839d86 optimize r->upstream usage Igor Sysoev <igor@sysoev.ru> parents: 1701 diff changeset	3358
1947 94b03bbd328e use ngx_ext_rename_file() in proxy/fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1916 diff changeset	3359 lm = ngx_http_parse_time(u->headers_in.last_modified->value.data,
94b03bbd328e use ngx_ext_rename_file() in proxy/fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1916 diff changeset	3360 u->headers_in.last_modified->value.len);
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3361
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3362 if (lm != NGX_ERROR) {
1947 94b03bbd328e use ngx_ext_rename_file() in proxy/fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1916 diff changeset	3363 ext.time = lm;
94b03bbd328e use ngx_ext_rename_file() in proxy/fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1916 diff changeset	3364 ext.fd = tf->file.fd;
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3365 }
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3366 }
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3367
1295 5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	3368 if (u->conf->store_lengths == NULL) {
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	3369
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	3370 ngx_http_map_uri_to_path(r, &path, &root, 0);
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	3371
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	3372 } else {
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	3373 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	3374 u->conf->store_values->elts)
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	3375 == NULL)
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	3376 {
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	3377 return;
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	3378 }
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	3379 }
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3380
3032 524ba56ba9f7 fix copy destination name length, introduced in r3025 Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	3381 path.len--;
524ba56ba9f7 fix copy destination name length, introduced in r3025 Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	3382
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3383 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	3384 "upstream stores \"%s\" to \"%s\"",
94b03bbd328e use ngx_ext_rename_file() in proxy/fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1916 diff changeset	3385 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	3386
94b03bbd328e use ngx_ext_rename_file() in proxy/fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1916 diff changeset	3387 (void) ngx_ext_rename_file(&tf->file.name, &path, &ext);
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3388 }
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3389
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3390
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3391 static void
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	3392 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	3393 {
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	3394 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	3395 "http upstream dummy handler");
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3396 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3397
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3398
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	3399 static void
31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	3400 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	3401 ngx_uint_t ft_type)
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3402 {
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3403 ngx_uint_t status, state;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3404
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3405 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	3406 "http next upstream, %xi", ft_type);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3407
5132 9bcf89ca78d2 Upstream: only call peer.free() if peer.get() selected a peer. Ruslan Ermilov <ru@nginx.com> parents: 5121 diff changeset	3408 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	3409
5231 05c53652e7b4 Upstream: http_403 support in proxy_next_upstream (and friends). Maxim Dounin <mdounin@mdounin.ru> parents: 5217 diff changeset	3410 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	3411 \|\| 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	3412 {
5132 9bcf89ca78d2 Upstream: only call peer.free() if peer.get() selected a peer. Ruslan Ermilov <ru@nginx.com> parents: 5121 diff changeset	3413 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	3414
5132 9bcf89ca78d2 Upstream: only call peer.free() if peer.get() selected a peer. Ruslan Ermilov <ru@nginx.com> parents: 5121 diff changeset	3415 } else {
9bcf89ca78d2 Upstream: only call peer.free() if peer.get() selected a peer. Ruslan Ermilov <ru@nginx.com> parents: 5121 diff changeset	3416 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	3417 }
9bcf89ca78d2 Upstream: only call peer.free() if peer.get() selected a peer. Ruslan Ermilov <ru@nginx.com> parents: 5121 diff changeset	3418
1378 0be898896d1a backup upstream servers Igor Sysoev <igor@sysoev.ru> parents: 1340 diff changeset	3419 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	3420 u->peer.sockaddr = NULL;
1378 0be898896d1a backup upstream servers Igor Sysoev <igor@sysoev.ru> parents: 1340 diff changeset	3421 }
525 09b42134ac0c nginx-0.1.37-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 515 diff changeset	3422
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3423 if (ft_type == NGX_HTTP_UPSTREAM_FT_TIMEOUT) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3424 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	3425 "upstream timed out");
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3426 }
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3427
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3428 if (u->peer.cached && ft_type == NGX_HTTP_UPSTREAM_FT_ERROR) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3429 status = 0;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3430
4115 70a45a504905 Workaround for cpu hog on errors with cached connections. Maxim Dounin <mdounin@mdounin.ru> parents: 4114 diff changeset	3431 /* TODO: inform balancer instead */
70a45a504905 Workaround for cpu hog on errors with cached connections. Maxim Dounin <mdounin@mdounin.ru> parents: 4114 diff changeset	3432
70a45a504905 Workaround for cpu hog on errors with cached connections. Maxim Dounin <mdounin@mdounin.ru> parents: 4114 diff changeset	3433 u->peer.tries++;
70a45a504905 Workaround for cpu hog on errors with cached connections. Maxim Dounin <mdounin@mdounin.ru> parents: 4114 diff changeset	3434
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3435 } else {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3436 switch(ft_type) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3437
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3438 case NGX_HTTP_UPSTREAM_FT_TIMEOUT:
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3439 status = NGX_HTTP_GATEWAY_TIME_OUT;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3440 break;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3441
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3442 case NGX_HTTP_UPSTREAM_FT_HTTP_500:
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3443 status = NGX_HTTP_INTERNAL_SERVER_ERROR;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3444 break;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3445
5231 05c53652e7b4 Upstream: http_403 support in proxy_next_upstream (and friends). Maxim Dounin <mdounin@mdounin.ru> parents: 5217 diff changeset	3446 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	3447 status = NGX_HTTP_FORBIDDEN;
05c53652e7b4 Upstream: http_403 support in proxy_next_upstream (and friends). Maxim Dounin <mdounin@mdounin.ru> parents: 5217 diff changeset	3448 break;
05c53652e7b4 Upstream: http_403 support in proxy_next_upstream (and friends). Maxim Dounin <mdounin@mdounin.ru> parents: 5217 diff changeset	3449
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3450 case NGX_HTTP_UPSTREAM_FT_HTTP_404:
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3451 status = NGX_HTTP_NOT_FOUND;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3452 break;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3453
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3454 /*
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3455 * 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	3456 * never reach here
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3457 */
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3458
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3459 default:
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3460 status = NGX_HTTP_BAD_GATEWAY;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3461 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3462 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3463
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	3464 if (r->connection->error) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3465 ngx_http_upstream_finalize_request(r, u,
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3466 NGX_HTTP_CLIENT_CLOSED_REQUEST);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3467 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3468 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3469
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3470 if (status) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3471 u->state->status = status;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3472
525 09b42134ac0c nginx-0.1.37-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 515 diff changeset	3473 if (u->peer.tries == 0 \|\| !(u->conf->next_upstream & ft_type)) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3474
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3475 #if (NGX_HTTP_CACHE)
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3476
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	3477 if (u->cache_status == NGX_HTTP_CACHE_EXPIRED
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	3478 && (u->conf->cache_use_stale & ft_type))
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	3479 {
2805 60551422e150 reinit proxy/fastcgi header parser before ngx_http_upstream_cache_send() Igor Sysoev <igor@sysoev.ru> parents: 2804 diff changeset	3480 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	3481
60551422e150 reinit proxy/fastcgi header parser before ngx_http_upstream_cache_send() Igor Sysoev <igor@sysoev.ru> parents: 2804 diff changeset	3482 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	3483
60551422e150 reinit proxy/fastcgi header parser before ngx_http_upstream_cache_send() Igor Sysoev <igor@sysoev.ru> parents: 2804 diff changeset	3484 if (rc == NGX_OK) {
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	3485 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	3486 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	3487 }
60551422e150 reinit proxy/fastcgi header parser before ngx_http_upstream_cache_send() Igor Sysoev <igor@sysoev.ru> parents: 2804 diff changeset	3488
60551422e150 reinit proxy/fastcgi header parser before ngx_http_upstream_cache_send() Igor Sysoev <igor@sysoev.ru> parents: 2804 diff changeset	3489 ngx_http_upstream_finalize_request(r, u, rc);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3490 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3491 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3492 #endif
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3493
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3494 ngx_http_upstream_finalize_request(r, u, status);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3495 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3496 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3497 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3498
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3499 if (u->peer.connection) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3500 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	3501 "close http upstream connection: %d",
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3502 u->peer.connection->fd);
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3503 #if (NGX_HTTP_SSL)
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3504
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3505 if (u->peer.connection->ssl) {
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3506 u->peer.connection->ssl->no_wait_shutdown = 1;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3507 u->peer.connection->ssl->no_send_shutdown = 1;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3508
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3509 (void) ngx_ssl_shutdown(u->peer.connection);
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3510 }
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3511 #endif
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3512
4138 70e1ee2307f9 Fix of separate pool for upstream connections (r4117). Maxim Dounin <mdounin@mdounin.ru> parents: 4124 diff changeset	3513 if (u->peer.connection->pool) {
70e1ee2307f9 Fix of separate pool for upstream connections (r4117). Maxim Dounin <mdounin@mdounin.ru> parents: 4124 diff changeset	3514 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	3515 }
70e1ee2307f9 Fix of separate pool for upstream connections (r4117). Maxim Dounin <mdounin@mdounin.ru> parents: 4124 diff changeset	3516
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3517 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	3518 u->peer.connection = NULL;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3519 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3520
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3521 ngx_http_upstream_connect(r, u);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3522 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3523
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3524
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	3525 static void
569 174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	3526 ngx_http_upstream_cleanup(void *data)
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	3527 {
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	3528 ngx_http_request_t *r = data;
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	3529
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	3530 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	3531 "cleanup http upstream request: \"%V\"", &r->uri);
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	3532
5167 85ee9d858dcb Upstream: removed surplus ngx_resolve_name_done() call. Valentin Bartenev <vbart@nginx.com> parents: 5142 diff changeset	3533 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	3534 }
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	3535
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	3536
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	3537 static void
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	3538 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	3539 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	3540 {
5304 d3eab5e2df5f Upstream: no last buffer on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5303 diff changeset	3541 ngx_uint_t flush;
889 a9a7e4b1a72b the previous fix does not actually fix overflow Igor Sysoev <igor@sysoev.ru> parents: 888 diff changeset	3542 ngx_time_t *tp;
563 9c2f3ed7a247 nginx-0.3.3-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	3543
483 621229427cba nginx-0.1.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	3544 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	3545 "finalize http upstream request: %i", rc);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3546
2413 89ac47d91fc1 fix segfault Igor Sysoev <igor@sysoev.ru> parents: 2402 diff changeset	3547 if (u->cleanup) {
89ac47d91fc1 fix segfault Igor Sysoev <igor@sysoev.ru> parents: 2402 diff changeset	3548 *u->cleanup = NULL;
3418 a076e1823737 delete u->cleanup mark, this fixes large values in $upstream_response_time, Igor Sysoev <igor@sysoev.ru> parents: 3401 diff changeset	3549 u->cleanup = NULL;
2413 89ac47d91fc1 fix segfault Igor Sysoev <igor@sysoev.ru> parents: 2402 diff changeset	3550 }
569 174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	3551
3169 b1013d768911 fix request counter in resolver handling, the bug was introduced in r3050 Igor Sysoev <igor@sysoev.ru> parents: 3161 diff changeset	3552 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	3553 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	3554 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	3555 }
b1013d768911 fix request counter in resolver handling, the bug was introduced in r3050 Igor Sysoev <igor@sysoev.ru> parents: 3161 diff changeset	3556
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	3557 if (u->state && u->state->response_sec) {
563 9c2f3ed7a247 nginx-0.3.3-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	3558 tp = ngx_timeofday();
889 a9a7e4b1a72b the previous fix does not actually fix overflow Igor Sysoev <igor@sysoev.ru> parents: 888 diff changeset	3559 u->state->response_sec = tp->sec - u->state->response_sec;
a9a7e4b1a72b the previous fix does not actually fix overflow Igor Sysoev <igor@sysoev.ru> parents: 888 diff changeset	3560 u->state->response_msec = tp->msec - u->state->response_msec;
2402 cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	3561
5169 f6bbe77794aa Upstream: fixed $upstream_response_length without buffering. Sergey Kandaurov <pluknet@nginx.com> parents: 5167 diff changeset	3562 if (u->pipe && u->pipe->read_length) {
2402 cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	3563 u->state->response_length = u->pipe->read_length;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	3564 }
563 9c2f3ed7a247 nginx-0.3.3-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	3565 }
9c2f3ed7a247 nginx-0.3.3-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	3566
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3567 u->finalize_request(r, rc);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3568
5132 9bcf89ca78d2 Upstream: only call peer.free() if peer.get() selected a peer. Ruslan Ermilov <ru@nginx.com> parents: 5121 diff changeset	3569 if (u->peer.free && u->peer.sockaddr) {
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	3570 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	3571 u->peer.sockaddr = NULL;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	3572 }
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3573
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3574 if (u->peer.connection) {
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3575
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3576 #if (NGX_HTTP_SSL)
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3577
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3578 /* TODO: do not shutdown persistent connection */
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3579
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3580 if (u->peer.connection->ssl) {
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3581
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3582 /*
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3583 * We send the "close notify" shutdown alert to the upstream only
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3584 * and do not wait its "close notify" shutdown alert.
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3585 * It is acceptable according to the TLS standard.
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3586 */
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3587
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3588 u->peer.connection->ssl->no_wait_shutdown = 1;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3589
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3590 (void) ngx_ssl_shutdown(u->peer.connection);
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3591 }
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3592 #endif
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3593
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3594 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3595 "close http upstream connection: %d",
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3596 u->peer.connection->fd);
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3597
4138 70e1ee2307f9 Fix of separate pool for upstream connections (r4117). Maxim Dounin <mdounin@mdounin.ru> parents: 4124 diff changeset	3598 if (u->peer.connection->pool) {
70e1ee2307f9 Fix of separate pool for upstream connections (r4117). Maxim Dounin <mdounin@mdounin.ru> parents: 4124 diff changeset	3599 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	3600 }
70e1ee2307f9 Fix of separate pool for upstream connections (r4117). Maxim Dounin <mdounin@mdounin.ru> parents: 4124 diff changeset	3601
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3602 ngx_close_connection(u->peer.connection);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3603 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3604
483 621229427cba nginx-0.1.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	3605 u->peer.connection = NULL;
621229427cba nginx-0.1.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	3606
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3607 if (u->pipe && u->pipe->temp_file) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3608 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	3609 "http upstream temp fd: %d",
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3610 u->pipe->temp_file->file.fd);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3611 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3612
4469 24c0dca04eb9 Fix for proxy_store leaving temporary files for subrequests. Maxim Dounin <mdounin@mdounin.ru> parents: 4464 diff changeset	3613 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	3614 && 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	3615 {
24c0dca04eb9 Fix for proxy_store leaving temporary files for subrequests. Maxim Dounin <mdounin@mdounin.ru> parents: 4464 diff changeset	3616 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	3617 == NGX_FILE_ERROR)
24c0dca04eb9 Fix for proxy_store leaving temporary files for subrequests. Maxim Dounin <mdounin@mdounin.ru> parents: 4464 diff changeset	3618 {
24c0dca04eb9 Fix for proxy_store leaving temporary files for subrequests. Maxim Dounin <mdounin@mdounin.ru> parents: 4464 diff changeset	3619 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	3620 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	3621 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	3622 }
24c0dca04eb9 Fix for proxy_store leaving temporary files for subrequests. Maxim Dounin <mdounin@mdounin.ru> parents: 4464 diff changeset	3623 }
24c0dca04eb9 Fix for proxy_store leaving temporary files for subrequests. Maxim Dounin <mdounin@mdounin.ru> parents: 4464 diff changeset	3624
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	3625 #if (NGX_HTTP_CACHE)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	3626
3940 22f3e9197096 revert r3935 and fix "stalled cache updating" alert Igor Sysoev <igor@sysoev.ru> parents: 3934 diff changeset	3627 if (r->cache) {
22f3e9197096 revert r3935 and fix "stalled cache updating" alert Igor Sysoev <igor@sysoev.ru> parents: 3934 diff changeset	3628
22f3e9197096 revert r3935 and fix "stalled cache updating" alert Igor Sysoev <igor@sysoev.ru> parents: 3934 diff changeset	3629 if (u->cacheable) {
22f3e9197096 revert r3935 and fix "stalled cache updating" alert Igor Sysoev <igor@sysoev.ru> parents: 3934 diff changeset	3630
22f3e9197096 revert r3935 and fix "stalled cache updating" alert Igor Sysoev <igor@sysoev.ru> parents: 3934 diff changeset	3631 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	3632 time_t valid;
22f3e9197096 revert r3935 and fix "stalled cache updating" alert Igor Sysoev <igor@sysoev.ru> parents: 3934 diff changeset	3633
22f3e9197096 revert r3935 and fix "stalled cache updating" alert Igor Sysoev <igor@sysoev.ru> parents: 3934 diff changeset	3634 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	3635
22f3e9197096 revert r3935 and fix "stalled cache updating" alert Igor Sysoev <igor@sysoev.ru> parents: 3934 diff changeset	3636 if (valid) {
22f3e9197096 revert r3935 and fix "stalled cache updating" alert Igor Sysoev <igor@sysoev.ru> parents: 3934 diff changeset	3637 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	3638 r->cache->error = rc;
22f3e9197096 revert r3935 and fix "stalled cache updating" alert Igor Sysoev <igor@sysoev.ru> parents: 3934 diff changeset	3639 }
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	3640 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	3641 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	3642
3711 ce6ba077c270 several changes in cache cleanup handling: Igor Sysoev <igor@sysoev.ru> parents: 3709 diff changeset	3643 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	3644 }
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	3645
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3646 #endif
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3647
5392 f1caf7b8ae1d Upstream: subrequest_in_memory fix. Maxim Dounin <mdounin@mdounin.ru> parents: 5373 diff changeset	3648 if (r->subrequest_in_memory
f1caf7b8ae1d Upstream: subrequest_in_memory fix. Maxim Dounin <mdounin@mdounin.ru> parents: 5373 diff changeset	3649 && u->headers_in.status_n >= NGX_HTTP_SPECIAL_RESPONSE)
f1caf7b8ae1d Upstream: subrequest_in_memory fix. Maxim Dounin <mdounin@mdounin.ru> parents: 5373 diff changeset	3650 {
f1caf7b8ae1d Upstream: subrequest_in_memory fix. Maxim Dounin <mdounin@mdounin.ru> parents: 5373 diff changeset	3651 u->buffer.last = u->buffer.pos;
f1caf7b8ae1d Upstream: subrequest_in_memory fix. Maxim Dounin <mdounin@mdounin.ru> parents: 5373 diff changeset	3652 }
f1caf7b8ae1d Upstream: subrequest_in_memory fix. Maxim Dounin <mdounin@mdounin.ru> parents: 5373 diff changeset	3653
515 417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	3654 if (rc == NGX_DECLINED) {
417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	3655 return;
417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	3656 }
417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	3657
483 621229427cba nginx-0.1.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	3658 r->connection->log->action = "sending to client";
621229427cba nginx-0.1.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	3659
5303 0fb714d80909 Upstream: request finalization rework. Maxim Dounin <mdounin@mdounin.ru> parents: 5302 diff changeset	3660 if (!u->header_sent
0fb714d80909 Upstream: request finalization rework. Maxim Dounin <mdounin@mdounin.ru> parents: 5302 diff changeset	3661 \|\| rc == NGX_HTTP_REQUEST_TIME_OUT
0fb714d80909 Upstream: request finalization rework. Maxim Dounin <mdounin@mdounin.ru> parents: 5302 diff changeset	3662 \|\| rc == NGX_HTTP_CLIENT_CLOSED_REQUEST)
4151 3549db8ceaf2 Cache: fix for sending of stale responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4143 diff changeset	3663 {
5303 0fb714d80909 Upstream: request finalization rework. Maxim Dounin <mdounin@mdounin.ru> parents: 5302 diff changeset	3664 ngx_http_finalize_request(r, rc);
0fb714d80909 Upstream: request finalization rework. Maxim Dounin <mdounin@mdounin.ru> parents: 5302 diff changeset	3665 return;
0fb714d80909 Upstream: request finalization rework. Maxim Dounin <mdounin@mdounin.ru> parents: 5302 diff changeset	3666 }
0fb714d80909 Upstream: request finalization rework. Maxim Dounin <mdounin@mdounin.ru> parents: 5302 diff changeset	3667
5304 d3eab5e2df5f Upstream: no last buffer on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5303 diff changeset	3668 flush = 0;
d3eab5e2df5f Upstream: no last buffer on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5303 diff changeset	3669
d3eab5e2df5f Upstream: no last buffer on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5303 diff changeset	3670 if (rc >= NGX_HTTP_SPECIAL_RESPONSE) {
d3eab5e2df5f Upstream: no last buffer on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5303 diff changeset	3671 rc = NGX_ERROR;
d3eab5e2df5f Upstream: no last buffer on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5303 diff changeset	3672 flush = 1;
5303 0fb714d80909 Upstream: request finalization rework. Maxim Dounin <mdounin@mdounin.ru> parents: 5302 diff changeset	3673 }
0fb714d80909 Upstream: request finalization rework. Maxim Dounin <mdounin@mdounin.ru> parents: 5302 diff changeset	3674
0fb714d80909 Upstream: request finalization rework. Maxim Dounin <mdounin@mdounin.ru> parents: 5302 diff changeset	3675 if (r->header_only) {
0fb714d80909 Upstream: request finalization rework. Maxim Dounin <mdounin@mdounin.ru> parents: 5302 diff changeset	3676 ngx_http_finalize_request(r, rc);
0fb714d80909 Upstream: request finalization rework. Maxim Dounin <mdounin@mdounin.ru> parents: 5302 diff changeset	3677 return;
0fb714d80909 Upstream: request finalization rework. Maxim Dounin <mdounin@mdounin.ru> parents: 5302 diff changeset	3678 }
0fb714d80909 Upstream: request finalization rework. Maxim Dounin <mdounin@mdounin.ru> parents: 5302 diff changeset	3679
0fb714d80909 Upstream: request finalization rework. Maxim Dounin <mdounin@mdounin.ru> parents: 5302 diff changeset	3680 if (rc == 0) {
2377 87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	3681 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	3682
d3eab5e2df5f Upstream: no last buffer on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5303 diff changeset	3683 } else if (flush) {
d3eab5e2df5f Upstream: no last buffer on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5303 diff changeset	3684 r->keepalive = 0;
d3eab5e2df5f Upstream: no last buffer on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5303 diff changeset	3685 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	3686 }
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 ngx_http_finalize_request(r, rc);
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
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3692 static ngx_int_t
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3693 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	3694 ngx_uint_t offset)
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3695 {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3696 ngx_table_elt_t **ph;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3697
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3698 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	3699
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3700 if (*ph == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3701 *ph = h;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3702 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3703
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3704 return NGX_OK;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3705 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3706
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3707
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3708 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	3709 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	3710 ngx_uint_t offset)
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3711 {
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3712 return NGX_OK;
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3713 }
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3714
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3715
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3716 static ngx_int_t
4117 103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	3717 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	3718 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	3719 {
103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	3720 ngx_http_upstream_t *u;
103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	3721
103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	3722 u = r->upstream;
103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	3723
103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	3724 u->headers_in.content_length = h;
103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	3725 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	3726
103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	3727 return NGX_OK;
103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	3728 }
103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	3729
103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	3730
103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	3731 static ngx_int_t
3669 1f5841b1fcd7 treat Set-Cookie as a header that forbids caching Igor Sysoev <igor@sysoev.ru> parents: 3667 diff changeset	3732 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	3733 ngx_uint_t offset)
1f5841b1fcd7 treat Set-Cookie as a header that forbids caching Igor Sysoev <igor@sysoev.ru> parents: 3667 diff changeset	3734 {
5677 3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	3735 ngx_array_t *pa;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	3736 ngx_table_elt_t **ph;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	3737 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	3738
1f5841b1fcd7 treat Set-Cookie as a header that forbids caching Igor Sysoev <igor@sysoev.ru> parents: 3667 diff changeset	3739 u = r->upstream;
5677 3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	3740 pa = &u->headers_in.cookies;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	3741
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	3742 if (pa->elts == NULL) {
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	3743 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	3744 {
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	3745 return NGX_ERROR;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	3746 }
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	3747 }
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	3748
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	3749 ph = ngx_array_push(pa);
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	3750 if (ph == NULL) {
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	3751 return NGX_ERROR;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	3752 }
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	3753
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	3754 *ph = h;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	3755
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	3756 #if (NGX_HTTP_CACHE)
3669 1f5841b1fcd7 treat Set-Cookie as a header that forbids caching Igor Sysoev <igor@sysoev.ru> parents: 3667 diff changeset	3757 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	3758 u->cacheable = 0;
1f5841b1fcd7 treat Set-Cookie as a header that forbids caching Igor Sysoev <igor@sysoev.ru> parents: 3667 diff changeset	3759 }
1f5841b1fcd7 treat Set-Cookie as a header that forbids caching Igor Sysoev <igor@sysoev.ru> parents: 3667 diff changeset	3760 #endif
1f5841b1fcd7 treat Set-Cookie as a header that forbids caching Igor Sysoev <igor@sysoev.ru> parents: 3667 diff changeset	3761
1f5841b1fcd7 treat Set-Cookie as a header that forbids caching Igor Sysoev <igor@sysoev.ru> parents: 3667 diff changeset	3762 return NGX_OK;
1f5841b1fcd7 treat Set-Cookie as a header that forbids caching Igor Sysoev <igor@sysoev.ru> parents: 3667 diff changeset	3763 }
1f5841b1fcd7 treat Set-Cookie as a header that forbids caching Igor Sysoev <igor@sysoev.ru> parents: 3667 diff changeset	3764
1f5841b1fcd7 treat Set-Cookie as a header that forbids caching Igor Sysoev <igor@sysoev.ru> parents: 3667 diff changeset	3765
1f5841b1fcd7 treat Set-Cookie as a header that forbids caching Igor Sysoev <igor@sysoev.ru> parents: 3667 diff changeset	3766 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	3767 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	3768 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	3769 {
2786 4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	3770 ngx_array_t *pa;
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	3771 ngx_table_elt_t **ph;
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	3772 ngx_http_upstream_t *u;
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	3773
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	3774 u = r->upstream;
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	3775 pa = &u->headers_in.cache_control;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3776
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3777 if (pa->elts == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3778 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	3779 {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3780 return NGX_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3781 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3782 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3783
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3784 ph = ngx_array_push(pa);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3785 if (ph == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3786 return NGX_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3787 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3788
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3789 *ph = h;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3790
2708 4c658be4ab63 fix building --without-http-cache, introduced in r2664 and later Igor Sysoev <igor@sysoev.ru> parents: 2704 diff changeset	3791 #if (NGX_HTTP_CACHE)
4c658be4ab63 fix building --without-http-cache, introduced in r2664 and later Igor Sysoev <igor@sysoev.ru> parents: 2704 diff changeset	3792 {
4c658be4ab63 fix building --without-http-cache, introduced in r2664 and later Igor Sysoev <igor@sysoev.ru> parents: 2704 diff changeset	3793 u_char p, last;
4c658be4ab63 fix building --without-http-cache, introduced in r2664 and later Igor Sysoev <igor@sysoev.ru> parents: 2704 diff changeset	3794 ngx_int_t n;
4c658be4ab63 fix building --without-http-cache, introduced in r2664 and later Igor Sysoev <igor@sysoev.ru> parents: 2704 diff changeset	3795
2786 4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	3796 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	3797 return NGX_OK;
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	3798 }
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	3799
2669 5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3800 if (r->cache == NULL) {
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3801 return NGX_OK;
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3802 }
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3803
5500 6a3ab6fdd70f Upstream: Cache-Control preferred over Expires. Maxim Dounin <mdounin@mdounin.ru> parents: 5489 diff changeset	3804 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	3805 return NGX_OK;
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3806 }
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3807
3517 a4ee4a075ac5 do not cache response if it has "no-store" or "private" Igor Sysoev <igor@sysoev.ru> parents: 3516 diff changeset	3808 p = h->value.data;
a4ee4a075ac5 do not cache response if it has "no-store" or "private" Igor Sysoev <igor@sysoev.ru> parents: 3516 diff changeset	3809 last = p + h->value.len;
a4ee4a075ac5 do not cache response if it has "no-store" or "private" Igor Sysoev <igor@sysoev.ru> parents: 3516 diff changeset	3810
a4ee4a075ac5 do not cache response if it has "no-store" or "private" Igor Sysoev <igor@sysoev.ru> parents: 3516 diff changeset	3811 if (ngx_strlcasestrn(p, last, (u_char *) "no-cache", 8 - 1) != NULL
a4ee4a075ac5 do not cache response if it has "no-store" or "private" Igor Sysoev <igor@sysoev.ru> parents: 3516 diff changeset	3812 \|\| ngx_strlcasestrn(p, last, (u_char *) "no-store", 8 - 1) != NULL
a4ee4a075ac5 do not cache response if it has "no-store" or "private" Igor Sysoev <igor@sysoev.ru> parents: 3516 diff changeset	3813 \|\| ngx_strlcasestrn(p, 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	3814 {
2786 4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	3815 u->cacheable = 0;
2669 5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3816 return NGX_OK;
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3817 }
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3818
3517 a4ee4a075ac5 do not cache response if it has "no-store" or "private" Igor Sysoev <igor@sysoev.ru> parents: 3516 diff changeset	3819 p = ngx_strlcasestrn(p, last, (u_char *) "max-age=", 8 - 1);
2669 5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3820
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3821 if (p == NULL) {
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3822 return NGX_OK;
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3823 }
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3824
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3825 n = 0;
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3826
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3827 for (p += 8; p < last; p++) {
3198 48bfb7dc981b test comma separator in "Cache-Control" Igor Sysoev <igor@sysoev.ru> parents: 3195 diff changeset	3828 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	3829 break;
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3830 }
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3831
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3832 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	3833 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	3834 continue;
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3835 }
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3836
2786 4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	3837 u->cacheable = 0;
2669 5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3838 return NGX_OK;
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3839 }
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3840
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3841 if (n == 0) {
2786 4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	3842 u->cacheable = 0;
2669 5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3843 return NGX_OK;
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3844 }
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3845
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	3846 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	3847 }
4c658be4ab63 fix building --without-http-cache, introduced in r2664 and later Igor Sysoev <igor@sysoev.ru> parents: 2704 diff changeset	3848 #endif
4c658be4ab63 fix building --without-http-cache, introduced in r2664 and later Igor Sysoev <igor@sysoev.ru> parents: 2704 diff changeset	3849
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3850 return NGX_OK;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3851 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3852
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3853
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3854 static ngx_int_t
2666 81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	3855 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	3856 ngx_uint_t offset)
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	3857 {
2786 4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	3858 ngx_http_upstream_t *u;
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	3859
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	3860 u = r->upstream;
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	3861 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	3862
4c658be4ab63 fix building --without-http-cache, introduced in r2664 and later Igor Sysoev <igor@sysoev.ru> parents: 2704 diff changeset	3863 #if (NGX_HTTP_CACHE)
4c658be4ab63 fix building --without-http-cache, introduced in r2664 and later Igor Sysoev <igor@sysoev.ru> parents: 2704 diff changeset	3864 {
2666 81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	3865 time_t expires;
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	3866
2786 4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	3867 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	3868 return NGX_OK;
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	3869 }
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	3870
2666 81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	3871 if (r->cache == NULL) {
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	3872 return NGX_OK;
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	3873 }
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	3874
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	3875 if (r->cache->valid_sec != 0) {
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	3876 return NGX_OK;
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	3877 }
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	3878
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	3879 expires = ngx_http_parse_time(h->value.data, h->value.len);
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	3880
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	3881 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	3882 u->cacheable = 0;
2666 81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	3883 return NGX_OK;
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	3884 }
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	3885
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	3886 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	3887 }
4c658be4ab63 fix building --without-http-cache, introduced in r2664 and later Igor Sysoev <igor@sysoev.ru> parents: 2704 diff changeset	3888 #endif
2666 81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	3889
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	3890 return NGX_OK;
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	3891 }
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	3892
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	3893
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	3894 static ngx_int_t
2663 09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	3895 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	3896 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	3897 {
2786 4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	3898 ngx_http_upstream_t *u;
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	3899
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	3900 u = r->upstream;
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	3901 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	3902
4c658be4ab63 fix building --without-http-cache, introduced in r2664 and later Igor Sysoev <igor@sysoev.ru> parents: 2704 diff changeset	3903 #if (NGX_HTTP_CACHE)
4c658be4ab63 fix building --without-http-cache, introduced in r2664 and later Igor Sysoev <igor@sysoev.ru> parents: 2704 diff changeset	3904 {
2663 09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	3905 u_char *p;
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	3906 size_t len;
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	3907 ngx_int_t n;
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	3908
2786 4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	3909 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	3910 return NGX_OK;
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	3911 }
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	3912
2663 09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	3913 if (r->cache == NULL) {
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	3914 return NGX_OK;
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	3915 }
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	3916
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	3917 len = h->value.len;
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	3918 p = h->value.data;
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	3919
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	3920 if (p[0] != '@') {
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	3921 n = ngx_atoi(p, len);
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	3922
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	3923 switch (n) {
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	3924 case 0:
2786 4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	3925 u->cacheable = 0;
4546 4988fa232629 For the sake of case/switch code readability, 'fall through' Maxim Konovalov <maxim@nginx.com> parents: 4499 diff changeset	3926 /* fall through */
4988fa232629 For the sake of case/switch code readability, 'fall through' Maxim Konovalov <maxim@nginx.com> parents: 4499 diff changeset	3927
2663 09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	3928 case NGX_ERROR:
2667 c1ac00c2bc75 update r2664 Igor Sysoev <igor@sysoev.ru> parents: 2666 diff changeset	3929 return NGX_OK;
2663 09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	3930
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	3931 default:
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	3932 r->cache->valid_sec = ngx_time() + n;
2667 c1ac00c2bc75 update r2664 Igor Sysoev <igor@sysoev.ru> parents: 2666 diff changeset	3933 return NGX_OK;
2663 09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	3934 }
2667 c1ac00c2bc75 update r2664 Igor Sysoev <igor@sysoev.ru> parents: 2666 diff changeset	3935 }
c1ac00c2bc75 update r2664 Igor Sysoev <igor@sysoev.ru> parents: 2666 diff changeset	3936
c1ac00c2bc75 update r2664 Igor Sysoev <igor@sysoev.ru> parents: 2666 diff changeset	3937 p++;
c1ac00c2bc75 update r2664 Igor Sysoev <igor@sysoev.ru> parents: 2666 diff changeset	3938 len--;
c1ac00c2bc75 update r2664 Igor Sysoev <igor@sysoev.ru> parents: 2666 diff changeset	3939
c1ac00c2bc75 update r2664 Igor Sysoev <igor@sysoev.ru> parents: 2666 diff changeset	3940 n = ngx_atoi(p, len);
c1ac00c2bc75 update r2664 Igor Sysoev <igor@sysoev.ru> parents: 2666 diff changeset	3941
c1ac00c2bc75 update r2664 Igor Sysoev <igor@sysoev.ru> parents: 2666 diff changeset	3942 if (n != NGX_ERROR) {
c1ac00c2bc75 update r2664 Igor Sysoev <igor@sysoev.ru> parents: 2666 diff changeset	3943 r->cache->valid_sec = n;
2663 09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	3944 }
2708 4c658be4ab63 fix building --without-http-cache, introduced in r2664 and later Igor Sysoev <igor@sysoev.ru> parents: 2704 diff changeset	3945 }
4c658be4ab63 fix building --without-http-cache, introduced in r2664 and later Igor Sysoev <igor@sysoev.ru> parents: 2704 diff changeset	3946 #endif
2663 09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	3947
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	3948 return NGX_OK;
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	3949 }
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	3950
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	3951
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	3952 static ngx_int_t
527 7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	3953 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	3954 ngx_uint_t offset)
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3955 {
4197 cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	3956 ngx_int_t n;
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	3957 ngx_http_upstream_t *u;
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	3958
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	3959 u = r->upstream;
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	3960 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	3961
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	3962 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	3963 return NGX_OK;
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	3964 }
527 7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	3965
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	3966 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	3967
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	3968 if (n != NGX_ERROR) {
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	3969 r->limit_rate = (size_t) n;
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	3970 }
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	3971
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	3972 return NGX_OK;
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	3973 }
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	3974
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	3975
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	3976 static ngx_int_t
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	3977 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	3978 ngx_uint_t offset)
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	3979 {
4197 cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	3980 u_char c0, c1, c2;
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	3981 ngx_http_upstream_t *u;
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	3982
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	3983 u = r->upstream;
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	3984
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	3985 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	3986 return NGX_OK;
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	3987 }
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	3988
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	3989 if (u->conf->change_buffering) {
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	3990
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	3991 if (h->value.len == 2) {
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	3992 c0 = ngx_tolower(h->value.data[0]);
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	3993 c1 = ngx_tolower(h->value.data[1]);
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	3994
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	3995 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	3996 u->buffering = 0;
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	3997 }
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	3998
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	3999 } else if (h->value.len == 3) {
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4000 c0 = ngx_tolower(h->value.data[0]);
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4001 c1 = ngx_tolower(h->value.data[1]);
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4002 c2 = ngx_tolower(h->value.data[2]);
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4003
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4004 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	4005 u->buffering = 1;
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4006 }
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4007 }
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4008 }
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4009
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4010 return NGX_OK;
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4011 }
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4012
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4013
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	4014 static ngx_int_t
657 400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4015 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	4016 ngx_uint_t offset)
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4017 {
4197 cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	4018 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	4019 return NGX_OK;
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	4020 }
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	4021
657 400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4022 r->headers_out.override_charset = &h->value;
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4023
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4024 return NGX_OK;
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4025 }
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4026
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4027
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4028 static ngx_int_t
4124 0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	4029 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	4030 ngx_uint_t offset)
0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	4031 {
0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	4032 r->upstream->headers_in.connection = h;
0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	4033
0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	4034 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	4035 (u_char *) "close", 5 - 1)
0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	4036 != NULL)
0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	4037 {
0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	4038 r->upstream->headers_in.connection_close = 1;
0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	4039 }
0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	4040
0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	4041 return NGX_OK;
0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	4042 }
0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	4043
0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	4044
0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	4045 static ngx_int_t
4123 0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	4046 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	4047 ngx_table_elt_t *h, ngx_uint_t offset)
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	4048 {
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	4049 r->upstream->headers_in.transfer_encoding = h;
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	4050
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	4051 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	4052 (u_char *) "chunked", 7 - 1)
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	4053 != NULL)
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	4054 {
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	4055 r->upstream->headers_in.chunked = 1;
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	4056 }
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	4057
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	4058 return NGX_OK;
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	4059 }
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	4060
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	4061
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	4062 static ngx_int_t
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4063 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	4064 ngx_uint_t offset)
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4065 {
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4066 ngx_table_elt_t ho, *ph;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4067
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4068 ho = ngx_list_push(&r->headers_out.headers);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4069 if (ho == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4070 return NGX_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4071 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4072
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4073 ho = h;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4074
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4075 if (offset) {
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4076 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	4077 *ph = ho;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4078 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4079
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4080 return NGX_OK;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4081 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4082
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4083
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4084 static ngx_int_t
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4085 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	4086 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	4087 {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4088 ngx_array_t *pa;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4089 ngx_table_elt_t ho, *ph;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4090
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4091 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	4092
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4093 if (pa->elts == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4094 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	4095 {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4096 return NGX_ERROR;
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 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4099
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4100 ph = ngx_array_push(pa);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4101 if (ph == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4102 return NGX_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4103 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4104
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4105 ho = ngx_list_push(&r->headers_out.headers);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4106 if (ho == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4107 return NGX_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4108 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4109
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4110 ho = h;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4111 *ph = ho;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4112
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4113 return NGX_OK;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4114 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4115
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4116
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4117 static ngx_int_t
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4118 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	4119 ngx_uint_t offset)
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4120 {
657 400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4121 u_char p, last;
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4122
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4123 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	4124 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	4125 r->headers_out.content_type_lowcase = NULL;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4126
657 400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4127 for (p = h->value.data; *p; p++) {
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4128
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4129 if (*p != ';') {
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4130 continue;
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4131 }
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4132
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4133 last = p;
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4134
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4135 while (++p == ' ') { / void */ }
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4136
1968 3c540ad3021f fix segfault Igor Sysoev <igor@sysoev.ru> parents: 1959 diff changeset	4137 if (*p == '\0') {
3c540ad3021f fix segfault Igor Sysoev <igor@sysoev.ru> parents: 1959 diff changeset	4138 return NGX_OK;
3c540ad3021f fix segfault Igor Sysoev <igor@sysoev.ru> parents: 1959 diff changeset	4139 }
3c540ad3021f fix segfault Igor Sysoev <igor@sysoev.ru> parents: 1959 diff changeset	4140
1107 db7c468c447d ngx_strcasecmp()/ngx_strncasecmp() Igor Sysoev <igor@sysoev.ru> parents: 1098 diff changeset	4141 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	4142 continue;
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4143 }
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4144
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4145 p += 8;
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4146
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4147 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	4148
2244 f5a9f35e8344 strip charset name quotes Igor Sysoev <igor@sysoev.ru> parents: 2184 diff changeset	4149 if (*p == '"') {
f5a9f35e8344 strip charset name quotes Igor Sysoev <igor@sysoev.ru> parents: 2184 diff changeset	4150 p++;
f5a9f35e8344 strip charset name quotes Igor Sysoev <igor@sysoev.ru> parents: 2184 diff changeset	4151 }
f5a9f35e8344 strip charset name quotes Igor Sysoev <igor@sysoev.ru> parents: 2184 diff changeset	4152
f5a9f35e8344 strip charset name quotes Igor Sysoev <igor@sysoev.ru> parents: 2184 diff changeset	4153 last = h->value.data + h->value.len;
f5a9f35e8344 strip charset name quotes Igor Sysoev <igor@sysoev.ru> parents: 2184 diff changeset	4154
f5a9f35e8344 strip charset name quotes Igor Sysoev <igor@sysoev.ru> parents: 2184 diff changeset	4155 if (*(last - 1) == '"') {
f5a9f35e8344 strip charset name quotes Igor Sysoev <igor@sysoev.ru> parents: 2184 diff changeset	4156 last--;
f5a9f35e8344 strip charset name quotes Igor Sysoev <igor@sysoev.ru> parents: 2184 diff changeset	4157 }
f5a9f35e8344 strip charset name quotes Igor Sysoev <igor@sysoev.ru> parents: 2184 diff changeset	4158
f5a9f35e8344 strip charset name quotes Igor Sysoev <igor@sysoev.ru> parents: 2184 diff changeset	4159 r->headers_out.charset.len = last - p;
657 400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4160 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	4161
c6c42497106c fix segfault if upstream sends trailing ";" in "charset=" Igor Sysoev <igor@sysoev.ru> parents: 1109 diff changeset	4162 return NGX_OK;
657 400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4163 }
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	4164
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4165 return NGX_OK;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4166 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4167
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4168
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4169 static ngx_int_t
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4170 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	4171 ngx_uint_t offset)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4172 {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4173 ngx_table_elt_t *ho;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4174
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4175 ho = ngx_list_push(&r->headers_out.headers);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4176 if (ho == NULL) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4177 return NGX_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4178 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4179
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4180 ho = h;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4181
3004 4121acaf7a04 fix handling "Last-Modified" and "Accept-Ranges" for upstream responses Igor Sysoev <igor@sysoev.ru> parents: 3003 diff changeset	4182 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	4183
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4184 #if (NGX_HTTP_CACHE)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4185
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	4186 if (r->upstream->cacheable) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4187 r->headers_out.last_modified_time = ngx_http_parse_time(h->value.data,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4188 h->value.len);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4189 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4190
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4191 #endif
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4192
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4193 return NGX_OK;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4194 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4195
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4196
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4197 static ngx_int_t
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4198 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	4199 ngx_uint_t offset)
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 ngx_int_t rc;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4202 ngx_table_elt_t *ho;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4203
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4204 ho = ngx_list_push(&r->headers_out.headers);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4205 if (ho == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4206 return NGX_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4207 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4208
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4209 ho = h;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4210
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4211 if (r->upstream->rewrite_redirect) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4212 rc = r->upstream->rewrite_redirect(r, ho, 0);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4213
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	4214 if (rc == NGX_DECLINED) {
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	4215 return NGX_OK;
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	4216 }
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	4217
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4218 if (rc == NGX_OK) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4219 r->headers_out.location = ho;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4220
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4221 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	4222 "rewritten location: \"%V\"", &ho->value);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4223 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4224
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4225 return rc;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4226 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4227
1653 ea681a6a0c61 set r->headers_out.location for non-local redirects Igor Sysoev <igor@sysoev.ru> parents: 1640 diff changeset	4228 if (ho->value.data[0] != '/') {
ea681a6a0c61 set r->headers_out.location for non-local redirects Igor Sysoev <igor@sysoev.ru> parents: 1640 diff changeset	4229 r->headers_out.location = ho;
ea681a6a0c61 set r->headers_out.location for non-local redirects Igor Sysoev <igor@sysoev.ru> parents: 1640 diff changeset	4230 }
ea681a6a0c61 set r->headers_out.location for non-local redirects Igor Sysoev <igor@sysoev.ru> parents: 1640 diff changeset	4231
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4232 /*
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4233 * 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	4234 * 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	4235 */
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4236
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4237 return NGX_OK;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4238 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4239
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4240
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4241 static ngx_int_t
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4242 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	4243 ngx_uint_t offset)
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4244 {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4245 u_char *p;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4246 ngx_int_t rc;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4247 ngx_table_elt_t *ho;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4248
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4249 ho = ngx_list_push(&r->headers_out.headers);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4250 if (ho == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4251 return NGX_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4252 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4253
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4254 ho = h;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4255
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4256 if (r->upstream->rewrite_redirect) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4257
1549 099d8470e6c3 pass length clearly Igor Sysoev <igor@sysoev.ru> parents: 1543 diff changeset	4258 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	4259
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4260 if (p) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4261 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	4262
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4263 } else {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4264 return NGX_OK;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4265 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4266
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	4267 if (rc == NGX_DECLINED) {
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	4268 return NGX_OK;
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	4269 }
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	4270
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4271 if (rc == NGX_OK) {
1654 e5c547a225bd r->headers_out.refresh Igor Sysoev <igor@sysoev.ru> parents: 1653 diff changeset	4272 r->headers_out.refresh = ho;
e5c547a225bd r->headers_out.refresh Igor Sysoev <igor@sysoev.ru> parents: 1653 diff changeset	4273
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4274 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	4275 "rewritten refresh: \"%V\"", &ho->value);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4276 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4277
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4278 return rc;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4279 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4280
1654 e5c547a225bd r->headers_out.refresh Igor Sysoev <igor@sysoev.ru> parents: 1653 diff changeset	4281 r->headers_out.refresh = ho;
e5c547a225bd r->headers_out.refresh Igor Sysoev <igor@sysoev.ru> parents: 1653 diff changeset	4282
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4283 return NGX_OK;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4284 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4285
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4286
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4287 static ngx_int_t
4464 7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	4288 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	4289 ngx_uint_t offset)
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	4290 {
4650 b38fea6f9a15 Fixed returned value handling from the cookie rewrite handler. Valentin Bartenev <vbart@nginx.com> parents: 4572 diff changeset	4291 ngx_int_t rc;
4464 7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	4292 ngx_table_elt_t *ho;
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	4293
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	4294 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	4295 if (ho == NULL) {
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	4296 return NGX_ERROR;
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	4297 }
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	4298
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	4299 ho = h;
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	4300
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	4301 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	4302 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	4303
b38fea6f9a15 Fixed returned value handling from the cookie rewrite handler. Valentin Bartenev <vbart@nginx.com> parents: 4572 diff changeset	4304 if (rc == NGX_DECLINED) {
b38fea6f9a15 Fixed returned value handling from the cookie rewrite handler. Valentin Bartenev <vbart@nginx.com> parents: 4572 diff changeset	4305 return NGX_OK;
b38fea6f9a15 Fixed returned value handling from the cookie rewrite handler. Valentin Bartenev <vbart@nginx.com> parents: 4572 diff changeset	4306 }
b38fea6f9a15 Fixed returned value handling from the cookie rewrite handler. Valentin Bartenev <vbart@nginx.com> parents: 4572 diff changeset	4307
b38fea6f9a15 Fixed returned value handling from the cookie rewrite handler. Valentin Bartenev <vbart@nginx.com> parents: 4572 diff changeset	4308 #if (NGX_DEBUG)
b38fea6f9a15 Fixed returned value handling from the cookie rewrite handler. Valentin Bartenev <vbart@nginx.com> parents: 4572 diff changeset	4309 if (rc == NGX_OK) {
b38fea6f9a15 Fixed returned value handling from the cookie rewrite handler. Valentin Bartenev <vbart@nginx.com> parents: 4572 diff changeset	4310 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	4311 "rewritten cookie: \"%V\"", &ho->value);
b38fea6f9a15 Fixed returned value handling from the cookie rewrite handler. Valentin Bartenev <vbart@nginx.com> parents: 4572 diff changeset	4312 }
b38fea6f9a15 Fixed returned value handling from the cookie rewrite handler. Valentin Bartenev <vbart@nginx.com> parents: 4572 diff changeset	4313 #endif
b38fea6f9a15 Fixed returned value handling from the cookie rewrite handler. Valentin Bartenev <vbart@nginx.com> parents: 4572 diff changeset	4314
b38fea6f9a15 Fixed returned value handling from the cookie rewrite handler. Valentin Bartenev <vbart@nginx.com> parents: 4572 diff changeset	4315 return rc;
4464 7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	4316 }
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	4317
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	4318 return NGX_OK;
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	4319 }
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	4320
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	4321
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	4322 static ngx_int_t
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4323 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	4324 ngx_table_elt_t *h, ngx_uint_t offset)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4325 {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4326 ngx_table_elt_t *ho;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4327
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4328 #if (NGX_HTTP_CACHE)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4329
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4330 if (r->cached) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4331 r->allow_ranges = 1;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4332 return NGX_OK;
5621 345e4fd4bb64 Range filter: single_range flag in request. Maxim Dounin <mdounin@mdounin.ru> parents: 5581 diff changeset	4333 }
345e4fd4bb64 Range filter: single_range flag in request. Maxim Dounin <mdounin@mdounin.ru> parents: 5581 diff changeset	4334
345e4fd4bb64 Range filter: single_range flag in request. Maxim Dounin <mdounin@mdounin.ru> parents: 5581 diff changeset	4335 if (r->upstream->cacheable) {
345e4fd4bb64 Range filter: single_range flag in request. Maxim Dounin <mdounin@mdounin.ru> parents: 5581 diff changeset	4336 r->allow_ranges = 1;
345e4fd4bb64 Range filter: single_range flag in request. Maxim Dounin <mdounin@mdounin.ru> parents: 5581 diff changeset	4337 r->single_range = 1;
345e4fd4bb64 Range filter: single_range flag in request. Maxim Dounin <mdounin@mdounin.ru> parents: 5581 diff changeset	4338 return NGX_OK;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4339 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4340
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4341 #endif
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4342
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4343 ho = ngx_list_push(&r->headers_out.headers);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4344 if (ho == NULL) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4345 return NGX_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4346 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4347
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4348 ho = h;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4349
3004 4121acaf7a04 fix handling "Last-Modified" and "Accept-Ranges" for upstream responses Igor Sysoev <igor@sysoev.ru> parents: 3003 diff changeset	4350 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	4351
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4352 return NGX_OK;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4353 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4354
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4355
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4356 #if (NGX_HTTP_GZIP)
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4357
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4358 static ngx_int_t
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4359 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	4360 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	4361 {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4362 ngx_table_elt_t *ho;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4363
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4364 ho = ngx_list_push(&r->headers_out.headers);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4365 if (ho == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4366 return NGX_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4367 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4368
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4369 ho = h;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4370
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4371 r->headers_out.content_encoding = ho;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4372
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4373 return NGX_OK;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4374 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4375
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4376 #endif
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4377
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4378
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	4379 static ngx_int_t
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4380 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	4381 {
880 3b763d36e055 axe old % log format Igor Sysoev <igor@sysoev.ru> parents: 850 diff changeset	4382 ngx_http_variable_t var, v;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4383
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4384 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	4385 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	4386 if (var == NULL) {
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4387 return NGX_ERROR;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4388 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4389
637 e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 629 diff changeset	4390 var->get_handler = v->get_handler;
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4391 var->data = v->data;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4392 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4393
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4394 return NGX_OK;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4395 }
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4396
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4397
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4398 static ngx_int_t
1181 ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4399 ngx_http_upstream_addr_variable(ngx_http_request_t *r,
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4400 ngx_http_variable_value_t *v, uintptr_t data)
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4401 {
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4402 u_char *p;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4403 size_t len;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4404 ngx_uint_t i;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4405 ngx_http_upstream_state_t *state;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4406
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4407 v->valid = 1;
1565 4c43e25d11ea fix English grammar Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	4408 v->no_cacheable = 0;
1181 ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4409 v->not_found = 0;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4410
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4411 if (r->upstream_states == NULL \|\| r->upstream_states->nelts == 0) {
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4412 v->not_found = 1;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4413 return NGX_OK;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4414 }
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4415
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4416 len = 0;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4417 state = r->upstream_states->elts;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4418
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4419 for (i = 0; i < r->upstream_states->nelts; i++) {
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4420 if (state[i].peer) {
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4421 len += state[i].peer->len + 2;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4422
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4423 } else {
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4424 len += 3;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4425 }
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4426 }
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4427
2049 2a92804f4109 ) back out r2040 Igor Sysoev <igor@sysoev.ru>* parents: 1973 diff changeset	4428 p = ngx_pnalloc(r->pool, len);
1181 ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4429 if (p == NULL) {
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4430 return NGX_ERROR;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4431 }
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4432
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4433 v->data = p;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4434
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4435 i = 0;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4436
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4437 for ( ;; ) {
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4438 if (state[i].peer) {
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4439 p = ngx_cpymem(p, state[i].peer->data, state[i].peer->len);
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4440 }
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4441
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4442 if (++i == r->upstream_states->nelts) {
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4443 break;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4444 }
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4445
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4446 if (state[i].peer) {
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4447 *p++ = ',';
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4448 *p++ = ' ';
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4449
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4450 } else {
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4451 *p++ = ' ';
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4452 *p++ = ':';
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4453 *p++ = ' ';
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4454
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4455 if (++i == r->upstream_states->nelts) {
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4456 break;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4457 }
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4458
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4459 continue;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4460 }
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4461 }
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4462
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4463 v->len = p - v->data;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4464
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4465 return NGX_OK;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4466 }
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4467
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4468
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	4469 static ngx_int_t
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4470 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	4471 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	4472 {
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4473 u_char *p;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4474 size_t len;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4475 ngx_uint_t i;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4476 ngx_http_upstream_state_t *state;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4477
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4478 v->valid = 1;
1565 4c43e25d11ea fix English grammar Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	4479 v->no_cacheable = 0;
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4480 v->not_found = 0;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4481
1168 4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4482 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	4483 v->not_found = 1;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4484 return NGX_OK;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4485 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4486
1168 4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4487 len = r->upstream_states->nelts * (3 + 2);
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4488
2049 2a92804f4109 ) back out r2040 Igor Sysoev <igor@sysoev.ru>* parents: 1973 diff changeset	4489 p = ngx_pnalloc(r->pool, len);
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4490 if (p == NULL) {
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4491 return NGX_ERROR;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4492 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4493
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4494 v->data = p;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4495
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4496 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	4497 state = r->upstream_states->elts;
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4498
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4499 for ( ;; ) {
1168 4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4500 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	4501 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	4502
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4503 } else {
1168 4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4504 *p++ = '-';
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4505 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4506
1168 4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4507 if (++i == r->upstream_states->nelts) {
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4508 break;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4509 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4510
1168 4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4511 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	4512 *p++ = ',';
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4513 *p++ = ' ';
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4514
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4515 } else {
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4516 *p++ = ' ';
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4517 *p++ = ':';
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4518 *p++ = ' ';
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4519
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4520 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	4521 break;
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4522 }
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4523
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4524 continue;
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4525 }
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4526 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4527
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4528 v->len = p - v->data;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4529
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4530 return NGX_OK;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4531 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4532
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4533
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4534 static ngx_int_t
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4535 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	4536 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	4537 {
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4538 u_char *p;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4539 size_t len;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4540 ngx_uint_t i;
889 a9a7e4b1a72b the previous fix does not actually fix overflow Igor Sysoev <igor@sysoev.ru> parents: 888 diff changeset	4541 ngx_msec_int_t ms;
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4542 ngx_http_upstream_state_t *state;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4543
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4544 v->valid = 1;
1565 4c43e25d11ea fix English grammar Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	4545 v->no_cacheable = 0;
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4546 v->not_found = 0;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4547
1168 4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4548 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	4549 v->not_found = 1;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4550 return NGX_OK;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4551 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4552
1168 4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4553 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	4554
2049 2a92804f4109 ) back out r2040 Igor Sysoev <igor@sysoev.ru>* parents: 1973 diff changeset	4555 p = ngx_pnalloc(r->pool, len);
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4556 if (p == NULL) {
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4557 return NGX_ERROR;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4558 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4559
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4560 v->data = p;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4561
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4562 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	4563 state = r->upstream_states->elts;
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4564
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4565 for ( ;; ) {
1168 4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4566 if (state[i].status) {
1640 02a22cd5282a 64-bit time_t compatibility Igor Sysoev <igor@sysoev.ru> parents: 1565 diff changeset	4567 ms = (ngx_msec_int_t)
02a22cd5282a 64-bit time_t compatibility Igor Sysoev <igor@sysoev.ru> parents: 1565 diff changeset	4568 (state[i].response_sec * 1000 + state[i].response_msec);
3515 76d252724db5 use ngx_min() and ngx_max() Igor Sysoev <igor@sysoev.ru> parents: 3514 diff changeset	4569 ms = ngx_max(ms, 0);
5368 cd46297325bd Upstream: fixed $upstream_response_time format specifiers. Maxim Dounin <mdounin@mdounin.ru> parents: 5353 diff changeset	4570 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	4571
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4572 } else {
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4573 *p++ = '-';
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4574 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4575
1168 4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4576 if (++i == r->upstream_states->nelts) {
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4577 break;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4578 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4579
1168 4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4580 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	4581 *p++ = ',';
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4582 *p++ = ' ';
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4583
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4584 } else {
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4585 *p++ = ' ';
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4586 *p++ = ':';
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4587 *p++ = ' ';
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4588
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4589 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	4590 break;
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4591 }
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4592
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4593 continue;
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	4594 }
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4595 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4596
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4597 v->len = p - v->data;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4598
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4599 return NGX_OK;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4600 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4601
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	4602
2402 cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4603 static ngx_int_t
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4604 ngx_http_upstream_response_length_variable(ngx_http_request_t *r,
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4605 ngx_http_variable_value_t *v, uintptr_t data)
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4606 {
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4607 u_char *p;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4608 size_t len;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4609 ngx_uint_t i;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4610 ngx_http_upstream_state_t *state;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4611
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4612 v->valid = 1;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4613 v->no_cacheable = 0;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4614 v->not_found = 0;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4615
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4616 if (r->upstream_states == NULL \|\| r->upstream_states->nelts == 0) {
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4617 v->not_found = 1;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4618 return NGX_OK;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4619 }
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4620
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4621 len = r->upstream_states->nelts * (NGX_OFF_T_LEN + 2);
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4622
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4623 p = ngx_pnalloc(r->pool, len);
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4624 if (p == NULL) {
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4625 return NGX_ERROR;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4626 }
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4627
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4628 v->data = p;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4629
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4630 i = 0;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4631 state = r->upstream_states->elts;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4632
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4633 for ( ;; ) {
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4634 p = ngx_sprintf(p, "%O", state[i].response_length);
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4635
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4636 if (++i == r->upstream_states->nelts) {
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4637 break;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4638 }
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4639
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4640 if (state[i].peer) {
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4641 *p++ = ',';
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4642 *p++ = ' ';
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4643
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4644 } else {
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4645 *p++ = ' ';
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4646 *p++ = ':';
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4647 *p++ = ' ';
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4648
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4649 if (++i == r->upstream_states->nelts) {
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4650 break;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4651 }
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4652
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4653 continue;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4654 }
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4655 }
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4656
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4657 v->len = p - v->data;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4658
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4659 return NGX_OK;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4660 }
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4661
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4662
1162 f59d15404269 $upstream_http_... variables Igor Sysoev <igor@sysoev.ru> parents: 1153 diff changeset	4663 ngx_int_t
f59d15404269 $upstream_http_... variables Igor Sysoev <igor@sysoev.ru> parents: 1153 diff changeset	4664 ngx_http_upstream_header_variable(ngx_http_request_t *r,
f59d15404269 $upstream_http_... variables Igor Sysoev <igor@sysoev.ru> parents: 1153 diff changeset	4665 ngx_http_variable_value_t *v, uintptr_t data)
f59d15404269 $upstream_http_... variables Igor Sysoev <igor@sysoev.ru> parents: 1153 diff changeset	4666 {
f59d15404269 $upstream_http_... variables Igor Sysoev <igor@sysoev.ru> parents: 1153 diff changeset	4667 if (r->upstream == NULL) {
f59d15404269 $upstream_http_... variables Igor Sysoev <igor@sysoev.ru> parents: 1153 diff changeset	4668 v->not_found = 1;
f59d15404269 $upstream_http_... variables Igor Sysoev <igor@sysoev.ru> parents: 1153 diff changeset	4669 return NGX_OK;
f59d15404269 $upstream_http_... variables Igor Sysoev <igor@sysoev.ru> parents: 1153 diff changeset	4670 }
f59d15404269 $upstream_http_... variables Igor Sysoev <igor@sysoev.ru> parents: 1153 diff changeset	4671
f59d15404269 $upstream_http_... variables Igor Sysoev <igor@sysoev.ru> parents: 1153 diff changeset	4672 return ngx_http_variable_unknown_header(v, (ngx_str_t *) data,
f59d15404269 $upstream_http_... variables Igor Sysoev <igor@sysoev.ru> parents: 1153 diff changeset	4673 &r->upstream->headers_in.headers.part,
f59d15404269 $upstream_http_... variables Igor Sysoev <igor@sysoev.ru> parents: 1153 diff changeset	4674 sizeof("upstream_http_") - 1);
f59d15404269 $upstream_http_... variables Igor Sysoev <igor@sysoev.ru> parents: 1153 diff changeset	4675 }
f59d15404269 $upstream_http_... variables Igor Sysoev <igor@sysoev.ru> parents: 1153 diff changeset	4676
f59d15404269 $upstream_http_... variables Igor Sysoev <igor@sysoev.ru> parents: 1153 diff changeset	4677
5677 3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4678 ngx_int_t
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4679 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	4680 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	4681 {
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4682 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	4683
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4684 ngx_str_t cookie, s;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4685
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4686 if (r->upstream == NULL) {
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4687 v->not_found = 1;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4688 return NGX_OK;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4689 }
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4690
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4691 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	4692 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	4693
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4694 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	4695 &s, &cookie)
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4696 == NGX_DECLINED)
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4697 {
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4698 v->not_found = 1;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4699 return NGX_OK;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4700 }
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4701
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4702 v->len = cookie.len;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4703 v->valid = 1;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4704 v->no_cacheable = 0;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4705 v->not_found = 0;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4706 v->data = cookie.data;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4707
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4708 return NGX_OK;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4709 }
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4710
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4711
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	4712 #if (NGX_HTTP_CACHE)
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	4713
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	4714 ngx_int_t
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	4715 ngx_http_upstream_cache_status(ngx_http_request_t *r,
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	4716 ngx_http_variable_value_t *v, uintptr_t data)
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	4717 {
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	4718 ngx_uint_t n;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	4719
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	4720 if (r->upstream == NULL \|\| r->upstream->cache_status == 0) {
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	4721 v->not_found = 1;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	4722 return NGX_OK;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	4723 }
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	4724
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	4725 n = r->upstream->cache_status - 1;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	4726
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	4727 v->valid = 1;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	4728 v->no_cacheable = 0;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	4729 v->not_found = 0;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	4730 v->len = ngx_http_cache_status[n].len;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	4731 v->data = ngx_http_cache_status[n].data;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	4732
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	4733 return NGX_OK;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	4734 }
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	4735
5441 43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	4736
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	4737 static ngx_int_t
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	4738 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	4739 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	4740 {
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	4741 u_char *p;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	4742
5453 b7b8e2fa7ebd Fixed null pointer dereference with $upstream_cache_last_modified. Ruslan Ermilov <ru@nginx.com> parents: 5441 diff changeset	4743 if (r->upstream == NULL
b7b8e2fa7ebd Fixed null pointer dereference with $upstream_cache_last_modified. Ruslan Ermilov <ru@nginx.com> parents: 5441 diff changeset	4744 \|\| !r->upstream->conf->cache_revalidate
5441 43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	4745 \|\| r->upstream->cache_status != NGX_HTTP_CACHE_EXPIRED
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	4746 \|\| r->cache->last_modified == -1)
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	4747 {
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	4748 v->not_found = 1;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	4749 return NGX_OK;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	4750 }
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	4751
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	4752 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	4753 if (p == NULL) {
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	4754 return NGX_ERROR;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	4755 }
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	4756
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	4757 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	4758 v->valid = 1;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	4759 v->no_cacheable = 0;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	4760 v->not_found = 0;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	4761 v->data = p;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	4762
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	4763 return NGX_OK;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	4764 }
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	4765
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	4766 #endif
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	4767
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	4768
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4769 static char *
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4770 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	4771 {
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4772 char *rv;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4773 void *mconf;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4774 ngx_str_t *value;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4775 ngx_url_t u;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4776 ngx_uint_t m;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4777 ngx_conf_t pcf;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4778 ngx_http_module_t *module;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4779 ngx_http_conf_ctx_t ctx, http_ctx;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4780 ngx_http_upstream_srv_conf_t *uscf;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4781
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4782 ngx_memzero(&u, sizeof(ngx_url_t));
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4783
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4784 value = cf->args->elts;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4785 u.host = value[1];
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4786 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	4787 u.no_port = 1;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4788
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4789 uscf = ngx_http_upstream_add(cf, &u, NGX_HTTP_UPSTREAM_CREATE
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4790 \|NGX_HTTP_UPSTREAM_WEIGHT
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4791 \|NGX_HTTP_UPSTREAM_MAX_FAILS
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4792 \|NGX_HTTP_UPSTREAM_FAIL_TIMEOUT
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4793 \|NGX_HTTP_UPSTREAM_DOWN
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4794 \|NGX_HTTP_UPSTREAM_BACKUP);
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4795 if (uscf == NULL) {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4796 return NGX_CONF_ERROR;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4797 }
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4798
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4799
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4800 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	4801 if (ctx == NULL) {
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4802 return NGX_CONF_ERROR;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4803 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4804
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4805 http_ctx = cf->ctx;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4806 ctx->main_conf = http_ctx->main_conf;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4807
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4808 /* the upstream{}'s srv_conf */
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4809
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4810 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	4811 if (ctx->srv_conf == NULL) {
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4812 return NGX_CONF_ERROR;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4813 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4814
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4815 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	4816
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4817 uscf->srv_conf = ctx->srv_conf;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4818
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4819
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4820 /* the upstream{}'s loc_conf */
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4821
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4822 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	4823 if (ctx->loc_conf == NULL) {
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4824 return NGX_CONF_ERROR;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4825 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4826
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4827 for (m = 0; ngx_modules[m]; m++) {
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4828 if (ngx_modules[m]->type != NGX_HTTP_MODULE) {
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4829 continue;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4830 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4831
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4832 module = ngx_modules[m]->ctx;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4833
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4834 if (module->create_srv_conf) {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4835 mconf = module->create_srv_conf(cf);
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4836 if (mconf == NULL) {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4837 return NGX_CONF_ERROR;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4838 }
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4839
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4840 ctx->srv_conf[ngx_modules[m]->ctx_index] = mconf;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4841 }
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4842
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4843 if (module->create_loc_conf) {
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4844 mconf = module->create_loc_conf(cf);
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4845 if (mconf == NULL) {
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4846 return NGX_CONF_ERROR;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4847 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4848
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4849 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	4850 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4851 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4852
5728 63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	4853 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	4854 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	4855 if (uscf->servers == NULL) {
63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	4856 return NGX_CONF_ERROR;
63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	4857 }
63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	4858
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4859
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4860 /* parse inside upstream{} */
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4861
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4862 pcf = *cf;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4863 cf->ctx = ctx;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4864 cf->cmd_type = NGX_HTTP_UPS_CONF;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4865
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4866 rv = ngx_conf_parse(cf, NULL);
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4867
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4868 *cf = pcf;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4869
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4870 if (rv != NGX_CONF_OK) {
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4871 return rv;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4872 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4873
5728 63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	4874 if (uscf->servers->nelts == 0) {
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4875 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	4876 "no servers are inside upstream");
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4877 return NGX_CONF_ERROR;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4878 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4879
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4880 return rv;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4881 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4882
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4883
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4884 static char *
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4885 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	4886 {
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4887 ngx_http_upstream_srv_conf_t *uscf = conf;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4888
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4889 time_t fail_timeout;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4890 ngx_str_t *value, s;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4891 ngx_url_t u;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4892 ngx_int_t weight, max_fails;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4893 ngx_uint_t i;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4894 ngx_http_upstream_server_t *us;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4895
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4896 us = ngx_array_push(uscf->servers);
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4897 if (us == NULL) {
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4898 return NGX_CONF_ERROR;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4899 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4900
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4901 ngx_memzero(us, sizeof(ngx_http_upstream_server_t));
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4902
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4903 value = cf->args->elts;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	4904
663 6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 659 diff changeset	4905 weight = 1;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4906 max_fails = 1;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4907 fail_timeout = 10;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4908
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4909 for (i = 2; i < cf->args->nelts; i++) {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4910
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4911 if (ngx_strncmp(value[i].data, "weight=", 7) == 0) {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4912
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4913 if (!(uscf->flags & NGX_HTTP_UPSTREAM_WEIGHT)) {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4914 goto invalid;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4915 }
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4916
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4917 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	4918
6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 659 diff changeset	4919 if (weight == NGX_ERROR \|\| weight == 0) {
6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 659 diff changeset	4920 goto invalid;
6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 659 diff changeset	4921 }
6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 659 diff changeset	4922
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4923 continue;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4924 }
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4925
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4926 if (ngx_strncmp(value[i].data, "max_fails=", 10) == 0) {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4927
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4928 if (!(uscf->flags & NGX_HTTP_UPSTREAM_MAX_FAILS)) {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4929 goto invalid;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4930 }
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4931
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4932 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	4933
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4934 if (max_fails == NGX_ERROR) {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4935 goto invalid;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4936 }
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4937
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4938 continue;
663 6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 659 diff changeset	4939 }
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4940
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4941 if (ngx_strncmp(value[i].data, "fail_timeout=", 13) == 0) {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4942
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4943 if (!(uscf->flags & NGX_HTTP_UPSTREAM_FAIL_TIMEOUT)) {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4944 goto invalid;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4945 }
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4946
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4947 s.len = value[i].len - 13;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4948 s.data = &value[i].data[13];
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4949
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4950 fail_timeout = ngx_parse_time(&s, 1);
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4951
4474 41f640a693de Time parsing cleanup. Maxim Dounin <mdounin@mdounin.ru> parents: 4469 diff changeset	4952 if (fail_timeout == (time_t) NGX_ERROR) {
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4953 goto invalid;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4954 }
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4955
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4956 continue;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4957 }
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4958
5410 16b68c724438 Upstream: fixed "down" and "backup" parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 5392 diff changeset	4959 if (ngx_strcmp(value[i].data, "backup") == 0) {
1378 0be898896d1a backup upstream servers Igor Sysoev <igor@sysoev.ru> parents: 1340 diff changeset	4960
0be898896d1a backup upstream servers Igor Sysoev <igor@sysoev.ru> parents: 1340 diff changeset	4961 if (!(uscf->flags & NGX_HTTP_UPSTREAM_BACKUP)) {
0be898896d1a backup upstream servers Igor Sysoev <igor@sysoev.ru> parents: 1340 diff changeset	4962 goto invalid;
0be898896d1a backup upstream servers Igor Sysoev <igor@sysoev.ru> parents: 1340 diff changeset	4963 }
0be898896d1a backup upstream servers Igor Sysoev <igor@sysoev.ru> parents: 1340 diff changeset	4964
0be898896d1a backup upstream servers Igor Sysoev <igor@sysoev.ru> parents: 1340 diff changeset	4965 us->backup = 1;
0be898896d1a backup upstream servers Igor Sysoev <igor@sysoev.ru> parents: 1340 diff changeset	4966
0be898896d1a backup upstream servers Igor Sysoev <igor@sysoev.ru> parents: 1340 diff changeset	4967 continue;
0be898896d1a backup upstream servers Igor Sysoev <igor@sysoev.ru> parents: 1340 diff changeset	4968 }
0be898896d1a backup upstream servers Igor Sysoev <igor@sysoev.ru> parents: 1340 diff changeset	4969
5410 16b68c724438 Upstream: fixed "down" and "backup" parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 5392 diff changeset	4970 if (ngx_strcmp(value[i].data, "down") == 0) {
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4971
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4972 if (!(uscf->flags & NGX_HTTP_UPSTREAM_DOWN)) {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4973 goto invalid;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4974 }
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4975
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4976 us->down = 1;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4977
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4978 continue;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4979 }
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4980
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4981 goto invalid;
663 6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 659 diff changeset	4982 }
6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 659 diff changeset	4983
5728 63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	4984 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	4985
63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	4986 u.url = value[1];
63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	4987 u.default_port = 80;
63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	4988
63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	4989 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	4990 if (u.err) {
63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	4991 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	4992 "%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	4993 }
63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	4994
63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	4995 return NGX_CONF_ERROR;
63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	4996 }
63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	4997
5717 efc84a5723b3 Upstream: generic hash module. Roman Arutyunyan <arut@nginx.com> parents: 5682 diff changeset	4998 us->name = u.url;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4999 us->addrs = u.addrs;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5000 us->naddrs = u.naddrs;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5001 us->weight = weight;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5002 us->max_fails = max_fails;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5003 us->fail_timeout = fail_timeout;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5004
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5005 return NGX_CONF_OK;
663 6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 659 diff changeset	5006
6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 659 diff changeset	5007 invalid:
6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 659 diff changeset	5008
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5009 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5010 "invalid parameter \"%V\"", &value[i]);
663 6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 659 diff changeset	5011
6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 659 diff changeset	5012 return NGX_CONF_ERROR;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5013 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5014
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5015
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5016 ngx_http_upstream_srv_conf_t *
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5017 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	5018 {
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5019 ngx_uint_t i;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5020 ngx_http_upstream_server_t *us;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5021 ngx_http_upstream_srv_conf_t uscf, *uscfp;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5022 ngx_http_upstream_main_conf_t *umcf;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5023
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5024 if (!(flags & NGX_HTTP_UPSTREAM_CREATE)) {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5025
1559 fe11e2a3946d use pool instead of ngx_conf_t Igor Sysoev <igor@sysoev.ru> parents: 1558 diff changeset	5026 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	5027 if (u->err) {
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5028 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	5029 "%s in upstream \"%V\"", u->err, &u->url);
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5030 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5031
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5032 return NULL;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5033 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5034 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5035
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5036 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	5037
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5038 uscfp = umcf->upstreams.elts;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5039
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5040 for (i = 0; i < umcf->upstreams.nelts; i++) {
906 a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	5041
a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	5042 if (uscfp[i]->host.len != u->host.len
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5043 \|\| 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	5044 != 0)
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5045 {
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5046 continue;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5047 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5048
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5049 if ((flags & NGX_HTTP_UPSTREAM_CREATE)
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5050 && (uscfp[i]->flags & NGX_HTTP_UPSTREAM_CREATE))
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5051 {
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5052 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5053 "duplicate upstream \"%V\"", &u->host);
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5054 return NULL;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5055 }
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5056
5005 c9059bd5445b Fixed "proxy_pass" with IP address and no port (ticket #276). Ruslan Ermilov <ru@nginx.com> parents: 4990 diff changeset	5057 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	5058 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
906 a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	5059 "upstream \"%V\" may not have port %d",
a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	5060 &u->host, u->port);
a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	5061 return NULL;
a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	5062 }
a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	5063
5005 c9059bd5445b Fixed "proxy_pass" with IP address and no port (ticket #276). Ruslan Ermilov <ru@nginx.com> parents: 4990 diff changeset	5064 if ((flags & NGX_HTTP_UPSTREAM_CREATE) && !uscfp[i]->no_port) {
906 a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	5065 ngx_log_error(NGX_LOG_WARN, cf->log, 0,
a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	5066 "upstream \"%V\" may not have port %d in %s:%ui",
a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	5067 &u->host, uscfp[i]->port,
1489 56f1ea5baabb u_char* is enough to keep file name Igor Sysoev <igor@sysoev.ru> parents: 1469 diff changeset	5068 uscfp[i]->file_name, uscfp[i]->line);
906 a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	5069 return NULL;
a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	5070 }
a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	5071
5005 c9059bd5445b Fixed "proxy_pass" with IP address and no port (ticket #276). Ruslan Ermilov <ru@nginx.com> parents: 4990 diff changeset	5072 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	5073 && 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	5074 {
906 a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	5075 continue;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5076 }
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5077
1340 32cdba6f2ec1 fix case when two directives Igor Sysoev <igor@sysoev.ru> parents: 1295 diff changeset	5078 if (uscfp[i]->default_port && u->default_port
32cdba6f2ec1 fix case when two directives Igor Sysoev <igor@sysoev.ru> parents: 1295 diff changeset	5079 && uscfp[i]->default_port != u->default_port)
32cdba6f2ec1 fix case when two directives Igor Sysoev <igor@sysoev.ru> parents: 1295 diff changeset	5080 {
32cdba6f2ec1 fix case when two directives Igor Sysoev <igor@sysoev.ru> parents: 1295 diff changeset	5081 continue;
32cdba6f2ec1 fix case when two directives Igor Sysoev <igor@sysoev.ru> parents: 1295 diff changeset	5082 }
32cdba6f2ec1 fix case when two directives Igor Sysoev <igor@sysoev.ru> parents: 1295 diff changeset	5083
4152 65c1c241d70e Better handling of late upstream creation. Maxim Dounin <mdounin@mdounin.ru> parents: 4151 diff changeset	5084 if (flags & NGX_HTTP_UPSTREAM_CREATE) {
65c1c241d70e Better handling of late upstream creation. Maxim Dounin <mdounin@mdounin.ru> parents: 4151 diff changeset	5085 uscfp[i]->flags = flags;
65c1c241d70e Better handling of late upstream creation. Maxim Dounin <mdounin@mdounin.ru> parents: 4151 diff changeset	5086 }
65c1c241d70e Better handling of late upstream creation. Maxim Dounin <mdounin@mdounin.ru> parents: 4151 diff changeset	5087
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5088 return uscfp[i];
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5089 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5090
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5091 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	5092 if (uscf == NULL) {
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5093 return NULL;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5094 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5095
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5096 uscf->flags = flags;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5097 uscf->host = u->host;
1489 56f1ea5baabb u_char* is enough to keep file name Igor Sysoev <igor@sysoev.ru> parents: 1469 diff changeset	5098 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	5099 uscf->line = cf->conf_file->line;
906 a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	5100 uscf->port = u->port;
a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	5101 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	5102 uscf->no_port = u->no_port;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5103
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5104 if (u->naddrs == 1) {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5105 uscf->servers = ngx_array_create(cf->pool, 1,
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5106 sizeof(ngx_http_upstream_server_t));
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5107 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	5108 return NULL;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5109 }
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5110
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5111 us = ngx_array_push(uscf->servers);
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5112 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	5113 return NULL;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5114 }
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5115
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5116 ngx_memzero(us, sizeof(ngx_http_upstream_server_t));
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5117
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5118 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	5119 us->naddrs = 1;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5120 }
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5121
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5122 uscfp = ngx_array_push(&umcf->upstreams);
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5123 if (uscfp == NULL) {
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5124 return NULL;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5125 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5126
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5127 *uscfp = uscf;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5128
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5129 return uscf;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5130 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5131
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5132
3271 fcd98af88df3 proxy_bind, fastcgi_bind, and memcached_bind Igor Sysoev <igor@sysoev.ru> parents: 3198 diff changeset	5133 char *
3399 ac9c0380337d fix typo Igor Sysoev <igor@sysoev.ru> parents: 3369 diff changeset	5134 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	5135 void *conf)
fcd98af88df3 proxy_bind, fastcgi_bind, and memcached_bind Igor Sysoev <igor@sysoev.ru> parents: 3198 diff changeset	5136 {
fcd98af88df3 proxy_bind, fastcgi_bind, and memcached_bind Igor Sysoev <igor@sysoev.ru> parents: 3198 diff changeset	5137 char *p = conf;
fcd98af88df3 proxy_bind, fastcgi_bind, and memcached_bind Igor Sysoev <igor@sysoev.ru> parents: 3198 diff changeset	5138
5008 fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5139 ngx_int_t rc;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5140 ngx_str_t *value;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5141 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	5142 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	5143 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	5144
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5145 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	5146
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5147 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	5148 return "is duplicate";
3271 fcd98af88df3 proxy_bind, fastcgi_bind, and memcached_bind Igor Sysoev <igor@sysoev.ru> parents: 3198 diff changeset	5149 }
fcd98af88df3 proxy_bind, fastcgi_bind, and memcached_bind Igor Sysoev <igor@sysoev.ru> parents: 3198 diff changeset	5150
3272 98f49b2bcae8 change ngx_parse_addr() interface Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	5151 value = cf->args->elts;
98f49b2bcae8 change ngx_parse_addr() interface Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	5152
5008 fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5153 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	5154 *plocal = NULL;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5155 return NGX_CONF_OK;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5156 }
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5157
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5158 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	5159
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5160 ccv.cf = cf;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5161 ccv.value = &value[1];
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5162 ccv.complex_value = &cv;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5163
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5164 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	5165 return NGX_CONF_ERROR;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5166 }
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5167
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5168 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	5169 if (local == NULL) {
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5170 return NGX_CONF_ERROR;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5171 }
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5172
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5173 *plocal = local;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5174
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5175 if (cv.lengths) {
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5176 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	5177 if (local->value == NULL) {
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5178 return NGX_CONF_ERROR;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5179 }
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5180
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5181 *local->value = cv;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5182
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5183 return NGX_CONF_OK;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5184 }
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5185
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5186 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	5187 if (local->addr == NULL) {
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5188 return NGX_CONF_ERROR;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5189 }
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5190
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5191 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	5192
98f49b2bcae8 change ngx_parse_addr() interface Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	5193 switch (rc) {
98f49b2bcae8 change ngx_parse_addr() interface Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	5194 case NGX_OK:
5008 fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5195 local->addr->name = value[1];
3272 98f49b2bcae8 change ngx_parse_addr() interface Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	5196 return NGX_CONF_OK;
98f49b2bcae8 change ngx_parse_addr() interface Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	5197
98f49b2bcae8 change ngx_parse_addr() interface Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	5198 case NGX_DECLINED:
98f49b2bcae8 change ngx_parse_addr() interface Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	5199 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
98f49b2bcae8 change ngx_parse_addr() interface Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	5200 "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	5201 /* fall through */
4988fa232629 For the sake of case/switch code readability, 'fall through' Maxim Konovalov <maxim@nginx.com> parents: 4499 diff changeset	5202
3272 98f49b2bcae8 change ngx_parse_addr() interface Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	5203 default:
98f49b2bcae8 change ngx_parse_addr() interface Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	5204 return NGX_CONF_ERROR;
98f49b2bcae8 change ngx_parse_addr() interface Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	5205 }
3271 fcd98af88df3 proxy_bind, fastcgi_bind, and memcached_bind Igor Sysoev <igor@sysoev.ru> parents: 3198 diff changeset	5206 }
fcd98af88df3 proxy_bind, fastcgi_bind, and memcached_bind Igor Sysoev <igor@sysoev.ru> parents: 3198 diff changeset	5207
fcd98af88df3 proxy_bind, fastcgi_bind, and memcached_bind Igor Sysoev <igor@sysoev.ru> parents: 3198 diff changeset	5208
5008 fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5209 static ngx_addr_t *
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5210 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	5211 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	5212 {
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5213 ngx_int_t rc;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5214 ngx_str_t val;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5215 ngx_addr_t *addr;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5216
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5217 if (local == NULL) {
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5218 return NULL;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5219 }
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5220
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5221 if (local->value == NULL) {
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5222 return local->addr;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5223 }
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5224
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5225 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	5226 return NULL;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5227 }
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5228
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5229 if (val.len == 0) {
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5230 return NULL;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5231 }
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5232
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5233 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	5234 if (addr == NULL) {
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5235 return NULL;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5236 }
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5237
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5238 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	5239
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5240 switch (rc) {
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5241 case NGX_OK:
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5242 addr->name = val;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5243 return addr;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5244
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5245 case NGX_DECLINED:
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5246 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	5247 "invalid local address \"%V\"", &val);
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5248 /* fall through */
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5249
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5250 default:
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5251 return NULL;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5252 }
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5253 }
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5254
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	5255
4328 d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5256 char *
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5257 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	5258 void *conf)
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5259 {
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5260 char *p = conf;
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5261
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5262 ngx_str_t *value;
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5263 ngx_array_t **a;
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5264 ngx_http_upstream_param_t *param;
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5265
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5266 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	5267
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5268 if (*a == NULL) {
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5269 *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	5270 if (*a == NULL) {
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5271 return NGX_CONF_ERROR;
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5272 }
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5273 }
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5274
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5275 param = ngx_array_push(*a);
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5276 if (param == NULL) {
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5277 return NGX_CONF_ERROR;
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5278 }
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5279
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5280 value = cf->args->elts;
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5281
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5282 param->key = value[1];
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5283 param->value = value[2];
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5284 param->skip_empty = 0;
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5285
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5286 if (cf->args->nelts == 4) {
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5287 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	5288 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	5289 "invalid parameter \"%V\"", &value[3]);
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5290 return NGX_CONF_ERROR;
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5291 }
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5292
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5293 param->skip_empty = 1;
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5294 }
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5295
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5296 return NGX_CONF_OK;
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5297 }
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5298
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	5299
1701 40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5300 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	5301 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	5302 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	5303 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	5304 {
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5305 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	5306 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	5307 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	5308 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	5309
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5310 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	5311 && 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	5312 {
4769 f88555d76886 Upstream: hide_headers/pass_headers inheritance fix. Maxim Dounin <mdounin@mdounin.ru> parents: 4766 diff changeset	5313 conf->hide_headers = prev->hide_headers;
f88555d76886 Upstream: hide_headers/pass_headers inheritance fix. Maxim Dounin <mdounin@mdounin.ru> parents: 4766 diff changeset	5314 conf->pass_headers = prev->pass_headers;
f88555d76886 Upstream: hide_headers/pass_headers inheritance fix. Maxim Dounin <mdounin@mdounin.ru> parents: 4766 diff changeset	5315
1701 40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5316 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	5317
2929 37b7cd336fdf inherit proxy_set_header, proxy_hide_header, and fastcgi_hide_header Igor Sysoev <igor@sysoev.ru> parents: 2927 diff changeset	5318 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	5319 #if (NGX_HTTP_CACHE)
fe484c0be7c0 fix building --without-http-cache, broken in r2930 Igor Sysoev <igor@sysoev.ru> parents: 2929 diff changeset	5320 && ((conf->cache == NULL) == (prev->cache == NULL))
fe484c0be7c0 fix building --without-http-cache, broken in r2930 Igor Sysoev <igor@sysoev.ru> parents: 2929 diff changeset	5321 #endif
fe484c0be7c0 fix building --without-http-cache, broken in r2930 Igor Sysoev <igor@sysoev.ru> parents: 2929 diff changeset	5322 )
2929 37b7cd336fdf inherit proxy_set_header, proxy_hide_header, and fastcgi_hide_header Igor Sysoev <igor@sysoev.ru> parents: 2927 diff changeset	5323 {
1701 40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5324 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	5325 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5326
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5327 } else {
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5328 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	5329 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	5330 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5331
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5332 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	5333 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	5334 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5335 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5336
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5337 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	5338 != NGX_OK)
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5339 {
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5340 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	5341 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5342
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5343 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	5344 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	5345 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	5346 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	5347 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5348
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5349 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	5350 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	5351 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	5352 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5353
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5354 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	5355
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5356 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	5357
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5358 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	5359
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5360 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	5361
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5362 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	5363 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	5364 goto exist;
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5365 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5366 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5367
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5368 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	5369 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	5370 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	5371 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5372
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5373 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	5374 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	5375 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	5376
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5377 exist:
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5378
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5379 continue;
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5380 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5381 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5382
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5383 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	5384
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5385 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	5386 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	5387
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5388 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	5389 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	5390
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5391 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	5392 continue;
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5393 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5394
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5395 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	5396 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	5397 break;
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5398 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5399 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5400 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5401 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5402
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5403 hash->hash = &conf->hide_headers_hash;
1706 9242e21d2f8d style fix: remove trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 1705 diff changeset	5404 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	5405 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	5406 hash->temp_pool = NULL;
1706 9242e21d2f8d style fix: remove trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 1705 diff changeset	5407
1701 40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5408 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	5409 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5410
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	5411
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5412 static void *
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5413 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	5414 {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5415 ngx_http_upstream_main_conf_t *umcf;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5416
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5417 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	5418 if (umcf == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5419 return NULL;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5420 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5421
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5422 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	5423 sizeof(ngx_http_upstream_srv_conf_t *))
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5424 != NGX_OK)
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5425 {
2912 c7d57b539248 return NULL instead of NGX_CONF_ERROR on a create conf failure Igor Sysoev <igor@sysoev.ru> parents: 2882 diff changeset	5426 return NULL;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5427 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5428
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5429 return umcf;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5430 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5431
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5432
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5433 static char *
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5434 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	5435 {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5436 ngx_http_upstream_main_conf_t *umcf = conf;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5437
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5438 ngx_uint_t i;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5439 ngx_array_t headers_in;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5440 ngx_hash_key_t *hk;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5441 ngx_hash_init_t hash;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5442 ngx_http_upstream_init_pt init;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5443 ngx_http_upstream_header_t *header;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5444 ngx_http_upstream_srv_conf_t **uscfp;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5445
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5446 uscfp = umcf->upstreams.elts;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5447
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5448 for (i = 0; i < umcf->upstreams.nelts; i++) {
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5449
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5450 init = uscfp[i]->peer.init_upstream ? uscfp[i]->peer.init_upstream:
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5451 ngx_http_upstream_init_round_robin;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5452
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5453 if (init(cf, uscfp[i]) != NGX_OK) {
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5454 return NGX_CONF_ERROR;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5455 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	5456 }
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5457
663 6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 659 diff changeset	5458
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5459 /* upstream_headers_in_hash */
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	5460
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5461 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	5462 != NGX_OK)
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5463 {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5464 return NGX_CONF_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5465 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5466
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5467 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	5468 hk = ngx_array_push(&headers_in);
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5469 if (hk == NULL) {
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5470 return NGX_CONF_ERROR;
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5471 }
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5472
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5473 hk->key = header->name;
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5474 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	5475 hk->value = header;
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5476 }
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5477
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5478 hash.hash = &umcf->headers_in_hash;
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5479 hash.key = ngx_hash_key_lc;
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5480 hash.max_size = 512;
751 bae59a740c40 align hash bucket size to cache line Igor Sysoev <igor@sysoev.ru> parents: 750 diff changeset	5481 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	5482 hash.name = "upstream_headers_in_hash";
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5483 hash.pool = cf->pool;
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5484 hash.temp_pool = NULL;
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5485
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5486 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	5487 return NGX_CONF_ERROR;
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5488 }
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5489
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5490 return NGX_CONF_OK;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5491 }

Mercurial > hg > nginx

annotate src/http/ngx_http_upstream.c @ 5730:c8bdde1c8c97