nginx: src/http/ngx_http_upstream.c annotate

annotate src/http/ngx_http_upstream.c @ 9305:8cdab3d89c44

Upstream: using the "Age" header when caching responses. As long as the "Age" header is present and not ignored, it is now respected when caching responses per "Cache-Control: max-age", reducing cache validity time.

author	Maxim Dounin <mdounin@mdounin.ru>
date	Thu, 18 Jul 2024 19:39:39 +0300
parents	c5623963c29e
children	e46e1ea89ccd

rev	line source
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2 /*
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3 * Copyright (C) Igor Sysoev
4412 d620f497c50f Copyright updated. Maxim Konovalov <maxim@nginx.com> parents: 4385 diff changeset	4 * Copyright (C) Nginx, Inc.
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	5 */
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	6
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	7
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	8 #include <ngx_config.h>
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	9 #include <ngx_core.h>
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	10 #include <ngx_http.h>
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	11
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	12
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	13 #if (NGX_HTTP_CACHE)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	14 static ngx_int_t ngx_http_upstream_cache(ngx_http_request_t *r,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	15 ngx_http_upstream_t *u);
5951 610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	16 static ngx_int_t ngx_http_upstream_cache_get(ngx_http_request_t *r,
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	17 ngx_http_upstream_t u, ngx_http_file_cache_t *cache);
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	18 static ngx_int_t ngx_http_upstream_cache_send(ngx_http_request_t *r,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	19 ngx_http_upstream_t *u);
6906 1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6905 diff changeset	20 static ngx_int_t ngx_http_upstream_cache_background_update(
1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6905 diff changeset	21 ngx_http_request_t r, ngx_http_upstream_t u);
6793 0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6789 diff changeset	22 static ngx_int_t ngx_http_upstream_cache_check_range(ngx_http_request_t *r,
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6789 diff changeset	23 ngx_http_upstream_t *u);
9295 c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	24 static ngx_int_t ngx_http_upstream_no_cache(ngx_http_request_t *r,
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	25 ngx_http_upstream_t *u);
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	26 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	27 ngx_http_variable_value_t *v, uintptr_t data);
9276 5e7588d2d9cc Upstream: $upstream_cache_key variable. Kirill A. Korinsky <kirill@korins.ky> parents: 9255 diff changeset	28 static ngx_int_t ngx_http_upstream_cache_key(ngx_http_request_t *r,
5e7588d2d9cc Upstream: $upstream_cache_key variable. Kirill A. Korinsky <kirill@korins.ky> parents: 9255 diff changeset	29 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	30 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	31 ngx_http_variable_value_t *v, uintptr_t data);
5738 c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	32 static ngx_int_t ngx_http_upstream_cache_etag(ngx_http_request_t *r,
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	33 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	34 #endif
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	35
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	36 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	37 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	38 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	39 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	40 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	41 ngx_event_t *ev);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	42 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	43 ngx_http_upstream_t *u);
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	44 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	45 ngx_http_upstream_t *u);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	46 static void ngx_http_upstream_send_request(ngx_http_request_t *r,
6050 a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	47 ngx_http_upstream_t *u, ngx_uint_t do_write);
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	48 static ngx_int_t ngx_http_upstream_send_request_body(ngx_http_request_t *r,
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	49 ngx_http_upstream_t *u, ngx_uint_t do_write);
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	50 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	51 ngx_http_upstream_t *u);
6050 a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	52 static void ngx_http_upstream_read_request_handler(ngx_http_request_t *r);
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	53 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	54 ngx_http_upstream_t *u);
2268 33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	55 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	56 ngx_http_upstream_t *u);
2267 920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	57 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	58 ngx_http_upstream_t *u);
1153 c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	59 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	60 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	61 ngx_http_upstream_t *u);
7230 098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	62 static ngx_int_t ngx_http_upstream_process_trailers(ngx_http_request_t *r,
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	63 ngx_http_upstream_t *u);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	64 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	65 ngx_http_upstream_t *u);
5072 7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	66 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	67 ngx_http_upstream_t *u);
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	68 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	69 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	70 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	71 ngx_http_upstream_t *u);
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	72 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	73 ngx_http_upstream_t *u);
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	74 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	75 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	76 static void
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	77 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	78 static void
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	79 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	80 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	81 static void
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	82 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	83 ngx_uint_t do_write);
6443 fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	84 #if (NGX_THREADS)
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	85 static ngx_int_t ngx_http_upstream_thread_handler(ngx_thread_task_t *task,
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	86 ngx_file_t *file);
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	87 static void ngx_http_upstream_thread_event_handler(ngx_event_t *ev);
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	88 #endif
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	89 static ngx_int_t ngx_http_upstream_output_filter(void *data,
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	90 ngx_chain_t *chain);
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	91 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	92 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	93 ngx_http_upstream_t *u);
5995 5f179f344096 Upstream: upstream argument in ngx_http_upstream_process_request(). Maxim Dounin <mdounin@mdounin.ru> parents: 5994 diff changeset	94 static void ngx_http_upstream_process_request(ngx_http_request_t *r,
5f179f344096 Upstream: upstream argument in ngx_http_upstream_process_request(). Maxim Dounin <mdounin@mdounin.ru> parents: 5994 diff changeset	95 ngx_http_upstream_t *u);
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	96 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	97 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	98 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	99 ngx_http_upstream_t *u);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	100 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	101 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	102 static void ngx_http_upstream_cleanup(void *data);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	103 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	104 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	105
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	106 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	107 ngx_table_elt_t *h, ngx_uint_t offset);
8034 413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	108 static ngx_int_t
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	109 ngx_http_upstream_process_multi_header_lines(ngx_http_request_t *r,
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	110 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	111 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	112 ngx_table_elt_t *h, ngx_uint_t offset);
5732 d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	113 static ngx_int_t ngx_http_upstream_process_last_modified(ngx_http_request_t *r,
d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	114 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	115 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	116 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	117 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	118 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	119 ngx_table_elt_t *h, ngx_uint_t offset);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	120 static ngx_int_t 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	121 ngx_table_elt_t *h, ngx_uint_t offset);
2666 81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	122 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	123 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	124 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	125 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	126 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	127 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	128 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	129 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	130 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	131 ngx_table_elt_t *h, ngx_uint_t offset);
4124 0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	132 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	133 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	134 static ngx_int_t
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	135 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	136 ngx_table_elt_t *h, ngx_uint_t offset);
5877 60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	137 static ngx_int_t ngx_http_upstream_process_vary(ngx_http_request_t *r,
60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	138 ngx_table_elt_t *h, ngx_uint_t offset);
9305 8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	139 static ngx_int_t ngx_http_upstream_process_age(ngx_http_request_t *r,
8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	140 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	141 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	142 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	143 static ngx_int_t
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	144 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	145 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	146 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	147 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	148 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	149 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	150 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	151 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	152 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	153 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	154 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	155 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	156 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	157 ngx_table_elt_t *h, ngx_uint_t offset);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	158
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	159 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	160 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	161 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	162 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	163 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	164 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	165 ngx_http_variable_value_t *v, uintptr_t data);
2402 cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	166 static ngx_int_t ngx_http_upstream_response_length_variable(
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	167 ngx_http_request_t r, ngx_http_variable_value_t v, uintptr_t data);
6899 d2b2ff157da5 Variables: generic prefix variables. Dmitry Volyntsev <xeioex@nginx.com> parents: 6876 diff changeset	168 static ngx_int_t ngx_http_upstream_header_variable(ngx_http_request_t *r,
d2b2ff157da5 Variables: generic prefix variables. Dmitry Volyntsev <xeioex@nginx.com> parents: 6876 diff changeset	169 ngx_http_variable_value_t *v, uintptr_t data);
7230 098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	170 static ngx_int_t ngx_http_upstream_trailer_variable(ngx_http_request_t *r,
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	171 ngx_http_variable_value_t *v, uintptr_t data);
6899 d2b2ff157da5 Variables: generic prefix variables. Dmitry Volyntsev <xeioex@nginx.com> parents: 6876 diff changeset	172 static ngx_int_t ngx_http_upstream_cookie_variable(ngx_http_request_t *r,
d2b2ff157da5 Variables: generic prefix variables. Dmitry Volyntsev <xeioex@nginx.com> parents: 6876 diff changeset	173 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	174
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	175 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	176 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	177 void *conf);
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	178
6528 88f012eee7d8 Upstream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6474 diff changeset	179 static ngx_int_t ngx_http_upstream_set_local(ngx_http_request_t *r,
88f012eee7d8 Upstream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6474 diff changeset	180 ngx_http_upstream_t u, ngx_http_upstream_local_t local);
5008 fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	181
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	182 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	183 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	184
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	185 #if (NGX_HTTP_SSL)
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	186 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	187 ngx_http_upstream_t u, ngx_connection_t c);
7042 bd2f97a3aecc Upstream: introduced ngx_http_upstream_ssl_handshake_handler(). Maxim Dounin <mdounin@mdounin.ru> parents: 7041 diff changeset	188 static void ngx_http_upstream_ssl_handshake_handler(ngx_connection_t *c);
bd2f97a3aecc Upstream: introduced ngx_http_upstream_ssl_handshake_handler(). Maxim Dounin <mdounin@mdounin.ru> parents: 7041 diff changeset	189 static void ngx_http_upstream_ssl_handshake(ngx_http_request_t *,
bd2f97a3aecc Upstream: introduced ngx_http_upstream_ssl_handshake_handler(). Maxim Dounin <mdounin@mdounin.ru> parents: 7041 diff changeset	190 ngx_http_upstream_t u, ngx_connection_t c);
7320 696df3ac27ac SSL: save sessions for upstream peers using a callback function. Sergey Kandaurov <pluknet@nginx.com> parents: 7307 diff changeset	191 static void ngx_http_upstream_ssl_save_session(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	192 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	193 ngx_http_upstream_t u, ngx_connection_t c);
7833 3ab8e1e2f0f7 Upstream: variables support in certificates. Maxim Dounin <mdounin@mdounin.ru> parents: 7811 diff changeset	194 static ngx_int_t ngx_http_upstream_ssl_certificate(ngx_http_request_t *r,
3ab8e1e2f0f7 Upstream: variables support in certificates. Maxim Dounin <mdounin@mdounin.ru> parents: 7811 diff changeset	195 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	196 #endif
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	197
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	198
6922 a72886067bbb Added missing static specifiers. Eran Kornblau <erankor@gmail.com> parents: 6909 diff changeset	199 static ngx_http_upstream_header_t ngx_http_upstream_headers_in[] = {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	200
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	201 { ngx_string("Status"),
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	202 ngx_http_upstream_process_header_line,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	203 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	204 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	205
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	206 { ngx_string("Content-Type"),
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	207 ngx_http_upstream_process_header_line,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	208 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	209 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	210
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	211 { ngx_string("Content-Length"),
5731 02674312be45 Upstream: removed unused offset to content_length. Maxim Dounin <mdounin@mdounin.ru> parents: 5730 diff changeset	212 ngx_http_upstream_process_content_length, 0,
4117 103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	213 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	214
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	215 { ngx_string("Date"),
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	216 ngx_http_upstream_process_header_line,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	217 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	218 ngx_http_upstream_copy_header_line,
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	219 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	220
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	221 { ngx_string("Last-Modified"),
5732 d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	222 ngx_http_upstream_process_last_modified, 0,
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	223 ngx_http_upstream_copy_last_modified, 0, 0 },
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	224
3037 0278f13b04c5 process upstream ETag header Igor Sysoev <igor@sysoev.ru> parents: 3032 diff changeset	225 { ngx_string("ETag"),
0278f13b04c5 process upstream ETag header Igor Sysoev <igor@sysoev.ru> parents: 3032 diff changeset	226 ngx_http_upstream_process_header_line,
0278f13b04c5 process upstream ETag header Igor Sysoev <igor@sysoev.ru> parents: 3032 diff changeset	227 offsetof(ngx_http_upstream_headers_in_t, etag),
0278f13b04c5 process upstream ETag header Igor Sysoev <igor@sysoev.ru> parents: 3032 diff changeset	228 ngx_http_upstream_copy_header_line,
0278f13b04c5 process upstream ETag header Igor Sysoev <igor@sysoev.ru> parents: 3032 diff changeset	229 offsetof(ngx_http_headers_out_t, etag), 0 },
0278f13b04c5 process upstream ETag header Igor Sysoev <igor@sysoev.ru> parents: 3032 diff changeset	230
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	231 { ngx_string("Server"),
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	232 ngx_http_upstream_process_header_line,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	233 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	234 ngx_http_upstream_copy_header_line,
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	235 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	236
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	237 { ngx_string("WWW-Authenticate"),
8034 413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	238 ngx_http_upstream_process_multi_header_lines,
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	239 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	240 ngx_http_upstream_copy_header_line, 0, 0 },
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	241
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	242 { ngx_string("Location"),
2140 dce5ddef5af9 if upstream sent a location header without status use 302 Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	243 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	244 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	245 ngx_http_upstream_rewrite_location, 0, 0 },
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	246
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	247 { ngx_string("Refresh"),
8034 413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	248 ngx_http_upstream_process_header_line,
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	249 offsetof(ngx_http_upstream_headers_in_t, refresh),
515 417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	250 ngx_http_upstream_rewrite_refresh, 0, 0 },
417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	251
417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	252 { ngx_string("Set-Cookie"),
5677 3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	253 ngx_http_upstream_process_set_cookie,
8024 ef6a3a99a81a Reworked multi headers to use linked lists. Maxim Dounin <mdounin@mdounin.ru> parents: 8023 diff changeset	254 offsetof(ngx_http_upstream_headers_in_t, set_cookie),
4464 7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	255 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	256
c3bd8cdabb8f nginx-0.1.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	257 { ngx_string("Content-Disposition"),
c3bd8cdabb8f nginx-0.1.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	258 ngx_http_upstream_ignore_header_line, 0,
c3bd8cdabb8f nginx-0.1.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	259 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	260
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	261 { 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	262 ngx_http_upstream_process_cache_control, 0,
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	263 ngx_http_upstream_copy_multi_header_lines,
515 417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	264 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	265
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	266 { ngx_string("Expires"),
2666 81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	267 ngx_http_upstream_process_expires, 0,
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	268 ngx_http_upstream_copy_header_line,
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	269 offsetof(ngx_http_headers_out_t, expires), 1 },
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	270
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	271 { ngx_string("Accept-Ranges"),
8030 cdc2724858ca Upstream: simplified Accept-Ranges handling. Maxim Dounin <mdounin@mdounin.ru> parents: 8029 diff changeset	272 ngx_http_upstream_ignore_header_line, 0,
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	273 ngx_http_upstream_copy_allow_ranges,
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	274 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	275
6316 f44de0d12143 Upstream: fill r->headers_out.content_range from upstream response. Roman Arutyunyan <arut@nginx.com> parents: 6313 diff changeset	276 { ngx_string("Content-Range"),
f44de0d12143 Upstream: fill r->headers_out.content_range from upstream response. Roman Arutyunyan <arut@nginx.com> parents: 6313 diff changeset	277 ngx_http_upstream_ignore_header_line, 0,
f44de0d12143 Upstream: fill r->headers_out.content_range from upstream response. Roman Arutyunyan <arut@nginx.com> parents: 6313 diff changeset	278 ngx_http_upstream_copy_header_line,
f44de0d12143 Upstream: fill r->headers_out.content_range from upstream response. Roman Arutyunyan <arut@nginx.com> parents: 6313 diff changeset	279 offsetof(ngx_http_headers_out_t, content_range), 0 },
f44de0d12143 Upstream: fill r->headers_out.content_range from upstream response. Roman Arutyunyan <arut@nginx.com> parents: 6313 diff changeset	280
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	281 { ngx_string("Connection"),
4124 0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	282 ngx_http_upstream_process_connection, 0,
515 417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	283 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	284
641 5e8fb59c18c1 nginx-0.3.42-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	285 { ngx_string("Keep-Alive"),
5e8fb59c18c1 nginx-0.3.42-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	286 ngx_http_upstream_ignore_header_line, 0,
5e8fb59c18c1 nginx-0.3.42-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	287 ngx_http_upstream_ignore_header_line, 0, 0 },
5e8fb59c18c1 nginx-0.3.42-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	288
5877 60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	289 { ngx_string("Vary"),
60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	290 ngx_http_upstream_process_vary, 0,
60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	291 ngx_http_upstream_copy_header_line, 0, 0 },
60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	292
7199 6ba68ad8b24c Basic support of the Link response header. Ruslan Ermilov <ru@nginx.com> parents: 7194 diff changeset	293 { ngx_string("Link"),
6ba68ad8b24c Basic support of the Link response header. Ruslan Ermilov <ru@nginx.com> parents: 7194 diff changeset	294 ngx_http_upstream_ignore_header_line, 0,
6ba68ad8b24c Basic support of the Link response header. Ruslan Ermilov <ru@nginx.com> parents: 7194 diff changeset	295 ngx_http_upstream_copy_multi_header_lines,
6ba68ad8b24c Basic support of the Link response header. Ruslan Ermilov <ru@nginx.com> parents: 7194 diff changeset	296 offsetof(ngx_http_headers_out_t, link), 0 },
6ba68ad8b24c Basic support of the Link response header. Ruslan Ermilov <ru@nginx.com> parents: 7194 diff changeset	297
9305 8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	298 { ngx_string("Age"),
8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	299 ngx_http_upstream_process_age, 0,
8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	300 ngx_http_upstream_copy_header_line, 0, 0 },
8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	301
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	302 { ngx_string("X-Accel-Expires"),
2664 f903114355d4 zero field Igor Sysoev <igor@sysoev.ru> parents: 2663 diff changeset	303 ngx_http_upstream_process_accel_expires, 0,
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	304 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	305
417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	306 { ngx_string("X-Accel-Redirect"),
417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	307 ngx_http_upstream_process_header_line,
417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	308 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	309 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	310
527 7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	311 { ngx_string("X-Accel-Limit-Rate"),
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	312 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	313 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	314
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	315 { ngx_string("X-Accel-Buffering"),
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	316 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	317 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	318
657 400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	319 { ngx_string("X-Accel-Charset"),
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	320 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	321 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	322
4123 0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	323 { ngx_string("Transfer-Encoding"),
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	324 ngx_http_upstream_process_transfer_encoding, 0,
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	325 ngx_http_upstream_ignore_header_line, 0, 0 },
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	326
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	327 { ngx_string("Content-Encoding"),
8029 e0027c8438b0 Upstream: simplified Content-Encoding handling. Maxim Dounin <mdounin@mdounin.ru> parents: 8028 diff changeset	328 ngx_http_upstream_ignore_header_line, 0,
e0027c8438b0 Upstream: simplified Content-Encoding handling. Maxim Dounin <mdounin@mdounin.ru> parents: 8028 diff changeset	329 ngx_http_upstream_copy_header_line,
e0027c8438b0 Upstream: simplified Content-Encoding handling. Maxim Dounin <mdounin@mdounin.ru> parents: 8028 diff changeset	330 offsetof(ngx_http_headers_out_t, content_encoding), 0 },
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	331
515 417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	332 { 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	333 };
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	334
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	335
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	336 static ngx_command_t ngx_http_upstream_commands[] = {
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	337
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	338 { ngx_string("upstream"),
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	339 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	340 ngx_http_upstream,
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	341 0,
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	342 0,
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	343 NULL },
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	344
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	345 { ngx_string("server"),
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	346 NGX_HTTP_UPS_CONF\|NGX_CONF_1MORE,
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	347 ngx_http_upstream_server,
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	348 NGX_HTTP_SRV_CONF_OFFSET,
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	349 0,
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	350 NULL },
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	351
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	352 ngx_null_command
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	353 };
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	354
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	355
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	356 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	357 ngx_http_upstream_add_variables, /* preconfiguration */
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	358 NULL, /* postconfiguration */
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	359
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	360 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	361 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	362
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	363 NULL, /* create server configuration */
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	364 NULL, /* merge server configuration */
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	365
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	366 NULL, /* create location configuration */
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	367 NULL /* merge location configuration */
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	368 };
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	369
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	370
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	371 ngx_module_t ngx_http_upstream_module = {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	372 NGX_MODULE_V1,
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	373 &ngx_http_upstream_module_ctx, /* module context */
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	374 ngx_http_upstream_commands, /* module directives */
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	375 NGX_HTTP_MODULE, /* module type */
541 b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 537 diff changeset	376 NULL, /* init master */
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	377 NULL, /* init module */
541 b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 537 diff changeset	378 NULL, /* init process */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 537 diff changeset	379 NULL, /* init thread */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 537 diff changeset	380 NULL, /* exit thread */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 537 diff changeset	381 NULL, /* exit process */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 537 diff changeset	382 NULL, /* exit master */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 537 diff changeset	383 NGX_MODULE_V1_PADDING
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	384 };
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	385
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	386
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	387 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	388
1181 ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	389 { 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	390 ngx_http_upstream_addr_variable, 0,
3898 bd1222fb0192 allow to use $upstream_... variables in SSI Igor Sysoev <igor@sysoev.ru> parents: 3879 diff changeset	391 NGX_HTTP_VAR_NOCACHEABLE, 0 },
1181 ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	392
637 e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 629 diff changeset	393 { 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	394 ngx_http_upstream_status_variable, 0,
3898 bd1222fb0192 allow to use $upstream_... variables in SSI Igor Sysoev <igor@sysoev.ru> parents: 3879 diff changeset	395 NGX_HTTP_VAR_NOCACHEABLE, 0 },
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	396
6147 74b6ef56ea56 Upstream: $upstream_connect_time. Ruslan Ermilov <ru@nginx.com> parents: 6146 diff changeset	397 { ngx_string("upstream_connect_time"), NULL,
74b6ef56ea56 Upstream: $upstream_connect_time. Ruslan Ermilov <ru@nginx.com> parents: 6146 diff changeset	398 ngx_http_upstream_response_time_variable, 2,
74b6ef56ea56 Upstream: $upstream_connect_time. Ruslan Ermilov <ru@nginx.com> parents: 6146 diff changeset	399 NGX_HTTP_VAR_NOCACHEABLE, 0 },
74b6ef56ea56 Upstream: $upstream_connect_time. Ruslan Ermilov <ru@nginx.com> parents: 6146 diff changeset	400
5964 0a198a517eaf Upstream: $upstream_header_time variable. Vladimir Homutov <vl@nginx.com> parents: 5960 diff changeset	401 { ngx_string("upstream_header_time"), NULL,
0a198a517eaf Upstream: $upstream_header_time variable. Vladimir Homutov <vl@nginx.com> parents: 5960 diff changeset	402 ngx_http_upstream_response_time_variable, 1,
0a198a517eaf Upstream: $upstream_header_time variable. Vladimir Homutov <vl@nginx.com> parents: 5960 diff changeset	403 NGX_HTTP_VAR_NOCACHEABLE, 0 },
0a198a517eaf Upstream: $upstream_header_time variable. Vladimir Homutov <vl@nginx.com> parents: 5960 diff changeset	404
637 e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 629 diff changeset	405 { 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	406 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	407 NGX_HTTP_VAR_NOCACHEABLE, 0 },
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	408
2402 cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	409 { ngx_string("upstream_response_length"), NULL,
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	410 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	411 NGX_HTTP_VAR_NOCACHEABLE, 0 },
2402 cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	412
6654 c131f20c9562 Upstream: the $upstream_bytes_received variable. Vladimir Homutov <vl@nginx.com> parents: 6594 diff changeset	413 { ngx_string("upstream_bytes_received"), NULL,
c131f20c9562 Upstream: the $upstream_bytes_received variable. Vladimir Homutov <vl@nginx.com> parents: 6594 diff changeset	414 ngx_http_upstream_response_length_variable, 1,
c131f20c9562 Upstream: the $upstream_bytes_received variable. Vladimir Homutov <vl@nginx.com> parents: 6594 diff changeset	415 NGX_HTTP_VAR_NOCACHEABLE, 0 },
c131f20c9562 Upstream: the $upstream_bytes_received variable. Vladimir Homutov <vl@nginx.com> parents: 6594 diff changeset	416
7429 e573d74299a0 Upstream: implemented $upstream_bytes_sent. Ruslan Ermilov <ru@nginx.com> parents: 7397 diff changeset	417 { ngx_string("upstream_bytes_sent"), NULL,
e573d74299a0 Upstream: implemented $upstream_bytes_sent. Ruslan Ermilov <ru@nginx.com> parents: 7397 diff changeset	418 ngx_http_upstream_response_length_variable, 2,
e573d74299a0 Upstream: implemented $upstream_bytes_sent. Ruslan Ermilov <ru@nginx.com> parents: 7397 diff changeset	419 NGX_HTTP_VAR_NOCACHEABLE, 0 },
e573d74299a0 Upstream: implemented $upstream_bytes_sent. Ruslan Ermilov <ru@nginx.com> parents: 7397 diff changeset	420
2957 b4f39842523b fix building --without-http-cache, broken in r2953 Igor Sysoev <igor@sysoev.ru> parents: 2953 diff changeset	421 #if (NGX_HTTP_CACHE)
b4f39842523b fix building --without-http-cache, broken in r2953 Igor Sysoev <igor@sysoev.ru> parents: 2953 diff changeset	422
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	423 { ngx_string("upstream_cache_status"), NULL,
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	424 ngx_http_upstream_cache_status, 0,
3898 bd1222fb0192 allow to use $upstream_... variables in SSI Igor Sysoev <igor@sysoev.ru> parents: 3879 diff changeset	425 NGX_HTTP_VAR_NOCACHEABLE, 0 },
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	426
9276 5e7588d2d9cc Upstream: $upstream_cache_key variable. Kirill A. Korinsky <kirill@korins.ky> parents: 9255 diff changeset	427 { ngx_string("upstream_cache_key"), NULL,
5e7588d2d9cc Upstream: $upstream_cache_key variable. Kirill A. Korinsky <kirill@korins.ky> parents: 9255 diff changeset	428 ngx_http_upstream_cache_key, 0,
5e7588d2d9cc Upstream: $upstream_cache_key variable. Kirill A. Korinsky <kirill@korins.ky> parents: 9255 diff changeset	429 NGX_HTTP_VAR_NOCACHEABLE, 0 },
5e7588d2d9cc Upstream: $upstream_cache_key variable. Kirill A. Korinsky <kirill@korins.ky> parents: 9255 diff changeset	430
5441 43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	431 { ngx_string("upstream_cache_last_modified"), NULL,
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	432 ngx_http_upstream_cache_last_modified, 0,
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	433 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	434
5738 c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	435 { ngx_string("upstream_cache_etag"), NULL,
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	436 ngx_http_upstream_cache_etag, 0,
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	437 NGX_HTTP_VAR_NOCACHEABLE\|NGX_HTTP_VAR_NOHASH, 0 },
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	438
2957 b4f39842523b fix building --without-http-cache, broken in r2953 Igor Sysoev <igor@sysoev.ru> parents: 2953 diff changeset	439 #endif
b4f39842523b fix building --without-http-cache, broken in r2953 Igor Sysoev <igor@sysoev.ru> parents: 2953 diff changeset	440
6899 d2b2ff157da5 Variables: generic prefix variables. Dmitry Volyntsev <xeioex@nginx.com> parents: 6876 diff changeset	441 { ngx_string("upstream_http_"), NULL, ngx_http_upstream_header_variable,
d2b2ff157da5 Variables: generic prefix variables. Dmitry Volyntsev <xeioex@nginx.com> parents: 6876 diff changeset	442 0, NGX_HTTP_VAR_NOCACHEABLE\|NGX_HTTP_VAR_PREFIX, 0 },
d2b2ff157da5 Variables: generic prefix variables. Dmitry Volyntsev <xeioex@nginx.com> parents: 6876 diff changeset	443
7230 098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	444 { ngx_string("upstream_trailer_"), NULL, ngx_http_upstream_trailer_variable,
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	445 0, NGX_HTTP_VAR_NOCACHEABLE\|NGX_HTTP_VAR_PREFIX, 0 },
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	446
6899 d2b2ff157da5 Variables: generic prefix variables. Dmitry Volyntsev <xeioex@nginx.com> parents: 6876 diff changeset	447 { ngx_string("upstream_cookie_"), NULL, ngx_http_upstream_cookie_variable,
d2b2ff157da5 Variables: generic prefix variables. Dmitry Volyntsev <xeioex@nginx.com> parents: 6876 diff changeset	448 0, NGX_HTTP_VAR_NOCACHEABLE\|NGX_HTTP_VAR_PREFIX, 0 },
d2b2ff157da5 Variables: generic prefix variables. Dmitry Volyntsev <xeioex@nginx.com> parents: 6876 diff changeset	449
7077 2a288909abc6 Variables: macros for null variables. Ruslan Ermilov <ru@nginx.com> parents: 7070 diff changeset	450 ngx_http_null_variable
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	451 };
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	452
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	453
2268 33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	454 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	455 { 500, NGX_HTTP_UPSTREAM_FT_HTTP_500 },
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	456 { 502, NGX_HTTP_UPSTREAM_FT_HTTP_502 },
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	457 { 503, NGX_HTTP_UPSTREAM_FT_HTTP_503 },
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	458 { 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	459 { 403, NGX_HTTP_UPSTREAM_FT_HTTP_403 },
2268 33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	460 { 404, NGX_HTTP_UPSTREAM_FT_HTTP_404 },
6966 fa56ab75cffc Upstream: allow recovery from "429 Too Many Requests" response. Piotr Sikora <piotrsikora@google.com> parents: 6961 diff changeset	461 { 429, NGX_HTTP_UPSTREAM_FT_HTTP_429 },
2268 33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	462 { 0, 0 }
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	463 };
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	464
2875 6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2874 diff changeset	465
6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2874 diff changeset	466 ngx_conf_bitmask_t ngx_http_upstream_cache_method_mask[] = {
6439 81329f6a4254 Style. Ruslan Ermilov <ru@nginx.com> parents: 6428 diff changeset	467 { ngx_string("GET"), NGX_HTTP_GET },
81329f6a4254 Style. Ruslan Ermilov <ru@nginx.com> parents: 6428 diff changeset	468 { ngx_string("HEAD"), NGX_HTTP_HEAD },
81329f6a4254 Style. Ruslan Ermilov <ru@nginx.com> parents: 6428 diff changeset	469 { ngx_string("POST"), NGX_HTTP_POST },
81329f6a4254 Style. Ruslan Ermilov <ru@nginx.com> parents: 6428 diff changeset	470 { ngx_null_string, 0 }
2875 6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2874 diff changeset	471 };
6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2874 diff changeset	472
6e1941b321b7 proxy_cache_methods and fastcgi_cache_methods Igor Sysoev <igor@sysoev.ru> parents: 2874 diff changeset	473
3667 12bd9e26fadb use shared ngx_http_upstream_ignore_headers_masks[] Igor Sysoev <igor@sysoev.ru> parents: 3527 diff changeset	474 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	475 { 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	476 { 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	477 { 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	478 { 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	479 { 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	480 { 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	481 { 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	482 { ngx_string("Set-Cookie"), NGX_HTTP_UPSTREAM_IGN_SET_COOKIE },
5877 60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	483 { ngx_string("Vary"), NGX_HTTP_UPSTREAM_IGN_VARY },
9305 8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	484 { ngx_string("Age"), NGX_HTTP_UPSTREAM_IGN_AGE },
3667 12bd9e26fadb use shared ngx_http_upstream_ignore_headers_masks[] Igor Sysoev <igor@sysoev.ru> parents: 3527 diff changeset	485 { ngx_null_string, 0 }
12bd9e26fadb use shared ngx_http_upstream_ignore_headers_masks[] Igor Sysoev <igor@sysoev.ru> parents: 3527 diff changeset	486 };
12bd9e26fadb use shared ngx_http_upstream_ignore_headers_masks[] Igor Sysoev <igor@sysoev.ru> parents: 3527 diff changeset	487
12bd9e26fadb use shared ngx_http_upstream_ignore_headers_masks[] Igor Sysoev <igor@sysoev.ru> parents: 3527 diff changeset	488
3006 95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	489 ngx_int_t
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	490 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	491 {
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	492 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	493
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	494 u = r->upstream;
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	495
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	496 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	497 r->main->count++;
3006 95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	498 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	499 }
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	500
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	501 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	502 if (u == NULL) {
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	503 return NGX_ERROR;
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	504 }
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	505
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	506 r->upstream = u;
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	507
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	508 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	509 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	510
3056 d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	511 #if (NGX_HTTP_CACHE)
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	512 r->cache = NULL;
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	513 #endif
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	514
4117 103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	515 u->headers_in.content_length_n = -1;
5869 fd283aa92e04 Upstream: fix $upstream_cache_last_modified variable. Piotr Sikora <piotr@cloudflare.com> parents: 5848 diff changeset	516 u->headers_in.last_modified_time = -1;
4117 103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	517
3006 95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	518 return NGX_OK;
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	519 }
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	520
95972b9e790b ngx_http_upstream_create() to cleanup the previous upstream after Igor Sysoev <igor@sysoev.ru> parents: 3004 diff changeset	521
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	522 void
31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	523 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	524 {
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	525 ngx_connection_t *c;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	526
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	527 c = r->connection;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	528
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	529 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	530 "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	531
6246 257b51c37c5a The HTTP/2 implementation (RFC 7240, 7241). Valentin Bartenev <vbart@nginx.com> parents: 6242 diff changeset	532 #if (NGX_HTTP_V2)
257b51c37c5a The HTTP/2 implementation (RFC 7240, 7241). Valentin Bartenev <vbart@nginx.com> parents: 6242 diff changeset	533 if (r->stream) {
5121 c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: 5113 diff changeset	534 ngx_http_upstream_init_request(r);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: 5113 diff changeset	535 return;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: 5113 diff changeset	536 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: 5113 diff changeset	537 #endif
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: 5113 diff changeset	538
8921 33226ac61076 HTTP/3: merged ngx_http_quic_module into ngx_http_v3_module. Roman Arutyunyan <arut@nginx.com> parents: 8889 diff changeset	539 #if (NGX_HTTP_V3)
8630 279ad36f2f4b QUIC: renamed c->qs to c->quic. Roman Arutyunyan <arut@nginx.com> parents: 8584 diff changeset	540 if (c->quic) {
8584 474706351c09 QUIC: fixed ngx_http_upstream_init() much like HTTP/2 connections. Sergey Kandaurov <pluknet@nginx.com> parents: 8568 diff changeset	541 ngx_http_upstream_init_request(r);
474706351c09 QUIC: fixed ngx_http_upstream_init() much like HTTP/2 connections. Sergey Kandaurov <pluknet@nginx.com> parents: 8568 diff changeset	542 return;
474706351c09 QUIC: fixed ngx_http_upstream_init() much like HTTP/2 connections. Sergey Kandaurov <pluknet@nginx.com> parents: 8568 diff changeset	543 }
474706351c09 QUIC: fixed ngx_http_upstream_init() much like HTTP/2 connections. Sergey Kandaurov <pluknet@nginx.com> parents: 8568 diff changeset	544 #endif
474706351c09 QUIC: fixed ngx_http_upstream_init() much like HTTP/2 connections. Sergey Kandaurov <pluknet@nginx.com> parents: 8568 diff changeset	545
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	546 if (c->read->timer_set) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	547 ngx_del_timer(c->read);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	548 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	549
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	550 if (ngx_event_flags & NGX_USE_CLEAR_EVENT) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	551
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	552 if (!c->write->active) {
531 c3bd8cdabb8f nginx-0.1.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	553 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	554 == NGX_ERROR)
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	555 {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	556 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	557 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	558 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	559 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	560 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	561
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	562 ngx_http_upstream_init_request(r);
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	563 }
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	564
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	565
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	566 static void
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	567 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	568 {
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	569 ngx_str_t *host;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	570 ngx_uint_t i;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	571 ngx_resolver_ctx_t *ctx, temp;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	572 ngx_http_cleanup_t *cln;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	573 ngx_http_upstream_t *u;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	574 ngx_http_core_loc_conf_t *clcf;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	575 ngx_http_upstream_srv_conf_t uscf, *uscfp;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	576 ngx_http_upstream_main_conf_t *umcf;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	577
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	578 if (r->aio) {
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	579 return;
537 c9ad0d9c7d59 nginx-0.1.43-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 531 diff changeset	580 }
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	581
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	582 u = r->upstream;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	583
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	584 #if (NGX_HTTP_CACHE)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	585
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	586 if (u->conf->cache) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	587 ngx_int_t rc;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	588
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	589 rc = ngx_http_upstream_cache(r, u);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	590
3055 92b6cfaa3c27 fix sending a cached file using AIO Igor Sysoev <igor@sysoev.ru> parents: 3053 diff changeset	591 if (rc == NGX_BUSY) {
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	592 r->write_event_handler = ngx_http_upstream_init_request;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	593 return;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	594 }
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	595
3055 92b6cfaa3c27 fix sending a cached file using AIO Igor Sysoev <igor@sysoev.ru> parents: 3053 diff changeset	596 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	597
5827 54e9b83d00f0 Upstream: avoided directly terminating the connection. FengGu <flygoast@126.com> parents: 5818 diff changeset	598 if (rc == NGX_ERROR) {
54e9b83d00f0 Upstream: avoided directly terminating the connection. FengGu <flygoast@126.com> parents: 5818 diff changeset	599 ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
54e9b83d00f0 Upstream: avoided directly terminating the connection. FengGu <flygoast@126.com> parents: 5818 diff changeset	600 return;
54e9b83d00f0 Upstream: avoided directly terminating the connection. FengGu <flygoast@126.com> parents: 5818 diff changeset	601 }
54e9b83d00f0 Upstream: avoided directly terminating the connection. FengGu <flygoast@126.com> parents: 5818 diff changeset	602
6242 0e3a45ec2a3a Upstream: fixed cache send error handling. Roman Arutyunyan <arut@nginx.com> parents: 6180 diff changeset	603 if (rc == NGX_OK) {
0e3a45ec2a3a Upstream: fixed cache send error handling. Roman Arutyunyan <arut@nginx.com> parents: 6180 diff changeset	604 rc = ngx_http_upstream_cache_send(r, u);
0e3a45ec2a3a Upstream: fixed cache send error handling. Roman Arutyunyan <arut@nginx.com> parents: 6180 diff changeset	605
0e3a45ec2a3a Upstream: fixed cache send error handling. Roman Arutyunyan <arut@nginx.com> parents: 6180 diff changeset	606 if (rc == NGX_DONE) {
0e3a45ec2a3a Upstream: fixed cache send error handling. Roman Arutyunyan <arut@nginx.com> parents: 6180 diff changeset	607 return;
0e3a45ec2a3a Upstream: fixed cache send error handling. Roman Arutyunyan <arut@nginx.com> parents: 6180 diff changeset	608 }
0e3a45ec2a3a Upstream: fixed cache send error handling. Roman Arutyunyan <arut@nginx.com> parents: 6180 diff changeset	609
0e3a45ec2a3a Upstream: fixed cache send error handling. Roman Arutyunyan <arut@nginx.com> parents: 6180 diff changeset	610 if (rc == NGX_HTTP_UPSTREAM_INVALID_HEADER) {
0e3a45ec2a3a Upstream: fixed cache send error handling. Roman Arutyunyan <arut@nginx.com> parents: 6180 diff changeset	611 rc = NGX_DECLINED;
0e3a45ec2a3a Upstream: fixed cache send error handling. Roman Arutyunyan <arut@nginx.com> parents: 6180 diff changeset	612 r->cached = 0;
7116 46ddff109e72 Upstream: better handling of invalid headers in cache files. Maxim Dounin <mdounin@mdounin.ru> parents: 7093 diff changeset	613 u->buffer.start = NULL;
46ddff109e72 Upstream: better handling of invalid headers in cache files. Maxim Dounin <mdounin@mdounin.ru> parents: 7093 diff changeset	614 u->cache_status = NGX_HTTP_CACHE_MISS;
7125 b8fc701daf8e Upstream: even better handling of invalid headers in cache files. Maxim Dounin <mdounin@mdounin.ru> parents: 7117 diff changeset	615 u->request_sent = 1;
6242 0e3a45ec2a3a Upstream: fixed cache send error handling. Roman Arutyunyan <arut@nginx.com> parents: 6180 diff changeset	616 }
0e3a45ec2a3a Upstream: fixed cache send error handling. Roman Arutyunyan <arut@nginx.com> parents: 6180 diff changeset	617 }
0e3a45ec2a3a Upstream: fixed cache send error handling. Roman Arutyunyan <arut@nginx.com> parents: 6180 diff changeset	618
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	619 if (rc != NGX_DECLINED) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	620 ngx_http_finalize_request(r, rc);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	621 return;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	622 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	623 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	624
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	625 #endif
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	626
5947 d9025ea1f5a5 Upstream: simplified proxy_store and friends configuration code. Valentin Bartenev <vbart@nginx.com> parents: 5935 diff changeset	627 u->store = u->conf->store;
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	628
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	629 if (!u->store && !r->post_action && !u->conf->ignore_client_abort) {
7810 1bf8ab7063de Upstream: fixed broken connection check with eventport. Maxim Dounin <mdounin@mdounin.ru> parents: 7809 diff changeset	630
7811 1ebd78df4ce7 Fixed handling of already closed connections. Maxim Dounin <mdounin@mdounin.ru> parents: 7810 diff changeset	631 if (r->connection->read->ready) {
1ebd78df4ce7 Fixed handling of already closed connections. Maxim Dounin <mdounin@mdounin.ru> parents: 7810 diff changeset	632 ngx_post_event(r->connection->read, &ngx_posted_events);
1ebd78df4ce7 Fixed handling of already closed connections. Maxim Dounin <mdounin@mdounin.ru> parents: 7810 diff changeset	633
1ebd78df4ce7 Fixed handling of already closed connections. Maxim Dounin <mdounin@mdounin.ru> parents: 7810 diff changeset	634 } else {
1ebd78df4ce7 Fixed handling of already closed connections. Maxim Dounin <mdounin@mdounin.ru> parents: 7810 diff changeset	635 if (ngx_handle_read_event(r->connection->read, 0) != NGX_OK) {
1ebd78df4ce7 Fixed handling of already closed connections. Maxim Dounin <mdounin@mdounin.ru> parents: 7810 diff changeset	636 ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
1ebd78df4ce7 Fixed handling of already closed connections. Maxim Dounin <mdounin@mdounin.ru> parents: 7810 diff changeset	637 return;
1ebd78df4ce7 Fixed handling of already closed connections. Maxim Dounin <mdounin@mdounin.ru> parents: 7810 diff changeset	638 }
7810 1bf8ab7063de Upstream: fixed broken connection check with eventport. Maxim Dounin <mdounin@mdounin.ru> parents: 7809 diff changeset	639 }
1bf8ab7063de Upstream: fixed broken connection check with eventport. Maxim Dounin <mdounin@mdounin.ru> parents: 7809 diff changeset	640
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	641 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	642 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	643 }
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	644
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	645 if (r->request_body) {
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	646 u->request_bufs = r->request_body->bufs;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	647 }
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	648
537 c9ad0d9c7d59 nginx-0.1.43-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 531 diff changeset	649 if (u->create_request(r) != NGX_OK) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	650 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	651 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	652 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	653
6528 88f012eee7d8 Upstream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6474 diff changeset	654 if (ngx_http_upstream_set_local(r, u, u->conf->local) != NGX_OK) {
88f012eee7d8 Upstream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6474 diff changeset	655 ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
88f012eee7d8 Upstream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6474 diff changeset	656 return;
88f012eee7d8 Upstream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6474 diff changeset	657 }
3271 fcd98af88df3 proxy_bind, fastcgi_bind, and memcached_bind Igor Sysoev <igor@sysoev.ru> parents: 3198 diff changeset	658
7371 8b68d50090e4 Upstream: proxy_socket_keepalive and friends. Vladimir Homutov <vl@nginx.com> parents: 7341 diff changeset	659 if (u->conf->socket_keepalive) {
8b68d50090e4 Upstream: proxy_socket_keepalive and friends. Vladimir Homutov <vl@nginx.com> parents: 7341 diff changeset	660 u->peer.so_keepalive = 1;
8b68d50090e4 Upstream: proxy_socket_keepalive and friends. Vladimir Homutov <vl@nginx.com> parents: 7341 diff changeset	661 }
8b68d50090e4 Upstream: proxy_socket_keepalive and friends. Vladimir Homutov <vl@nginx.com> parents: 7341 diff changeset	662
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	663 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	664
3053 0d253659da12 directio_alignment Igor Sysoev <igor@sysoev.ru> parents: 3052 diff changeset	665 u->output.alignment = clcf->directio_alignment;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	666 u->output.pool = r->pool;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	667 u->output.bufs.num = 1;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	668 u->output.bufs.size = clcf->client_body_buffer_size;
6050 a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	669
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	670 if (u->output.output_filter == NULL) {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	671 u->output.output_filter = ngx_chain_writer;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	672 u->output.filter_ctx = &u->writer;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	673 }
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	674
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	675 u->writer.pool = r->pool;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	676
1168 4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	677 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	678
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	679 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	680 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	681 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	682 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	683 return;
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	684 }
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	685
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	686 } else {
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	687
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	688 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	689 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	690 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	691 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	692 return;
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	693 }
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	694
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	695 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	696 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	697
593 425af804d968 nginx-0.3.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 591 diff changeset	698 cln = ngx_http_cleanup_add(r, 0);
569 174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	699 if (cln == NULL) {
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	700 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	701 return;
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	702 }
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	703
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	704 cln->handler = ngx_http_upstream_cleanup;
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	705 cln->data = r;
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	706 u->cleanup = &cln->handler;
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	707
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	708 if (u->resolved == NULL) {
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	709
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	710 uscf = u->conf->upstream;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	711
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	712 } else {
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	713
5660 7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	714 #if (NGX_HTTP_SSL)
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	715 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	716 #endif
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	717
6303 a93345ee8f52 Upstream: fixed "no port" detection in evaluated upstreams. Ruslan Ermilov <ru@nginx.com> parents: 6290 diff changeset	718 host = &u->resolved->host;
a93345ee8f52 Upstream: fixed "no port" detection in evaluated upstreams. Ruslan Ermilov <ru@nginx.com> parents: 6290 diff changeset	719
6786 906ac20234ed Upstream: do not unnecessarily create per-request upstreams. Ruslan Ermilov <ru@nginx.com> parents: 6777 diff changeset	720 umcf = ngx_http_get_module_main_conf(r, ngx_http_upstream_module);
906ac20234ed Upstream: do not unnecessarily create per-request upstreams. Ruslan Ermilov <ru@nginx.com> parents: 6777 diff changeset	721
906ac20234ed Upstream: do not unnecessarily create per-request upstreams. Ruslan Ermilov <ru@nginx.com> parents: 6777 diff changeset	722 uscfp = umcf->upstreams.elts;
906ac20234ed Upstream: do not unnecessarily create per-request upstreams. Ruslan Ermilov <ru@nginx.com> parents: 6777 diff changeset	723
906ac20234ed Upstream: do not unnecessarily create per-request upstreams. Ruslan Ermilov <ru@nginx.com> parents: 6777 diff changeset	724 for (i = 0; i < umcf->upstreams.nelts; i++) {
906ac20234ed Upstream: do not unnecessarily create per-request upstreams. Ruslan Ermilov <ru@nginx.com> parents: 6777 diff changeset	725
906ac20234ed Upstream: do not unnecessarily create per-request upstreams. Ruslan Ermilov <ru@nginx.com> parents: 6777 diff changeset	726 uscf = uscfp[i];
906ac20234ed Upstream: do not unnecessarily create per-request upstreams. Ruslan Ermilov <ru@nginx.com> parents: 6777 diff changeset	727
906ac20234ed Upstream: do not unnecessarily create per-request upstreams. Ruslan Ermilov <ru@nginx.com> parents: 6777 diff changeset	728 if (uscf->host.len == host->len
906ac20234ed Upstream: do not unnecessarily create per-request upstreams. Ruslan Ermilov <ru@nginx.com> parents: 6777 diff changeset	729 && ((uscf->port == 0 && u->resolved->no_port)
906ac20234ed Upstream: do not unnecessarily create per-request upstreams. Ruslan Ermilov <ru@nginx.com> parents: 6777 diff changeset	730 \|\| uscf->port == u->resolved->port)
906ac20234ed Upstream: do not unnecessarily create per-request upstreams. Ruslan Ermilov <ru@nginx.com> parents: 6777 diff changeset	731 && ngx_strncasecmp(uscf->host.data, host->data, host->len) == 0)
906ac20234ed Upstream: do not unnecessarily create per-request upstreams. Ruslan Ermilov <ru@nginx.com> parents: 6777 diff changeset	732 {
906ac20234ed Upstream: do not unnecessarily create per-request upstreams. Ruslan Ermilov <ru@nginx.com> parents: 6777 diff changeset	733 goto found;
906ac20234ed Upstream: do not unnecessarily create per-request upstreams. Ruslan Ermilov <ru@nginx.com> parents: 6777 diff changeset	734 }
906ac20234ed Upstream: do not unnecessarily create per-request upstreams. Ruslan Ermilov <ru@nginx.com> parents: 6777 diff changeset	735 }
906ac20234ed Upstream: do not unnecessarily create per-request upstreams. Ruslan Ermilov <ru@nginx.com> parents: 6777 diff changeset	736
2422 7af1e5fe102c variable support for unix sockets in fastcgi_pass and proxy_pass Igor Sysoev <igor@sysoev.ru> parents: 2413 diff changeset	737 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	738
6326 705c356ce664 Fixed fastcgi_pass with UNIX socket and variables (ticket #855). Ruslan Ermilov <ru@nginx.com> parents: 6316 diff changeset	739 if (u->resolved->port == 0
705c356ce664 Fixed fastcgi_pass with UNIX socket and variables (ticket #855). Ruslan Ermilov <ru@nginx.com> parents: 6316 diff changeset	740 && u->resolved->sockaddr->sa_family != AF_UNIX)
705c356ce664 Fixed fastcgi_pass with UNIX socket and variables (ticket #855). Ruslan Ermilov <ru@nginx.com> parents: 6316 diff changeset	741 {
6303 a93345ee8f52 Upstream: fixed "no port" detection in evaluated upstreams. Ruslan Ermilov <ru@nginx.com> parents: 6290 diff changeset	742 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
a93345ee8f52 Upstream: fixed "no port" detection in evaluated upstreams. Ruslan Ermilov <ru@nginx.com> parents: 6290 diff changeset	743 "no port in upstream \"%V\"", host);
a93345ee8f52 Upstream: fixed "no port" detection in evaluated upstreams. Ruslan Ermilov <ru@nginx.com> parents: 6290 diff changeset	744 ngx_http_upstream_finalize_request(r, u,
6313 be3aed17689c Style. Maxim Dounin <mdounin@mdounin.ru> parents: 6306 diff changeset	745 NGX_HTTP_INTERNAL_SERVER_ERROR);
6303 a93345ee8f52 Upstream: fixed "no port" detection in evaluated upstreams. Ruslan Ermilov <ru@nginx.com> parents: 6290 diff changeset	746 return;
a93345ee8f52 Upstream: fixed "no port" detection in evaluated upstreams. Ruslan Ermilov <ru@nginx.com> parents: 6290 diff changeset	747 }
a93345ee8f52 Upstream: fixed "no port" detection in evaluated upstreams. Ruslan Ermilov <ru@nginx.com> parents: 6290 diff changeset	748
2422 7af1e5fe102c variable support for unix sockets in fastcgi_pass and proxy_pass Igor Sysoev <igor@sysoev.ru> parents: 2413 diff changeset	749 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	750 != NGX_OK)
7af1e5fe102c variable support for unix sockets in fastcgi_pass and proxy_pass Igor Sysoev <igor@sysoev.ru> parents: 2413 diff changeset	751 {
3169 b1013d768911 fix request counter in resolver handling, the bug was introduced in r3050 Igor Sysoev <igor@sysoev.ru> parents: 3161 diff changeset	752 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	753 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	754 return;
7af1e5fe102c variable support for unix sockets in fastcgi_pass and proxy_pass Igor Sysoev <igor@sysoev.ru> parents: 2413 diff changeset	755 }
7af1e5fe102c variable support for unix sockets in fastcgi_pass and proxy_pass Igor Sysoev <igor@sysoev.ru> parents: 2413 diff changeset	756
7af1e5fe102c variable support for unix sockets in fastcgi_pass and proxy_pass Igor Sysoev <igor@sysoev.ru> parents: 2413 diff changeset	757 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	758
7af1e5fe102c variable support for unix sockets in fastcgi_pass and proxy_pass Igor Sysoev <igor@sysoev.ru> parents: 2413 diff changeset	759 return;
7af1e5fe102c variable support for unix sockets in fastcgi_pass and proxy_pass Igor Sysoev <igor@sysoev.ru> parents: 2413 diff changeset	760 }
7af1e5fe102c variable support for unix sockets in fastcgi_pass and proxy_pass Igor Sysoev <igor@sysoev.ru> parents: 2413 diff changeset	761
3879 502a6b0acf3f fix case when a host in fastcgi_pass, scgi_pass, and uwsgi_pass Igor Sysoev <igor@sysoev.ru> parents: 3713 diff changeset	762 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	763 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	764 "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	765 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	766 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	767 return;
502a6b0acf3f fix case when a host in fastcgi_pass, scgi_pass, and uwsgi_pass Igor Sysoev <igor@sysoev.ru> parents: 3713 diff changeset	768 }
502a6b0acf3f fix case when a host in fastcgi_pass, scgi_pass, and uwsgi_pass Igor Sysoev <igor@sysoev.ru> parents: 3713 diff changeset	769
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	770 temp.name = *host;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	771
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	772 ctx = ngx_resolve_start(clcf->resolver, &temp);
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	773 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	774 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	775 NGX_HTTP_INTERNAL_SERVER_ERROR);
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	776 return;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	777 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	778
1683 1e0b028055ec allow to use IP addresses without defined resolver Igor Sysoev <igor@sysoev.ru> parents: 1658 diff changeset	779 if (ctx == NGX_NO_RESOLVER) {
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	780 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	781 "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	782
3169 b1013d768911 fix request counter in resolver handling, the bug was introduced in r3050 Igor Sysoev <igor@sysoev.ru> parents: 3161 diff changeset	783 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	784 return;
1e0b028055ec allow to use IP addresses without defined resolver Igor Sysoev <igor@sysoev.ru> parents: 1658 diff changeset	785 }
1e0b028055ec allow to use IP addresses without defined resolver Igor Sysoev <igor@sysoev.ru> parents: 1658 diff changeset	786
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	787 ctx->name = *host;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	788 ctx->handler = ngx_http_upstream_resolve_handler;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	789 ctx->data = r;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	790 ctx->timeout = clcf->resolver_timeout;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	791
1959 4f16186f5603 quick resolving handles u->resolved->ctx by itself Igor Sysoev <igor@sysoev.ru> parents: 1958 diff changeset	792 u->resolved->ctx = ctx;
4f16186f5603 quick resolving handles u->resolved->ctx by itself Igor Sysoev <igor@sysoev.ru> parents: 1958 diff changeset	793
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	794 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	795 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	796 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	797 NGX_HTTP_INTERNAL_SERVER_ERROR);
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	798 return;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	799 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	800
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	801 return;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	802 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	803
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	804 found:
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	805
4964 2464ccebdb52 Upstream: fixed SIGSEGV with the "if" directive. Maxim Dounin <mdounin@mdounin.ru> parents: 4916 diff changeset	806 if (uscf == NULL) {
2464ccebdb52 Upstream: fixed SIGSEGV with the "if" directive. Maxim Dounin <mdounin@mdounin.ru> parents: 4916 diff changeset	807 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	808 "no upstream configuration");
2464ccebdb52 Upstream: fixed SIGSEGV with the "if" directive. Maxim Dounin <mdounin@mdounin.ru> parents: 4916 diff changeset	809 ngx_http_upstream_finalize_request(r, u,
2464ccebdb52 Upstream: fixed SIGSEGV with the "if" directive. Maxim Dounin <mdounin@mdounin.ru> parents: 4916 diff changeset	810 NGX_HTTP_INTERNAL_SERVER_ERROR);
2464ccebdb52 Upstream: fixed SIGSEGV with the "if" directive. Maxim Dounin <mdounin@mdounin.ru> parents: 4916 diff changeset	811 return;
2464ccebdb52 Upstream: fixed SIGSEGV with the "if" directive. Maxim Dounin <mdounin@mdounin.ru> parents: 4916 diff changeset	812 }
2464ccebdb52 Upstream: fixed SIGSEGV with the "if" directive. Maxim Dounin <mdounin@mdounin.ru> parents: 4916 diff changeset	813
6703 edcd9303a4d3 Upstream: introduced u->upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 6699 diff changeset	814 u->upstream = uscf;
edcd9303a4d3 Upstream: introduced u->upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 6699 diff changeset	815
5682 110b50657d77 Upstream: restored workaround for "if". Maxim Dounin <mdounin@mdounin.ru> parents: 5677 diff changeset	816 #if (NGX_HTTP_SSL)
110b50657d77 Upstream: restored workaround for "if". Maxim Dounin <mdounin@mdounin.ru> parents: 5677 diff changeset	817 u->ssl_name = uscf->host;
110b50657d77 Upstream: restored workaround for "if". Maxim Dounin <mdounin@mdounin.ru> parents: 5677 diff changeset	818 #endif
110b50657d77 Upstream: restored workaround for "if". Maxim Dounin <mdounin@mdounin.ru> parents: 5677 diff changeset	819
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	820 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	821 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	822 NGX_HTTP_INTERNAL_SERVER_ERROR);
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	823 return;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	824 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	825
5832 d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5827 diff changeset	826 u->peer.start_time = ngx_current_msec;
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5827 diff changeset	827
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5827 diff changeset	828 if (u->conf->next_upstream_tries
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5827 diff changeset	829 && u->peer.tries > u->conf->next_upstream_tries)
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5827 diff changeset	830 {
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5827 diff changeset	831 u->peer.tries = u->conf->next_upstream_tries;
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5827 diff changeset	832 }
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5827 diff changeset	833
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	834 ngx_http_upstream_connect(r, u);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	835 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	836
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	837
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	838 #if (NGX_HTTP_CACHE)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	839
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	840 static ngx_int_t
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	841 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	842 {
5951 610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	843 ngx_int_t rc;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	844 ngx_http_cache_t *c;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	845 ngx_http_file_cache_t *cache;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	846
3056 d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	847 c = r->cache;
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	848
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	849 if (c == NULL) {
3056 d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	850
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	851 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	852 return NGX_DECLINED;
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	853 }
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	854
5951 610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	855 rc = ngx_http_upstream_cache_get(r, u, &cache);
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	856
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	857 if (rc != NGX_OK) {
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	858 return rc;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	859 }
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	860
6306 b1858fc47e3b Style: unified request method checks. Ruslan Ermilov <ru@nginx.com> parents: 6303 diff changeset	861 if (r->method == NGX_HTTP_HEAD && u->conf->cache_convert_head) {
3056 d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	862 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	863 }
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	864
3698 d11227f0107f rename ngx_http_file_cache_create() to ngx_http_file_cache_new() Igor Sysoev <igor@sysoev.ru> parents: 3697 diff changeset	865 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	866 return NGX_ERROR;
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	867 }
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	868
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	869 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	870 return NGX_ERROR;
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	871 }
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	872
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	873 /* TODO: add keys */
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	874
d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	875 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	876
7456 608810849b6d Upstream: fixed logging of required buffer size (ticket #1722). Chanhun Jeong <chanhun.jeong@navercorp.com> parents: 7429 diff changeset	877 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	878 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	879 "%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	880 "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	881 &u->conf->module, u->conf->buffer_size,
215fe9223419 update r3945 with more descriptive error message Igor Sysoev <igor@sysoev.ru> parents: 3963 diff changeset	882 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	883
f1f194ceab16 fix segfault if cache key is larger than upstream buffer size Igor Sysoev <igor@sysoev.ru> parents: 3940 diff changeset	884 r->cache = NULL;
f1f194ceab16 fix segfault if cache key is larger than upstream buffer size Igor Sysoev <igor@sysoev.ru> parents: 3940 diff changeset	885 return NGX_DECLINED;
f1f194ceab16 fix segfault if cache key is larger than upstream buffer size Igor Sysoev <igor@sysoev.ru> parents: 3940 diff changeset	886 }
f1f194ceab16 fix segfault if cache key is larger than upstream buffer size Igor Sysoev <igor@sysoev.ru> parents: 3940 diff changeset	887
4176 2b5151a2300b Fixed cache bypass caching of non-cacheable replies (ticket #21). Maxim Dounin <mdounin@mdounin.ru> parents: 4152 diff changeset	888 u->cacheable = 1;
2b5151a2300b Fixed cache bypass caching of non-cacheable replies (ticket #21). Maxim Dounin <mdounin@mdounin.ru> parents: 4152 diff changeset	889
5950 eaeecf00d5d7 Upstream: preset some cache configuration when bypassing. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	890 c = r->cache;
eaeecf00d5d7 Upstream: preset some cache configuration when bypassing. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	891
eaeecf00d5d7 Upstream: preset some cache configuration when bypassing. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	892 c->body_start = u->conf->buffer_size;
eaeecf00d5d7 Upstream: preset some cache configuration when bypassing. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	893 c->min_uses = u->conf->cache_min_uses;
5951 610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	894 c->file_cache = cache;
5950 eaeecf00d5d7 Upstream: preset some cache configuration when bypassing. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	895
3917 2a70484a6580 fix a broken cached response if bypass/no_cache directive values are different, Igor Sysoev <igor@sysoev.ru> parents: 3898 diff changeset	896 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	897
2a70484a6580 fix a broken cached response if bypass/no_cache directive values are different, Igor Sysoev <igor@sysoev.ru> parents: 3898 diff changeset	898 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	899 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	900
2a70484a6580 fix a broken cached response if bypass/no_cache directive values are different, Igor Sysoev <igor@sysoev.ru> parents: 3898 diff changeset	901 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	902 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	903 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	904
2a70484a6580 fix a broken cached response if bypass/no_cache directive values are different, Igor Sysoev <igor@sysoev.ru> parents: 3898 diff changeset	905 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	906 break;
2a70484a6580 fix a broken cached response if bypass/no_cache directive values are different, Igor Sysoev <igor@sysoev.ru> parents: 3898 diff changeset	907 }
2a70484a6580 fix a broken cached response if bypass/no_cache directive values are different, Igor Sysoev <igor@sysoev.ru> parents: 3898 diff changeset	908
4385 70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4375 diff changeset	909 c->lock = u->conf->cache_lock;
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4375 diff changeset	910 c->lock_timeout = u->conf->cache_lock_timeout;
5905 2f7e557eab5b Cache: proxy_cache_lock_age and friends. Roman Arutyunyan <arut@nginx.com> parents: 5901 diff changeset	911 c->lock_age = u->conf->cache_lock_age;
4385 70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4375 diff changeset	912
3056 d22afd261e72 do not create cache key in AIO invocation Igor Sysoev <igor@sysoev.ru> parents: 3055 diff changeset	913 u->cache_status = NGX_HTTP_CACHE_MISS;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	914 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	915
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	916 rc = ngx_http_file_cache_open(r);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	917
2926 80a314b63c56 delete useless r->cache->uses Igor Sysoev <igor@sysoev.ru> parents: 2912 diff changeset	918 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	919 "http upstream cache: %i", rc);
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	920
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	921 switch (rc) {
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	922
6906 1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6905 diff changeset	923 case NGX_HTTP_CACHE_STALE:
1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6905 diff changeset	924
1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6905 diff changeset	925 if (((u->conf->cache_use_stale & NGX_HTTP_UPSTREAM_FT_UPDATING)
7006 9552758a786e Background subrequests for cache updates. Roman Arutyunyan <arut@nginx.com> parents: 6986 diff changeset	926 \|\| c->stale_updating) && !r->background
6906 1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6905 diff changeset	927 && u->conf->cache_background_update)
1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6905 diff changeset	928 {
7514 319242d2ddc9 Upstream: background cache update before cache send (ticket #1782). Roman Arutyunyan <arut@nginx.com> parents: 7504 diff changeset	929 if (ngx_http_upstream_cache_background_update(r, u) == NGX_OK) {
319242d2ddc9 Upstream: background cache update before cache send (ticket #1782). Roman Arutyunyan <arut@nginx.com> parents: 7504 diff changeset	930 r->cache->background = 1;
319242d2ddc9 Upstream: background cache update before cache send (ticket #1782). Roman Arutyunyan <arut@nginx.com> parents: 7504 diff changeset	931 u->cache_status = rc;
319242d2ddc9 Upstream: background cache update before cache send (ticket #1782). Roman Arutyunyan <arut@nginx.com> parents: 7504 diff changeset	932 rc = NGX_OK;
319242d2ddc9 Upstream: background cache update before cache send (ticket #1782). Roman Arutyunyan <arut@nginx.com> parents: 7504 diff changeset	933
319242d2ddc9 Upstream: background cache update before cache send (ticket #1782). Roman Arutyunyan <arut@nginx.com> parents: 7504 diff changeset	934 } else {
319242d2ddc9 Upstream: background cache update before cache send (ticket #1782). Roman Arutyunyan <arut@nginx.com> parents: 7504 diff changeset	935 rc = NGX_ERROR;
319242d2ddc9 Upstream: background cache update before cache send (ticket #1782). Roman Arutyunyan <arut@nginx.com> parents: 7504 diff changeset	936 }
6906 1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6905 diff changeset	937 }
1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6905 diff changeset	938
1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6905 diff changeset	939 break;
1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6905 diff changeset	940
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	941 case NGX_HTTP_CACHE_UPDATING:
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	942
6906 1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6905 diff changeset	943 if (((u->conf->cache_use_stale & NGX_HTTP_UPSTREAM_FT_UPDATING)
7006 9552758a786e Background subrequests for cache updates. Roman Arutyunyan <arut@nginx.com> parents: 6986 diff changeset	944 \|\| c->stale_updating) && !r->background)
6905 9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	945 {
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	946 u->cache_status = rc;
2927 55ceaef03d34 proxy_cache_use_stale/fastcgi_cache_use_stale updating Igor Sysoev <igor@sysoev.ru> parents: 2926 diff changeset	947 rc = NGX_OK;
55ceaef03d34 proxy_cache_use_stale/fastcgi_cache_use_stale updating Igor Sysoev <igor@sysoev.ru> parents: 2926 diff changeset	948
55ceaef03d34 proxy_cache_use_stale/fastcgi_cache_use_stale updating Igor Sysoev <igor@sysoev.ru> parents: 2926 diff changeset	949 } else {
55ceaef03d34 proxy_cache_use_stale/fastcgi_cache_use_stale updating Igor Sysoev <igor@sysoev.ru> parents: 2926 diff changeset	950 rc = NGX_HTTP_CACHE_STALE;
55ceaef03d34 proxy_cache_use_stale/fastcgi_cache_use_stale updating Igor Sysoev <igor@sysoev.ru> parents: 2926 diff changeset	951 }
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	952
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	953 break;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	954
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	955 case NGX_OK:
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	956 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	957 }
55ceaef03d34 proxy_cache_use_stale/fastcgi_cache_use_stale updating Igor Sysoev <igor@sysoev.ru> parents: 2926 diff changeset	958
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	959 switch (rc) {
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	960
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	961 case NGX_OK:
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	962
6242 0e3a45ec2a3a Upstream: fixed cache send error handling. Roman Arutyunyan <arut@nginx.com> parents: 6180 diff changeset	963 return NGX_OK;
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	964
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	965 case NGX_HTTP_CACHE_STALE:
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	966
2665 4d627567c324 fix r2664: ..._cache_valid did not work for stale responses Igor Sysoev <igor@sysoev.ru> parents: 2664 diff changeset	967 c->valid_sec = 0;
6905 9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	968 c->updating_sec = 0;
9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	969 c->error_sec = 0;
9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	970
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	971 u->buffer.start = NULL;
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	972 u->cache_status = NGX_HTTP_CACHE_EXPIRED;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	973
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	974 break;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	975
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	976 case NGX_DECLINED:
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	977
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	978 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	979 u->buffer.start = NULL;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	980
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	981 } else {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	982 u->buffer.pos = u->buffer.start + c->header_start;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	983 u->buffer.last = u->buffer.pos;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	984 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	985
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	986 break;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	987
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	988 case NGX_HTTP_CACHE_SCARCE:
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	989
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	990 u->cacheable = 0;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	991
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	992 break;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	993
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	994 case NGX_AGAIN:
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	995
3055 92b6cfaa3c27 fix sending a cached file using AIO Igor Sysoev <igor@sysoev.ru> parents: 3053 diff changeset	996 return NGX_BUSY;
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	997
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	998 case NGX_ERROR:
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	999
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	1000 return NGX_ERROR;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	1001
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	1002 default:
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1003
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1004 /* 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	1005
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	1006 u->cache_status = NGX_HTTP_CACHE_HIT;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	1007
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1008 return rc;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1009 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1010
6793 0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6789 diff changeset	1011 if (ngx_http_upstream_cache_check_range(r, u) == NGX_DECLINED) {
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6789 diff changeset	1012 u->cacheable = 0;
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6789 diff changeset	1013 }
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6789 diff changeset	1014
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1015 r->cached = 0;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1016
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1017 return NGX_DECLINED;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1018 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1019
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1020
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1021 static ngx_int_t
5951 610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	1022 ngx_http_upstream_cache_get(ngx_http_request_t r, ngx_http_upstream_t u,
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	1023 ngx_http_file_cache_t **cache)
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	1024 {
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	1025 ngx_str_t *name, val;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	1026 ngx_uint_t i;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	1027 ngx_http_file_cache_t **caches;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	1028
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	1029 if (u->conf->cache_zone) {
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	1030 *cache = u->conf->cache_zone->data;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	1031 return NGX_OK;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	1032 }
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	1033
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	1034 if (ngx_http_complex_value(r, u->conf->cache_value, &val) != NGX_OK) {
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	1035 return NGX_ERROR;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	1036 }
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	1037
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	1038 if (val.len == 0
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	1039 \|\| (val.len == 3 && ngx_strncmp(val.data, "off", 3) == 0))
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	1040 {
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	1041 return NGX_DECLINED;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	1042 }
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	1043
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	1044 caches = u->caches->elts;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	1045
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	1046 for (i = 0; i < u->caches->nelts; i++) {
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	1047 name = &caches[i]->shm_zone->shm.name;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	1048
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	1049 if (name->len == val.len
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	1050 && ngx_strncmp(name->data, val.data, val.len) == 0)
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	1051 {
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	1052 *cache = caches[i];
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	1053 return NGX_OK;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	1054 }
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	1055 }
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	1056
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	1057 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	1058 "cache \"%V\" not found", &val);
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	1059
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	1060 return NGX_ERROR;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	1061 }
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	1062
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	1063
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5950 diff changeset	1064 static ngx_int_t
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1065 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	1066 {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1067 ngx_int_t rc;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1068 ngx_http_cache_t *c;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1069
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	1070 r->cached = 1;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1071 c = r->cache;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1072
3369 479468a7d982 fix handling cached HTTP/0.9 response Igor Sysoev <igor@sysoev.ru> parents: 3272 diff changeset	1073 if (c->header_start == c->body_start) {
479468a7d982 fix handling cached HTTP/0.9 response Igor Sysoev <igor@sysoev.ru> parents: 3272 diff changeset	1074 r->http_version = NGX_HTTP_VERSION_9;
479468a7d982 fix handling cached HTTP/0.9 response Igor Sysoev <igor@sysoev.ru> parents: 3272 diff changeset	1075 return ngx_http_cache_send(r);
479468a7d982 fix handling cached HTTP/0.9 response Igor Sysoev <igor@sysoev.ru> parents: 3272 diff changeset	1076 }
479468a7d982 fix handling cached HTTP/0.9 response Igor Sysoev <igor@sysoev.ru> parents: 3272 diff changeset	1077
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1078 /* TODO: cache stack */
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1079
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1080 u->buffer = *c->buf;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1081 u->buffer.pos += c->header_start;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1082
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1083 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	1084 u->headers_in.content_length_n = -1;
5869 fd283aa92e04 Upstream: fix $upstream_cache_last_modified variable. Piotr Sikora <piotr@cloudflare.com> parents: 5848 diff changeset	1085 u->headers_in.last_modified_time = -1;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1086
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1087 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	1088 sizeof(ngx_table_elt_t))
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1089 != NGX_OK)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1090 {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1091 return NGX_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1092 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1093
7230 098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	1094 if (ngx_list_init(&u->headers_in.trailers, r->pool, 2,
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	1095 sizeof(ngx_table_elt_t))
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	1096 != NGX_OK)
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	1097 {
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	1098 return NGX_ERROR;
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	1099 }
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	1100
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1101 rc = u->process_header(r);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1102
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1103 if (rc == NGX_OK) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1104
9217 6765e5f6d991 Upstream: fixed X-Accel-Redirect handling from cache files. Maxim Dounin <mdounin@mdounin.ru> parents: 9204 diff changeset	1105 rc = ngx_http_upstream_process_headers(r, u);
6765e5f6d991 Upstream: fixed X-Accel-Redirect handling from cache files. Maxim Dounin <mdounin@mdounin.ru> parents: 9204 diff changeset	1106
6765e5f6d991 Upstream: fixed X-Accel-Redirect handling from cache files. Maxim Dounin <mdounin@mdounin.ru> parents: 9204 diff changeset	1107 if (rc != NGX_OK) {
6765e5f6d991 Upstream: fixed X-Accel-Redirect handling from cache files. Maxim Dounin <mdounin@mdounin.ru> parents: 9204 diff changeset	1108 return rc;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1109 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1110
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1111 return ngx_http_cache_send(r);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1112 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1113
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1114 if (rc == NGX_ERROR) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1115 return NGX_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1116 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1117
7116 46ddff109e72 Upstream: better handling of invalid headers in cache files. Maxim Dounin <mdounin@mdounin.ru> parents: 7093 diff changeset	1118 if (rc == NGX_AGAIN) {
46ddff109e72 Upstream: better handling of invalid headers in cache files. Maxim Dounin <mdounin@mdounin.ru> parents: 7093 diff changeset	1119 rc = NGX_HTTP_UPSTREAM_INVALID_HEADER;
46ddff109e72 Upstream: better handling of invalid headers in cache files. Maxim Dounin <mdounin@mdounin.ru> parents: 7093 diff changeset	1120 }
46ddff109e72 Upstream: better handling of invalid headers in cache files. Maxim Dounin <mdounin@mdounin.ru> parents: 7093 diff changeset	1121
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1122 /* rc == NGX_HTTP_UPSTREAM_INVALID_HEADER */
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1123
7116 46ddff109e72 Upstream: better handling of invalid headers in cache files. Maxim Dounin <mdounin@mdounin.ru> parents: 7093 diff changeset	1124 ngx_log_error(NGX_LOG_CRIT, r->connection->log, 0,
46ddff109e72 Upstream: better handling of invalid headers in cache files. Maxim Dounin <mdounin@mdounin.ru> parents: 7093 diff changeset	1125 "cache file \"%s\" contains invalid header",
46ddff109e72 Upstream: better handling of invalid headers in cache files. Maxim Dounin <mdounin@mdounin.ru> parents: 7093 diff changeset	1126 c->file.name.data);
46ddff109e72 Upstream: better handling of invalid headers in cache files. Maxim Dounin <mdounin@mdounin.ru> parents: 7093 diff changeset	1127
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1128 /* TODO: delete file */
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1129
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1130 return rc;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1131 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1132
6793 0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6789 diff changeset	1133
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6789 diff changeset	1134 static ngx_int_t
6906 1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6905 diff changeset	1135 ngx_http_upstream_cache_background_update(ngx_http_request_t *r,
1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6905 diff changeset	1136 ngx_http_upstream_t *u)
1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6905 diff changeset	1137 {
1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6905 diff changeset	1138 ngx_http_request_t *sr;
1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6905 diff changeset	1139
7070 f583559aadc7 Upstream: keep request body file from removal if requested. Roman Arutyunyan <arut@nginx.com> parents: 7067 diff changeset	1140 if (r == r->main) {
f583559aadc7 Upstream: keep request body file from removal if requested. Roman Arutyunyan <arut@nginx.com> parents: 7067 diff changeset	1141 r->preserve_body = 1;
f583559aadc7 Upstream: keep request body file from removal if requested. Roman Arutyunyan <arut@nginx.com> parents: 7067 diff changeset	1142 }
f583559aadc7 Upstream: keep request body file from removal if requested. Roman Arutyunyan <arut@nginx.com> parents: 7067 diff changeset	1143
6906 1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6905 diff changeset	1144 if (ngx_http_subrequest(r, &r->uri, &r->args, &sr, NULL,
7006 9552758a786e Background subrequests for cache updates. Roman Arutyunyan <arut@nginx.com> parents: 6986 diff changeset	1145 NGX_HTTP_SUBREQUEST_CLONE
9552758a786e Background subrequests for cache updates. Roman Arutyunyan <arut@nginx.com> parents: 6986 diff changeset	1146 \|NGX_HTTP_SUBREQUEST_BACKGROUND)
6906 1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6905 diff changeset	1147 != NGX_OK)
1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6905 diff changeset	1148 {
1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6905 diff changeset	1149 return NGX_ERROR;
1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6905 diff changeset	1150 }
1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6905 diff changeset	1151
1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6905 diff changeset	1152 sr->header_only = 1;
1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6905 diff changeset	1153
1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6905 diff changeset	1154 return NGX_OK;
1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6905 diff changeset	1155 }
1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6905 diff changeset	1156
1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6905 diff changeset	1157
1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6905 diff changeset	1158 static ngx_int_t
6793 0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6789 diff changeset	1159 ngx_http_upstream_cache_check_range(ngx_http_request_t *r,
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6789 diff changeset	1160 ngx_http_upstream_t *u)
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6789 diff changeset	1161 {
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6789 diff changeset	1162 off_t offset;
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6789 diff changeset	1163 u_char p, start;
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6789 diff changeset	1164 ngx_table_elt_t *h;
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6789 diff changeset	1165
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6789 diff changeset	1166 h = r->headers_in.range;
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6789 diff changeset	1167
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6789 diff changeset	1168 if (h == NULL
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6789 diff changeset	1169 \|\| !u->cacheable
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6789 diff changeset	1170 \|\| u->conf->cache_max_range_offset == NGX_MAX_OFF_T_VALUE)
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6789 diff changeset	1171 {
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6789 diff changeset	1172 return NGX_OK;
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6789 diff changeset	1173 }
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6789 diff changeset	1174
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6789 diff changeset	1175 if (u->conf->cache_max_range_offset == 0) {
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6789 diff changeset	1176 return NGX_DECLINED;
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6789 diff changeset	1177 }
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6789 diff changeset	1178
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6789 diff changeset	1179 if (h->value.len < 7
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6789 diff changeset	1180 \|\| ngx_strncasecmp(h->value.data, (u_char *) "bytes=", 6) != 0)
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6789 diff changeset	1181 {
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6789 diff changeset	1182 return NGX_OK;
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6789 diff changeset	1183 }
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6789 diff changeset	1184
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6789 diff changeset	1185 p = h->value.data + 6;
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6789 diff changeset	1186
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6789 diff changeset	1187 while (*p == ' ') { p++; }
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6789 diff changeset	1188
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6789 diff changeset	1189 if (*p == '-') {
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6789 diff changeset	1190 return NGX_DECLINED;
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6789 diff changeset	1191 }
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6789 diff changeset	1192
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6789 diff changeset	1193 start = p;
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6789 diff changeset	1194
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6789 diff changeset	1195 while (p >= '0' && p <= '9') { p++; }
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6789 diff changeset	1196
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6789 diff changeset	1197 offset = ngx_atoof(start, p - start);
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6789 diff changeset	1198
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6789 diff changeset	1199 if (offset >= u->conf->cache_max_range_offset) {
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6789 diff changeset	1200 return NGX_DECLINED;
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6789 diff changeset	1201 }
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6789 diff changeset	1202
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6789 diff changeset	1203 return NGX_OK;
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6789 diff changeset	1204 }
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6789 diff changeset	1205
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1206 #endif
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1207
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1208
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	1209 static void
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1210 ngx_http_upstream_resolve_handler(ngx_resolver_ctx_t *ctx)
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1211 {
7041 6169dbad37d8 Upstream: fixed running posted requests (ticket #788). Roman Arutyunyan <arut@nginx.com> parents: 7018 diff changeset	1212 ngx_uint_t run_posted;
5113 08b36f2afc3f Upstream: fixed previous commit. Maxim Dounin <mdounin@mdounin.ru> parents: 5112 diff changeset	1213 ngx_connection_t *c;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1214 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	1215 ngx_http_upstream_t *u;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1216 ngx_http_upstream_resolved_t *ur;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1217
7041 6169dbad37d8 Upstream: fixed running posted requests (ticket #788). Roman Arutyunyan <arut@nginx.com> parents: 7018 diff changeset	1218 run_posted = ctx->async;
6169dbad37d8 Upstream: fixed running posted requests (ticket #788). Roman Arutyunyan <arut@nginx.com> parents: 7018 diff changeset	1219
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1220 r = ctx->data;
5113 08b36f2afc3f Upstream: fixed previous commit. Maxim Dounin <mdounin@mdounin.ru> parents: 5112 diff changeset	1221 c = r->connection;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1222
3169 b1013d768911 fix request counter in resolver handling, the bug was introduced in r3050 Igor Sysoev <igor@sysoev.ru> parents: 3161 diff changeset	1223 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	1224 ur = u->resolved;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1225
5928 8dfee01ff0bd Upstream: improved subrequest logging. Maxim Dounin <mdounin@mdounin.ru> parents: 5911 diff changeset	1226 ngx_http_set_log_request(c->log, r);
8dfee01ff0bd Upstream: improved subrequest logging. Maxim Dounin <mdounin@mdounin.ru> parents: 5911 diff changeset	1227
8dfee01ff0bd Upstream: improved subrequest logging. Maxim Dounin <mdounin@mdounin.ru> parents: 5911 diff changeset	1228 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
8dfee01ff0bd Upstream: improved subrequest logging. Maxim Dounin <mdounin@mdounin.ru> parents: 5911 diff changeset	1229 "http upstream resolve: \"%V?%V\"", &r->uri, &r->args);
8dfee01ff0bd Upstream: improved subrequest logging. Maxim Dounin <mdounin@mdounin.ru> parents: 5911 diff changeset	1230
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1231 if (ctx->state) {
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1232 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1233 "%V could not be resolved (%i: %s)",
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1234 &ctx->name, ctx->state,
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1235 ngx_resolver_strerror(ctx->state));
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1236
3169 b1013d768911 fix request counter in resolver handling, the bug was introduced in r3050 Igor Sysoev <igor@sysoev.ru> parents: 3161 diff changeset	1237 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	1238 goto failed;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1239 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1240
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1241 ur->naddrs = ctx->naddrs;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1242 ur->addrs = ctx->addrs;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1243
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1244 #if (NGX_DEBUG)
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1245 {
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5453 diff changeset	1246 u_char text[NGX_SOCKADDR_STRLEN];
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5453 diff changeset	1247 ngx_str_t addr;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1248 ngx_uint_t i;
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1249
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5453 diff changeset	1250 addr.data = text;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5453 diff changeset	1251
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1252 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	1253 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	1254 text, NGX_SOCKADDR_STRLEN, 0);
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5453 diff changeset	1255
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5453 diff changeset	1256 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	1257 "name was resolved to %V", &addr);
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1258 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1259 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1260 #endif
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1261
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1262 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	1263 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	1264 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	1265 goto failed;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1266 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1267
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1268 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	1269 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	1270
5885 5a042519bfe7 Upstream: limited next_upstream time and tries when resolving DNS. Gu Feng <flygoast@126.com> parents: 5883 diff changeset	1271 u->peer.start_time = ngx_current_msec;
5a042519bfe7 Upstream: limited next_upstream time and tries when resolving DNS. Gu Feng <flygoast@126.com> parents: 5883 diff changeset	1272
5a042519bfe7 Upstream: limited next_upstream time and tries when resolving DNS. Gu Feng <flygoast@126.com> parents: 5883 diff changeset	1273 if (u->conf->next_upstream_tries
5a042519bfe7 Upstream: limited next_upstream time and tries when resolving DNS. Gu Feng <flygoast@126.com> parents: 5883 diff changeset	1274 && u->peer.tries > u->conf->next_upstream_tries)
5a042519bfe7 Upstream: limited next_upstream time and tries when resolving DNS. Gu Feng <flygoast@126.com> parents: 5883 diff changeset	1275 {
5a042519bfe7 Upstream: limited next_upstream time and tries when resolving DNS. Gu Feng <flygoast@126.com> parents: 5883 diff changeset	1276 u->peer.tries = u->conf->next_upstream_tries;
5a042519bfe7 Upstream: limited next_upstream time and tries when resolving DNS. Gu Feng <flygoast@126.com> parents: 5883 diff changeset	1277 }
5a042519bfe7 Upstream: limited next_upstream time and tries when resolving DNS. Gu Feng <flygoast@126.com> parents: 5883 diff changeset	1278
3169 b1013d768911 fix request counter in resolver handling, the bug was introduced in r3050 Igor Sysoev <igor@sysoev.ru> parents: 3161 diff changeset	1279 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	1280
d3c15c7831eb Upstream: call ngx_http_run_posted_requests() on resolve errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5104 diff changeset	1281 failed:
d3c15c7831eb Upstream: call ngx_http_run_posted_requests() on resolve errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5104 diff changeset	1282
7041 6169dbad37d8 Upstream: fixed running posted requests (ticket #788). Roman Arutyunyan <arut@nginx.com> parents: 7018 diff changeset	1283 if (run_posted) {
6169dbad37d8 Upstream: fixed running posted requests (ticket #788). Roman Arutyunyan <arut@nginx.com> parents: 7018 diff changeset	1284 ngx_http_run_posted_requests(c);
6169dbad37d8 Upstream: fixed running posted requests (ticket #788). Roman Arutyunyan <arut@nginx.com> parents: 7018 diff changeset	1285 }
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1286 }
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1287
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1288
13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1289 static void
2377 87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1290 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	1291 {
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1292 ngx_connection_t *c;
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1293 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	1294 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	1295
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1296 c = ev->data;
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1297 r = c->data;
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1298
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1299 u = r->upstream;
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1300 c = r->connection;
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1301
5928 8dfee01ff0bd Upstream: improved subrequest logging. Maxim Dounin <mdounin@mdounin.ru> parents: 5911 diff changeset	1302 ngx_http_set_log_request(c->log, r);
2377 87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1303
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1304 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	1305 "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	1306
6961 903fb1ddc07f Moved handling of wev->delayed to the connection event handler. Maxim Dounin <mdounin@mdounin.ru> parents: 6950 diff changeset	1307 if (ev->delayed && ev->timedout) {
903fb1ddc07f Moved handling of wev->delayed to the connection event handler. Maxim Dounin <mdounin@mdounin.ru> parents: 6950 diff changeset	1308 ev->delayed = 0;
903fb1ddc07f Moved handling of wev->delayed to the connection event handler. Maxim Dounin <mdounin@mdounin.ru> parents: 6950 diff changeset	1309 ev->timedout = 0;
903fb1ddc07f Moved handling of wev->delayed to the connection event handler. Maxim Dounin <mdounin@mdounin.ru> parents: 6950 diff changeset	1310 }
903fb1ddc07f Moved handling of wev->delayed to the connection event handler. Maxim Dounin <mdounin@mdounin.ru> parents: 6950 diff changeset	1311
2377 87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1312 if (ev->write) {
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	1313 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	1314
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1315 } else {
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	1316 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	1317 }
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1318
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1319 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	1320 }
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1321
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1322
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1323 static void
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1324 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	1325 {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1326 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	1327 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1328
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1329
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1330 static void
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1331 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	1332 {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1333 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	1334 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1335
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1336
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1337 static void
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1338 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	1339 ngx_event_t *ev)
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1340 {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1341 int n;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1342 char buf[1];
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1343 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	1344 ngx_int_t event;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1345 ngx_connection_t *c;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1346 ngx_http_upstream_t *u;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1347
527 7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	1348 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	1349 "http upstream check client, write event:%d, \"%V\"",
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	1350 ev->write, &r->uri);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1351
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1352 c = r->connection;
483 621229427cba nginx-0.1.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	1353 u = r->upstream;
621229427cba nginx-0.1.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	1354
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	1355 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	1356 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	1357
6ad4bba6313e delete level event of appropriate type, this should fix select()'s EBADF, Igor Sysoev <igor@sysoev.ru> parents: 2805 diff changeset	1358 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	1359
6ad4bba6313e delete level event of appropriate type, this should fix select()'s EBADF, Igor Sysoev <igor@sysoev.ru> parents: 2805 diff changeset	1360 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	1361 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	1362 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	1363 return;
6ad4bba6313e delete level event of appropriate type, this should fix select()'s EBADF, Igor Sysoev <igor@sysoev.ru> parents: 2805 diff changeset	1364 }
6ad4bba6313e delete level event of appropriate type, this should fix select()'s EBADF, Igor Sysoev <igor@sysoev.ru> parents: 2805 diff changeset	1365 }
6ad4bba6313e delete level event of appropriate type, this should fix select()'s EBADF, Igor Sysoev <igor@sysoev.ru> parents: 2805 diff changeset	1366
2757 9cc973b46af1 get a full response if the response is cacheable or storable even Igor Sysoev <igor@sysoev.ru> parents: 2708 diff changeset	1367 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	1368 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	1369 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	1370 }
2807 6ad4bba6313e delete level event of appropriate type, this should fix select()'s EBADF, Igor Sysoev <igor@sysoev.ru> parents: 2805 diff changeset	1371
527 7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	1372 return;
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	1373 }
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	1374
6246 257b51c37c5a The HTTP/2 implementation (RFC 7240, 7241). Valentin Bartenev <vbart@nginx.com> parents: 6242 diff changeset	1375 #if (NGX_HTTP_V2)
257b51c37c5a The HTTP/2 implementation (RFC 7240, 7241). Valentin Bartenev <vbart@nginx.com> parents: 6242 diff changeset	1376 if (r->stream) {
5121 c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: 5113 diff changeset	1377 return;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: 5113 diff changeset	1378 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: 5113 diff changeset	1379 #endif
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: 5113 diff changeset	1380
8921 33226ac61076 HTTP/3: merged ngx_http_quic_module into ngx_http_v3_module. Roman Arutyunyan <arut@nginx.com> parents: 8889 diff changeset	1381 #if (NGX_HTTP_V3)
8521 a748095bf94e HTTP/3: special handling of client errors in the upstream module. Roman Arutyunyan <arut@nginx.com> parents: 7679 diff changeset	1382
8630 279ad36f2f4b QUIC: renamed c->qs to c->quic. Roman Arutyunyan <arut@nginx.com> parents: 8584 diff changeset	1383 if (c->quic) {
8521 a748095bf94e HTTP/3: special handling of client errors in the upstream module. Roman Arutyunyan <arut@nginx.com> parents: 7679 diff changeset	1384 if (c->write->error) {
a748095bf94e HTTP/3: special handling of client errors in the upstream module. Roman Arutyunyan <arut@nginx.com> parents: 7679 diff changeset	1385 ngx_http_upstream_finalize_request(r, u,
a748095bf94e HTTP/3: special handling of client errors in the upstream module. Roman Arutyunyan <arut@nginx.com> parents: 7679 diff changeset	1386 NGX_HTTP_CLIENT_CLOSED_REQUEST);
a748095bf94e HTTP/3: special handling of client errors in the upstream module. Roman Arutyunyan <arut@nginx.com> parents: 7679 diff changeset	1387 }
a748095bf94e HTTP/3: special handling of client errors in the upstream module. Roman Arutyunyan <arut@nginx.com> parents: 7679 diff changeset	1388
a748095bf94e HTTP/3: special handling of client errors in the upstream module. Roman Arutyunyan <arut@nginx.com> parents: 7679 diff changeset	1389 return;
a748095bf94e HTTP/3: special handling of client errors in the upstream module. Roman Arutyunyan <arut@nginx.com> parents: 7679 diff changeset	1390 }
a748095bf94e HTTP/3: special handling of client errors in the upstream module. Roman Arutyunyan <arut@nginx.com> parents: 7679 diff changeset	1391
a748095bf94e HTTP/3: special handling of client errors in the upstream module. Roman Arutyunyan <arut@nginx.com> parents: 7679 diff changeset	1392 #endif
a748095bf94e HTTP/3: special handling of client errors in the upstream module. Roman Arutyunyan <arut@nginx.com> parents: 7679 diff changeset	1393
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1394 #if (NGX_HAVE_KQUEUE)
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1395
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1396 if (ngx_event_flags & NGX_USE_KQUEUE_EVENT) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1397
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1398 if (!ev->pending_eof) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1399 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1400 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1401
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1402 ev->eof = 1;
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	1403 c->error = 1;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1404
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1405 if (ev->kq_errno) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1406 ev->error = 1;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1407 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1408
2757 9cc973b46af1 get a full response if the response is cacheable or storable even Igor Sysoev <igor@sysoev.ru> parents: 2708 diff changeset	1409 if (!u->cacheable && u->peer.connection) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1410 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	1411 "kevent() reported that client prematurely closed "
527 7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	1412 "connection, so upstream connection is closed too");
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1413 ngx_http_upstream_finalize_request(r, u,
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1414 NGX_HTTP_CLIENT_CLOSED_REQUEST);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1415 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1416 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1417
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1418 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	1419 "kevent() reported that client prematurely closed "
75d2388bd6b9 Tweaked error messages. Ruslan Ermilov <ru@nginx.com> parents: 4176 diff changeset	1420 "connection");
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1421
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1422 if (u->peer.connection == NULL) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1423 ngx_http_upstream_finalize_request(r, u,
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1424 NGX_HTTP_CLIENT_CLOSED_REQUEST);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1425 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1426
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1427 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1428 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1429
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1430 #endif
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1431
5373 46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1432 #if (NGX_HAVE_EPOLLRDHUP)
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1433
6536 f7849bfb6d21 Improved EPOLLRDHUP handling. Valentin Bartenev <vbart@nginx.com> parents: 6530 diff changeset	1434 if ((ngx_event_flags & NGX_USE_EPOLL_EVENT) && ngx_use_epoll_rdhup) {
5373 46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1435 socklen_t len;
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1436
6536 f7849bfb6d21 Improved EPOLLRDHUP handling. Valentin Bartenev <vbart@nginx.com> parents: 6530 diff changeset	1437 if (!ev->pending_eof) {
f7849bfb6d21 Improved EPOLLRDHUP handling. Valentin Bartenev <vbart@nginx.com> parents: 6530 diff changeset	1438 return;
f7849bfb6d21 Improved EPOLLRDHUP handling. Valentin Bartenev <vbart@nginx.com> parents: 6530 diff changeset	1439 }
f7849bfb6d21 Improved EPOLLRDHUP handling. Valentin Bartenev <vbart@nginx.com> parents: 6530 diff changeset	1440
5373 46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1441 ev->eof = 1;
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1442 c->error = 1;
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1443
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1444 err = 0;
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1445 len = sizeof(ngx_err_t);
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1446
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1447 /*
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1448 * 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	1449 * 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	1450 */
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1451
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1452 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	1453 == -1)
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1454 {
5557 188481078faf Use ngx_socket_errno where appropriate. Piotr Sikora <piotr@cloudflare.com> parents: 5546 diff changeset	1455 err = ngx_socket_errno;
5373 46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1456 }
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1457
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1458 if (err) {
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1459 ev->error = 1;
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1460 }
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1461
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1462 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	1463 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	1464 "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	1465 "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	1466 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	1467 NGX_HTTP_CLIENT_CLOSED_REQUEST);
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1468 return;
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1469 }
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1470
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1471 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	1472 "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	1473 "connection");
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1474
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1475 if (u->peer.connection == NULL) {
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1476 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	1477 NGX_HTTP_CLIENT_CLOSED_REQUEST);
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1478 }
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1479
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1480 return;
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1481 }
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1482
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1483 #endif
46bdbca10dfc Upstream: use EPOLLRDHUP to check broken connections (ticket #320). Valentin Bartenev <vbart@nginx.com> parents: 5368 diff changeset	1484
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1485 n = recv(c->fd, buf, 1, MSG_PEEK);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1486
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1487 err = ngx_socket_errno;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1488
1109 1402dbb554c4 add debug logging Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	1489 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ev->log, err,
1402dbb554c4 add debug logging Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	1490 "http upstream recv(): %d", n);
1402dbb554c4 add debug logging Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	1491
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1492 if (ev->write && (n >= 0 \|\| err == NGX_EAGAIN)) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1493 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1494 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1495
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1496 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	1497
6ad4bba6313e delete level event of appropriate type, this should fix select()'s EBADF, Igor Sysoev <igor@sysoev.ru> parents: 2805 diff changeset	1498 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	1499
6ad4bba6313e delete level event of appropriate type, this should fix select()'s EBADF, Igor Sysoev <igor@sysoev.ru> parents: 2805 diff changeset	1500 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	1501 ngx_http_upstream_finalize_request(r, u,
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1502 NGX_HTTP_INTERNAL_SERVER_ERROR);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1503 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1504 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1505 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1506
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1507 if (n > 0) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1508 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1509 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1510
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1511 if (n == -1) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1512 if (err == NGX_EAGAIN) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1513 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1514 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1515
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1516 ev->error = 1;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1517
483 621229427cba nginx-0.1.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	1518 } else { /* n == 0 */
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1519 err = 0;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1520 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1521
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	1522 ev->eof = 1;
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	1523 c->error = 1;
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	1524
2757 9cc973b46af1 get a full response if the response is cacheable or storable even Igor Sysoev <igor@sysoev.ru> parents: 2708 diff changeset	1525 if (!u->cacheable && u->peer.connection) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1526 ngx_log_error(NGX_LOG_INFO, ev->log, err,
4182 75d2388bd6b9 Tweaked error messages. Ruslan Ermilov <ru@nginx.com> parents: 4176 diff changeset	1527 "client prematurely closed connection, "
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1528 "so upstream connection is closed too");
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1529 ngx_http_upstream_finalize_request(r, u,
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1530 NGX_HTTP_CLIENT_CLOSED_REQUEST);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1531 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1532 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1533
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1534 ngx_log_error(NGX_LOG_INFO, ev->log, err,
4182 75d2388bd6b9 Tweaked error messages. Ruslan Ermilov <ru@nginx.com> parents: 4176 diff changeset	1535 "client prematurely closed connection");
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1536
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1537 if (u->peer.connection == NULL) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1538 ngx_http_upstream_finalize_request(r, u,
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1539 NGX_HTTP_CLIENT_CLOSED_REQUEST);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1540 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1541 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1542
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1543
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	1544 static void
31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	1545 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	1546 {
7949 862f6130d357 Upstream: sendfile_max_chunk support. Maxim Dounin <mdounin@mdounin.ru> parents: 7941 diff changeset	1547 ngx_int_t rc;
862f6130d357 Upstream: sendfile_max_chunk support. Maxim Dounin <mdounin@mdounin.ru> parents: 7941 diff changeset	1548 ngx_connection_t *c;
862f6130d357 Upstream: sendfile_max_chunk support. Maxim Dounin <mdounin@mdounin.ru> parents: 7941 diff changeset	1549 ngx_http_core_loc_conf_t *clcf;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1550
483 621229427cba nginx-0.1.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	1551 r->connection->log->action = "connecting to upstream";
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1552
7397 860d3907da1c Upstream: revised upstream response time variables. Vladimir Homutov <vl@nginx.com> parents: 7371 diff changeset	1553 if (u->state && u->state->response_time == (ngx_msec_t) -1) {
860d3907da1c Upstream: revised upstream response time variables. Vladimir Homutov <vl@nginx.com> parents: 7371 diff changeset	1554 u->state->response_time = ngx_current_msec - u->start_time;
665 5fd7a5e99047 nginx-0.3.54-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	1555 }
5fd7a5e99047 nginx-0.3.54-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	1556
1168 4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	1557 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	1558 if (u->state == NULL) {
5fd7a5e99047 nginx-0.3.54-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	1559 ngx_http_upstream_finalize_request(r, u,
5fd7a5e99047 nginx-0.3.54-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	1560 NGX_HTTP_INTERNAL_SERVER_ERROR);
5fd7a5e99047 nginx-0.3.54-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	1561 return;
5fd7a5e99047 nginx-0.3.54-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	1562 }
5fd7a5e99047 nginx-0.3.54-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	1563
5fd7a5e99047 nginx-0.3.54-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	1564 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	1565
7397 860d3907da1c Upstream: revised upstream response time variables. Vladimir Homutov <vl@nginx.com> parents: 7371 diff changeset	1566 u->start_time = ngx_current_msec;
860d3907da1c Upstream: revised upstream response time variables. Vladimir Homutov <vl@nginx.com> parents: 7371 diff changeset	1567
860d3907da1c Upstream: revised upstream response time variables. Vladimir Homutov <vl@nginx.com> parents: 7371 diff changeset	1568 u->state->response_time = (ngx_msec_t) -1;
6147 74b6ef56ea56 Upstream: $upstream_connect_time. Ruslan Ermilov <ru@nginx.com> parents: 6146 diff changeset	1569 u->state->connect_time = (ngx_msec_t) -1;
6146 59fc60585f1e Upstream: times to obtain header/response are stored as ngx_msec_t. Ruslan Ermilov <ru@nginx.com> parents: 6125 diff changeset	1570 u->state->header_time = (ngx_msec_t) -1;
665 5fd7a5e99047 nginx-0.3.54-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	1571
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1572 rc = ngx_event_connect_peer(&u->peer);
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 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	1575 "http upstream connect: %i", rc);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1576
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1577 if (rc == NGX_ERROR) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1578 ngx_http_upstream_finalize_request(r, u,
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1579 NGX_HTTP_INTERNAL_SERVER_ERROR);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1580 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1581 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1582
1707 f3188f6eae1f $upstream_addr did not contain last address, the bug was introduced in r1659 Igor Sysoev <igor@sysoev.ru> parents: 1706 diff changeset	1583 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	1584
543 511a89da35ad nginx-0.2.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 541 diff changeset	1585 if (rc == NGX_BUSY) {
511a89da35ad nginx-0.2.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 541 diff changeset	1586 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	1587 ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_NOLIVE);
0be898896d1a backup upstream servers Igor Sysoev <igor@sysoev.ru> parents: 1340 diff changeset	1588 return;
543 511a89da35ad nginx-0.2.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 541 diff changeset	1589 }
511a89da35ad nginx-0.2.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 541 diff changeset	1590
1378 0be898896d1a backup upstream servers Igor Sysoev <igor@sysoev.ru> parents: 1340 diff changeset	1591 if (rc == NGX_DECLINED) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1592 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	1593 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1594 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1595
5261 af60a210cb78 Upstream: updated list of ngx_event_connect_peer() return values. Ruslan Ermilov <ru@nginx.com> parents: 5231 diff changeset	1596 /* 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	1597
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1598 c = u->peer.connection;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1599
7340 70c6b08973a0 Upstream keepalive: keepalive_requests directive. Maxim Dounin <mdounin@mdounin.ru> parents: 7320 diff changeset	1600 c->requests++;
70c6b08973a0 Upstream keepalive: keepalive_requests directive. Maxim Dounin <mdounin@mdounin.ru> parents: 7320 diff changeset	1601
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1602 c->data = r;
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1603
2377 87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1604 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	1605 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	1606
87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1607 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	1608 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	1609
1397 6c25a49e548a upstream sendfile bit was overridden by r->connection->sendfile Igor Sysoev <igor@sysoev.ru> parents: 1378 diff changeset	1610 c->sendfile &= r->connection->sendfile;
1958 3e9e4581fbba fix peer sendfile capability Igor Sysoev <igor@sysoev.ru> parents: 1947 diff changeset	1611 u->output.sendfile = c->sendfile;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1612
7306 8eab05b83dde Upstream: fixed unexpected tcp_nopush usage on peer connections. Maxim Dounin <mdounin@mdounin.ru> parents: 7297 diff changeset	1613 if (r->connection->tcp_nopush == NGX_TCP_NOPUSH_DISABLED) {
8eab05b83dde Upstream: fixed unexpected tcp_nopush usage on peer connections. Maxim Dounin <mdounin@mdounin.ru> parents: 7297 diff changeset	1614 c->tcp_nopush = NGX_TCP_NOPUSH_DISABLED;
8eab05b83dde Upstream: fixed unexpected tcp_nopush usage on peer connections. Maxim Dounin <mdounin@mdounin.ru> parents: 7297 diff changeset	1615 }
8eab05b83dde Upstream: fixed unexpected tcp_nopush usage on peer connections. Maxim Dounin <mdounin@mdounin.ru> parents: 7297 diff changeset	1616
4116 9baf12ea5ca1 Upstream: separate pool for peer connections. Maxim Dounin <mdounin@mdounin.ru> parents: 4115 diff changeset	1617 if (c->pool == NULL) {
9baf12ea5ca1 Upstream: separate pool for peer connections. Maxim Dounin <mdounin@mdounin.ru> parents: 4115 diff changeset	1618
9baf12ea5ca1 Upstream: separate pool for peer connections. Maxim Dounin <mdounin@mdounin.ru> parents: 4115 diff changeset	1619 /* 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	1620
9baf12ea5ca1 Upstream: separate pool for peer connections. Maxim Dounin <mdounin@mdounin.ru> parents: 4115 diff changeset	1621 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	1622 if (c->pool == NULL) {
9baf12ea5ca1 Upstream: separate pool for peer connections. Maxim Dounin <mdounin@mdounin.ru> parents: 4115 diff changeset	1623 ngx_http_upstream_finalize_request(r, u,
9baf12ea5ca1 Upstream: separate pool for peer connections. Maxim Dounin <mdounin@mdounin.ru> parents: 4115 diff changeset	1624 NGX_HTTP_INTERNAL_SERVER_ERROR);
9baf12ea5ca1 Upstream: separate pool for peer connections. Maxim Dounin <mdounin@mdounin.ru> parents: 4115 diff changeset	1625 return;
9baf12ea5ca1 Upstream: separate pool for peer connections. Maxim Dounin <mdounin@mdounin.ru> parents: 4115 diff changeset	1626 }
9baf12ea5ca1 Upstream: separate pool for peer connections. Maxim Dounin <mdounin@mdounin.ru> parents: 4115 diff changeset	1627 }
9baf12ea5ca1 Upstream: separate pool for peer connections. Maxim Dounin <mdounin@mdounin.ru> parents: 4115 diff changeset	1628
2847 3e10674139e4 style fix Igor Sysoev <igor@sysoev.ru> parents: 2824 diff changeset	1629 c->log = r->connection->log;
4116 9baf12ea5ca1 Upstream: separate pool for peer connections. Maxim Dounin <mdounin@mdounin.ru> parents: 4115 diff changeset	1630 c->pool->log = c->log;
2847 3e10674139e4 style fix Igor Sysoev <igor@sysoev.ru> parents: 2824 diff changeset	1631 c->read->log = c->log;
3e10674139e4 style fix Igor Sysoev <igor@sysoev.ru> parents: 2824 diff changeset	1632 c->write->log = c->log;
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 /* 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	1635
7949 862f6130d357 Upstream: sendfile_max_chunk support. Maxim Dounin <mdounin@mdounin.ru> parents: 7941 diff changeset	1636 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
862f6130d357 Upstream: sendfile_max_chunk support. Maxim Dounin <mdounin@mdounin.ru> parents: 7941 diff changeset	1637
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1638 u->writer.out = NULL;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1639 u->writer.last = &u->writer.out;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1640 u->writer.connection = c;
7949 862f6130d357 Upstream: sendfile_max_chunk support. Maxim Dounin <mdounin@mdounin.ru> parents: 7941 diff changeset	1641 u->writer.limit = clcf->sendfile_max_chunk;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1642
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1643 if (u->request_sent) {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1644 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	1645 ngx_http_upstream_finalize_request(r, u,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1646 NGX_HTTP_INTERNAL_SERVER_ERROR);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1647 return;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	1648 }
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1649 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1650
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	1651 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	1652 && 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	1653 && 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	1654 && 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	1655 {
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1656 /*
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1657 * 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	1658 * 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	1659 */
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1660
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1661 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	1662 if (u->output.free == NULL) {
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1663 ngx_http_upstream_finalize_request(r, u,
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1664 NGX_HTTP_INTERNAL_SERVER_ERROR);
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1665 return;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1666 }
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1667
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1668 u->output.free->buf = r->request_body->buf;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1669 u->output.free->next = NULL;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1670 u->output.allocated = 1;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1671
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	1672 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	1673 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	1674 r->request_body->buf->tag = u->output.tag;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1675 }
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 u->request_sent = 0;
6332 78b4e10b4367 Upstream: don't keep connections on early responses (ticket #669). Maxim Dounin <mdounin@mdounin.ru> parents: 6326 diff changeset	1678 u->request_body_sent = 0;
7231 22f7bdbd96d3 Upstream: u->request_body_blocked flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7230 diff changeset	1679 u->request_body_blocked = 0;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1680
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1681 if (rc == NGX_AGAIN) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1682 ngx_add_timer(c->write, u->conf->connect_timeout);
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
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1686 #if (NGX_HTTP_SSL)
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1687
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	1688 if (u->ssl && c->ssl == NULL) {
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1689 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	1690 return;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1691 }
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1692
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1693 #endif
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1694
6050 a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1695 ngx_http_upstream_send_request(r, u, 1);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1696 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1697
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1698
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1699 #if (NGX_HTTP_SSL)
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1700
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1701 static void
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1702 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	1703 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	1704 {
6068 643f2ce02f1c Upstream: abbreviated SSL handshake may interact badly with Nagle. Ruslan Ermilov <ru@nginx.com> parents: 6050 diff changeset	1705 ngx_int_t rc;
643f2ce02f1c Upstream: abbreviated SSL handshake may interact badly with Nagle. Ruslan Ermilov <ru@nginx.com> parents: 6050 diff changeset	1706 ngx_http_core_loc_conf_t *clcf;
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1707
5305 12b750d35162 Upstream: reliably detect connection failures with SSL peers. Ruslan Ermilov <ru@nginx.com> parents: 5304 diff changeset	1708 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	1709 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	1710 return;
12b750d35162 Upstream: reliably detect connection failures with SSL peers. Ruslan Ermilov <ru@nginx.com> parents: 5304 diff changeset	1711 }
12b750d35162 Upstream: reliably detect connection failures with SSL peers. Ruslan Ermilov <ru@nginx.com> parents: 5304 diff changeset	1712
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1713 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	1714 NGX_SSL_BUFFER\|NGX_SSL_CLIENT)
2536 a6d6d762c554 small optimization: " == NGX_ERROR" > " != NGX_OK" Igor Sysoev <igor@sysoev.ru> parents: 2463 diff changeset	1715 != NGX_OK)
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1716 {
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1717 ngx_http_upstream_finalize_request(r, u,
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1718 NGX_HTTP_INTERNAL_SERVER_ERROR);
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1719 return;
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1720 }
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1721
5661 060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1722 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	1723 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	1724 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	1725 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	1726 return;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1727 }
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1728 }
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1729
8042 c7e25324be11 Upstream: handling of certificates specified as an empty string. Sergey Kandaurov <pluknet@nginx.com> parents: 8041 diff changeset	1730 if (u->conf->ssl_certificate
c7e25324be11 Upstream: handling of certificates specified as an empty string. Sergey Kandaurov <pluknet@nginx.com> parents: 8041 diff changeset	1731 && u->conf->ssl_certificate->value.len
c7e25324be11 Upstream: handling of certificates specified as an empty string. Sergey Kandaurov <pluknet@nginx.com> parents: 8041 diff changeset	1732 && (u->conf->ssl_certificate->lengths
c7e25324be11 Upstream: handling of certificates specified as an empty string. Sergey Kandaurov <pluknet@nginx.com> parents: 8041 diff changeset	1733 \|\| u->conf->ssl_certificate_key->lengths))
7833 3ab8e1e2f0f7 Upstream: variables support in certificates. Maxim Dounin <mdounin@mdounin.ru> parents: 7811 diff changeset	1734 {
3ab8e1e2f0f7 Upstream: variables support in certificates. Maxim Dounin <mdounin@mdounin.ru> parents: 7811 diff changeset	1735 if (ngx_http_upstream_ssl_certificate(r, u, c) != NGX_OK) {
3ab8e1e2f0f7 Upstream: variables support in certificates. Maxim Dounin <mdounin@mdounin.ru> parents: 7811 diff changeset	1736 ngx_http_upstream_finalize_request(r, u,
3ab8e1e2f0f7 Upstream: variables support in certificates. Maxim Dounin <mdounin@mdounin.ru> parents: 7811 diff changeset	1737 NGX_HTTP_INTERNAL_SERVER_ERROR);
3ab8e1e2f0f7 Upstream: variables support in certificates. Maxim Dounin <mdounin@mdounin.ru> parents: 7811 diff changeset	1738 return;
3ab8e1e2f0f7 Upstream: variables support in certificates. Maxim Dounin <mdounin@mdounin.ru> parents: 7811 diff changeset	1739 }
3ab8e1e2f0f7 Upstream: variables support in certificates. Maxim Dounin <mdounin@mdounin.ru> parents: 7811 diff changeset	1740 }
3ab8e1e2f0f7 Upstream: variables support in certificates. Maxim Dounin <mdounin@mdounin.ru> parents: 7811 diff changeset	1741
2184 274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2183 diff changeset	1742 if (u->conf->ssl_session_reuse) {
7320 696df3ac27ac SSL: save sessions for upstream peers using a callback function. Sergey Kandaurov <pluknet@nginx.com> parents: 7307 diff changeset	1743 c->ssl->save_session = ngx_http_upstream_ssl_save_session;
696df3ac27ac SSL: save sessions for upstream peers using a callback function. Sergey Kandaurov <pluknet@nginx.com> parents: 7307 diff changeset	1744
2184 274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2183 diff changeset	1745 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	1746 ngx_http_upstream_finalize_request(r, u,
274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2183 diff changeset	1747 NGX_HTTP_INTERNAL_SERVER_ERROR);
274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2183 diff changeset	1748 return;
274c0f3ea600 proxy_ssl_session_reuse Igor Sysoev <igor@sysoev.ru> parents: 2183 diff changeset	1749 }
6068 643f2ce02f1c Upstream: abbreviated SSL handshake may interact badly with Nagle. Ruslan Ermilov <ru@nginx.com> parents: 6050 diff changeset	1750
643f2ce02f1c Upstream: abbreviated SSL handshake may interact badly with Nagle. Ruslan Ermilov <ru@nginx.com> parents: 6050 diff changeset	1751 /* abbreviated SSL handshake may interact badly with Nagle */
643f2ce02f1c Upstream: abbreviated SSL handshake may interact badly with Nagle. Ruslan Ermilov <ru@nginx.com> parents: 6050 diff changeset	1752
643f2ce02f1c Upstream: abbreviated SSL handshake may interact badly with Nagle. Ruslan Ermilov <ru@nginx.com> parents: 6050 diff changeset	1753 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
643f2ce02f1c Upstream: abbreviated SSL handshake may interact badly with Nagle. Ruslan Ermilov <ru@nginx.com> parents: 6050 diff changeset	1754
7007 ed1101bbf19f Introduced ngx_tcp_nodelay(). Ruslan Ermilov <ru@nginx.com> parents: 7006 diff changeset	1755 if (clcf->tcp_nodelay && ngx_tcp_nodelay(c) != NGX_OK) {
ed1101bbf19f Introduced ngx_tcp_nodelay(). Ruslan Ermilov <ru@nginx.com> parents: 7006 diff changeset	1756 ngx_http_upstream_finalize_request(r, u,
6068 643f2ce02f1c Upstream: abbreviated SSL handshake may interact badly with Nagle. Ruslan Ermilov <ru@nginx.com> parents: 6050 diff changeset	1757 NGX_HTTP_INTERNAL_SERVER_ERROR);
7007 ed1101bbf19f Introduced ngx_tcp_nodelay(). Ruslan Ermilov <ru@nginx.com> parents: 7006 diff changeset	1758 return;
6068 643f2ce02f1c Upstream: abbreviated SSL handshake may interact badly with Nagle. Ruslan Ermilov <ru@nginx.com> parents: 6050 diff changeset	1759 }
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1760 }
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1761
641 5e8fb59c18c1 nginx-0.3.42-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1762 r->connection->log->action = "SSL handshaking to upstream";
5e8fb59c18c1 nginx-0.3.42-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	1763
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1764 rc = ngx_ssl_handshake(c);
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1765
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1766 if (rc == NGX_AGAIN) {
5774 9bf58a3da25b Upstream: SSL handshake timeouts. Maxim Dounin <mdounin@mdounin.ru> parents: 5770 diff changeset	1767
9bf58a3da25b Upstream: SSL handshake timeouts. Maxim Dounin <mdounin@mdounin.ru> parents: 5770 diff changeset	1768 if (!c->write->timer_set) {
9bf58a3da25b Upstream: SSL handshake timeouts. Maxim Dounin <mdounin@mdounin.ru> parents: 5770 diff changeset	1769 ngx_add_timer(c->write, u->conf->connect_timeout);
9bf58a3da25b Upstream: SSL handshake timeouts. Maxim Dounin <mdounin@mdounin.ru> parents: 5770 diff changeset	1770 }
9bf58a3da25b Upstream: SSL handshake timeouts. Maxim Dounin <mdounin@mdounin.ru> parents: 5770 diff changeset	1771
7042 bd2f97a3aecc Upstream: introduced ngx_http_upstream_ssl_handshake_handler(). Maxim Dounin <mdounin@mdounin.ru> parents: 7041 diff changeset	1772 c->ssl->handler = ngx_http_upstream_ssl_handshake_handler;
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1773 return;
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1774 }
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1775
7042 bd2f97a3aecc Upstream: introduced ngx_http_upstream_ssl_handshake_handler(). Maxim Dounin <mdounin@mdounin.ru> parents: 7041 diff changeset	1776 ngx_http_upstream_ssl_handshake(r, u, c);
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1777 }
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1778
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1779
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	1780 static void
7042 bd2f97a3aecc Upstream: introduced ngx_http_upstream_ssl_handshake_handler(). Maxim Dounin <mdounin@mdounin.ru> parents: 7041 diff changeset	1781 ngx_http_upstream_ssl_handshake_handler(ngx_connection_t *c)
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1782 {
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1783 ngx_http_request_t *r;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1784 ngx_http_upstream_t *u;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1785
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1786 r = c->data;
7042 bd2f97a3aecc Upstream: introduced ngx_http_upstream_ssl_handshake_handler(). Maxim Dounin <mdounin@mdounin.ru> parents: 7041 diff changeset	1787
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1788 u = r->upstream;
7042 bd2f97a3aecc Upstream: introduced ngx_http_upstream_ssl_handshake_handler(). Maxim Dounin <mdounin@mdounin.ru> parents: 7041 diff changeset	1789 c = r->connection;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1790
5928 8dfee01ff0bd Upstream: improved subrequest logging. Maxim Dounin <mdounin@mdounin.ru> parents: 5911 diff changeset	1791 ngx_http_set_log_request(c->log, r);
8dfee01ff0bd Upstream: improved subrequest logging. Maxim Dounin <mdounin@mdounin.ru> parents: 5911 diff changeset	1792
7042 bd2f97a3aecc Upstream: introduced ngx_http_upstream_ssl_handshake_handler(). Maxim Dounin <mdounin@mdounin.ru> parents: 7041 diff changeset	1793 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
bd2f97a3aecc Upstream: introduced ngx_http_upstream_ssl_handshake_handler(). Maxim Dounin <mdounin@mdounin.ru> parents: 7041 diff changeset	1794 "http upstream ssl handshake: \"%V?%V\"",
bd2f97a3aecc Upstream: introduced ngx_http_upstream_ssl_handshake_handler(). Maxim Dounin <mdounin@mdounin.ru> parents: 7041 diff changeset	1795 &r->uri, &r->args);
bd2f97a3aecc Upstream: introduced ngx_http_upstream_ssl_handshake_handler(). Maxim Dounin <mdounin@mdounin.ru> parents: 7041 diff changeset	1796
bd2f97a3aecc Upstream: introduced ngx_http_upstream_ssl_handshake_handler(). Maxim Dounin <mdounin@mdounin.ru> parents: 7041 diff changeset	1797 ngx_http_upstream_ssl_handshake(r, u, u->peer.connection);
bd2f97a3aecc Upstream: introduced ngx_http_upstream_ssl_handshake_handler(). Maxim Dounin <mdounin@mdounin.ru> parents: 7041 diff changeset	1798
bd2f97a3aecc Upstream: introduced ngx_http_upstream_ssl_handshake_handler(). Maxim Dounin <mdounin@mdounin.ru> parents: 7041 diff changeset	1799 ngx_http_run_posted_requests(c);
bd2f97a3aecc Upstream: introduced ngx_http_upstream_ssl_handshake_handler(). Maxim Dounin <mdounin@mdounin.ru> parents: 7041 diff changeset	1800 }
bd2f97a3aecc Upstream: introduced ngx_http_upstream_ssl_handshake_handler(). Maxim Dounin <mdounin@mdounin.ru> parents: 7041 diff changeset	1801
bd2f97a3aecc Upstream: introduced ngx_http_upstream_ssl_handshake_handler(). Maxim Dounin <mdounin@mdounin.ru> parents: 7041 diff changeset	1802
bd2f97a3aecc Upstream: introduced ngx_http_upstream_ssl_handshake_handler(). Maxim Dounin <mdounin@mdounin.ru> parents: 7041 diff changeset	1803 static void
bd2f97a3aecc Upstream: introduced ngx_http_upstream_ssl_handshake_handler(). Maxim Dounin <mdounin@mdounin.ru> parents: 7041 diff changeset	1804 ngx_http_upstream_ssl_handshake(ngx_http_request_t r, ngx_http_upstream_t u,
bd2f97a3aecc Upstream: introduced ngx_http_upstream_ssl_handshake_handler(). Maxim Dounin <mdounin@mdounin.ru> parents: 7041 diff changeset	1805 ngx_connection_t *c)
bd2f97a3aecc Upstream: introduced ngx_http_upstream_ssl_handshake_handler(). Maxim Dounin <mdounin@mdounin.ru> parents: 7041 diff changeset	1806 {
bd2f97a3aecc Upstream: introduced ngx_http_upstream_ssl_handshake_handler(). Maxim Dounin <mdounin@mdounin.ru> parents: 7041 diff changeset	1807 long rc;
bd2f97a3aecc Upstream: introduced ngx_http_upstream_ssl_handshake_handler(). Maxim Dounin <mdounin@mdounin.ru> parents: 7041 diff changeset	1808
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1809 if (c->ssl->handshaked) {
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1810
5661 060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1811 if (u->conf->ssl_verify) {
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1812 rc = SSL_get_verify_result(c->ssl->connection);
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1813
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1814 if (rc != X509_V_OK) {
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1815 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	1816 "upstream SSL certificate verify error: (%l:%s)",
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1817 rc, X509_verify_cert_error_string(rc));
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1818 goto failed;
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1819 }
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1820
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1821 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	1822 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	1823 "upstream SSL certificate does not match \"%V\"",
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1824 &u->ssl_name);
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1825 goto failed;
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1826 }
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1827 }
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1828
7941 65946a191197 SSL: SSL_sendfile() support with kernel TLS. Maxim Dounin <mdounin@mdounin.ru> parents: 7906 diff changeset	1829 if (!c->ssl->sendfile) {
65946a191197 SSL: SSL_sendfile() support with kernel TLS. Maxim Dounin <mdounin@mdounin.ru> parents: 7906 diff changeset	1830 c->sendfile = 0;
65946a191197 SSL: SSL_sendfile() support with kernel TLS. Maxim Dounin <mdounin@mdounin.ru> parents: 7906 diff changeset	1831 u->output.sendfile = 0;
65946a191197 SSL: SSL_sendfile() support with kernel TLS. Maxim Dounin <mdounin@mdounin.ru> parents: 7906 diff changeset	1832 }
65946a191197 SSL: SSL_sendfile() support with kernel TLS. Maxim Dounin <mdounin@mdounin.ru> parents: 7906 diff changeset	1833
2377 87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	1834 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	1835 c->read->handler = ngx_http_upstream_handler;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1836
6050 a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	1837 ngx_http_upstream_send_request(r, u, 1);
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1838
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1839 return;
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1840 }
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1841
6799 d8d037f20484 Upstream: handling of upstream SSL handshake timeouts. Maxim Dounin <mdounin@mdounin.ru> parents: 6795 diff changeset	1842 if (c->write->timedout) {
d8d037f20484 Upstream: handling of upstream SSL handshake timeouts. Maxim Dounin <mdounin@mdounin.ru> parents: 6795 diff changeset	1843 ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_TIMEOUT);
d8d037f20484 Upstream: handling of upstream SSL handshake timeouts. Maxim Dounin <mdounin@mdounin.ru> parents: 6795 diff changeset	1844 return;
d8d037f20484 Upstream: handling of upstream SSL handshake timeouts. Maxim Dounin <mdounin@mdounin.ru> parents: 6795 diff changeset	1845 }
d8d037f20484 Upstream: handling of upstream SSL handshake timeouts. Maxim Dounin <mdounin@mdounin.ru> parents: 6795 diff changeset	1846
5661 060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1847 failed:
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1848
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1849 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	1850 }
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1851
5660 7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1852
7320 696df3ac27ac SSL: save sessions for upstream peers using a callback function. Sergey Kandaurov <pluknet@nginx.com> parents: 7307 diff changeset	1853 static void
696df3ac27ac SSL: save sessions for upstream peers using a callback function. Sergey Kandaurov <pluknet@nginx.com> parents: 7307 diff changeset	1854 ngx_http_upstream_ssl_save_session(ngx_connection_t *c)
696df3ac27ac SSL: save sessions for upstream peers using a callback function. Sergey Kandaurov <pluknet@nginx.com> parents: 7307 diff changeset	1855 {
696df3ac27ac SSL: save sessions for upstream peers using a callback function. Sergey Kandaurov <pluknet@nginx.com> parents: 7307 diff changeset	1856 ngx_http_request_t *r;
696df3ac27ac SSL: save sessions for upstream peers using a callback function. Sergey Kandaurov <pluknet@nginx.com> parents: 7307 diff changeset	1857 ngx_http_upstream_t *u;
696df3ac27ac SSL: save sessions for upstream peers using a callback function. Sergey Kandaurov <pluknet@nginx.com> parents: 7307 diff changeset	1858
696df3ac27ac SSL: save sessions for upstream peers using a callback function. Sergey Kandaurov <pluknet@nginx.com> parents: 7307 diff changeset	1859 if (c->idle) {
696df3ac27ac SSL: save sessions for upstream peers using a callback function. Sergey Kandaurov <pluknet@nginx.com> parents: 7307 diff changeset	1860 return;
696df3ac27ac SSL: save sessions for upstream peers using a callback function. Sergey Kandaurov <pluknet@nginx.com> parents: 7307 diff changeset	1861 }
696df3ac27ac SSL: save sessions for upstream peers using a callback function. Sergey Kandaurov <pluknet@nginx.com> parents: 7307 diff changeset	1862
696df3ac27ac SSL: save sessions for upstream peers using a callback function. Sergey Kandaurov <pluknet@nginx.com> parents: 7307 diff changeset	1863 r = c->data;
696df3ac27ac SSL: save sessions for upstream peers using a callback function. Sergey Kandaurov <pluknet@nginx.com> parents: 7307 diff changeset	1864
696df3ac27ac SSL: save sessions for upstream peers using a callback function. Sergey Kandaurov <pluknet@nginx.com> parents: 7307 diff changeset	1865 u = r->upstream;
696df3ac27ac SSL: save sessions for upstream peers using a callback function. Sergey Kandaurov <pluknet@nginx.com> parents: 7307 diff changeset	1866 c = r->connection;
696df3ac27ac SSL: save sessions for upstream peers using a callback function. Sergey Kandaurov <pluknet@nginx.com> parents: 7307 diff changeset	1867
696df3ac27ac SSL: save sessions for upstream peers using a callback function. Sergey Kandaurov <pluknet@nginx.com> parents: 7307 diff changeset	1868 ngx_http_set_log_request(c->log, r);
696df3ac27ac SSL: save sessions for upstream peers using a callback function. Sergey Kandaurov <pluknet@nginx.com> parents: 7307 diff changeset	1869
696df3ac27ac SSL: save sessions for upstream peers using a callback function. Sergey Kandaurov <pluknet@nginx.com> parents: 7307 diff changeset	1870 u->peer.save_session(&u->peer, u->peer.data);
696df3ac27ac SSL: save sessions for upstream peers using a callback function. Sergey Kandaurov <pluknet@nginx.com> parents: 7307 diff changeset	1871 }
696df3ac27ac SSL: save sessions for upstream peers using a callback function. Sergey Kandaurov <pluknet@nginx.com> parents: 7307 diff changeset	1872
696df3ac27ac SSL: save sessions for upstream peers using a callback function. Sergey Kandaurov <pluknet@nginx.com> parents: 7307 diff changeset	1873
5660 7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1874 static ngx_int_t
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1875 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	1876 ngx_connection_t *c)
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1877 {
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1878 u_char p, last;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1879 ngx_str_t name;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1880
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1881 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	1882 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	1883 return NGX_ERROR;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1884 }
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1885
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1886 } else {
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1887 name = u->ssl_name;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1888 }
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1889
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1890 if (name.len == 0) {
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1891 goto done;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1892 }
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1893
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1894 /*
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1895 * 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	1896 * 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	1897 */
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1898
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1899 p = name.data;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1900 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	1901
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1902 if (*p == '[') {
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1903 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	1904
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1905 if (p == NULL) {
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1906 p = name.data;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1907 }
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1908 }
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1909
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1910 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	1911
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1912 if (p != NULL) {
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1913 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	1914 }
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1915
5661 060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1916 if (!u->conf->ssl_server_name) {
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1917 goto done;
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1918 }
060c2e692b96 Upstream: proxy_ssl_verify and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 5660 diff changeset	1919
5660 7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1920 #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	1921
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1922 /* 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	1923
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1924 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	1925 goto done;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1926 }
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1927
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1928 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	1929 goto done;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1930 }
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1931
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1932 /*
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1933 * 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	1934 * 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	1935 */
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1936
5667 16405e02e612 Upstream: for ssl name, non-aligned memory allocation is enough. Ruslan Ermilov <ru@nginx.com> parents: 5661 diff changeset	1937 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	1938 if (p == NULL) {
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1939 return NGX_ERROR;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1940 }
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1941
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1942 (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	1943
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1944 name.data = p;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1945
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1946 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	1947 "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	1948
6777 563a1ee345a4 SSL: compatibility with BoringSSL. Maxim Dounin <mdounin@mdounin.ru> parents: 6745 diff changeset	1949 if (SSL_set_tlsext_host_name(c->ssl->connection,
563a1ee345a4 SSL: compatibility with BoringSSL. Maxim Dounin <mdounin@mdounin.ru> parents: 6745 diff changeset	1950 (char *) name.data)
563a1ee345a4 SSL: compatibility with BoringSSL. Maxim Dounin <mdounin@mdounin.ru> parents: 6745 diff changeset	1951 == 0)
563a1ee345a4 SSL: compatibility with BoringSSL. Maxim Dounin <mdounin@mdounin.ru> parents: 6745 diff changeset	1952 {
5660 7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1953 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	1954 "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	1955 return NGX_ERROR;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1956 }
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1957
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1958 #endif
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1959
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1960 done:
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1961
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1962 u->ssl_name = name;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1963
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1964 return NGX_OK;
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1965 }
7022564a9e0e Upstream: proxy_ssl_name and proxy_ssl_server_name directives. Maxim Dounin <mdounin@mdounin.ru> parents: 5621 diff changeset	1966
7833 3ab8e1e2f0f7 Upstream: variables support in certificates. Maxim Dounin <mdounin@mdounin.ru> parents: 7811 diff changeset	1967
3ab8e1e2f0f7 Upstream: variables support in certificates. Maxim Dounin <mdounin@mdounin.ru> parents: 7811 diff changeset	1968 static ngx_int_t
3ab8e1e2f0f7 Upstream: variables support in certificates. Maxim Dounin <mdounin@mdounin.ru> parents: 7811 diff changeset	1969 ngx_http_upstream_ssl_certificate(ngx_http_request_t *r,
3ab8e1e2f0f7 Upstream: variables support in certificates. Maxim Dounin <mdounin@mdounin.ru> parents: 7811 diff changeset	1970 ngx_http_upstream_t u, ngx_connection_t c)
3ab8e1e2f0f7 Upstream: variables support in certificates. Maxim Dounin <mdounin@mdounin.ru> parents: 7811 diff changeset	1971 {
3ab8e1e2f0f7 Upstream: variables support in certificates. Maxim Dounin <mdounin@mdounin.ru> parents: 7811 diff changeset	1972 ngx_str_t cert, key;
3ab8e1e2f0f7 Upstream: variables support in certificates. Maxim Dounin <mdounin@mdounin.ru> parents: 7811 diff changeset	1973
3ab8e1e2f0f7 Upstream: variables support in certificates. Maxim Dounin <mdounin@mdounin.ru> parents: 7811 diff changeset	1974 if (ngx_http_complex_value(r, u->conf->ssl_certificate, &cert)
3ab8e1e2f0f7 Upstream: variables support in certificates. Maxim Dounin <mdounin@mdounin.ru> parents: 7811 diff changeset	1975 != NGX_OK)
3ab8e1e2f0f7 Upstream: variables support in certificates. Maxim Dounin <mdounin@mdounin.ru> parents: 7811 diff changeset	1976 {
3ab8e1e2f0f7 Upstream: variables support in certificates. Maxim Dounin <mdounin@mdounin.ru> parents: 7811 diff changeset	1977 return NGX_ERROR;
3ab8e1e2f0f7 Upstream: variables support in certificates. Maxim Dounin <mdounin@mdounin.ru> parents: 7811 diff changeset	1978 }
3ab8e1e2f0f7 Upstream: variables support in certificates. Maxim Dounin <mdounin@mdounin.ru> parents: 7811 diff changeset	1979
3ab8e1e2f0f7 Upstream: variables support in certificates. Maxim Dounin <mdounin@mdounin.ru> parents: 7811 diff changeset	1980 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
3ab8e1e2f0f7 Upstream: variables support in certificates. Maxim Dounin <mdounin@mdounin.ru> parents: 7811 diff changeset	1981 "http upstream ssl cert: \"%s\"", cert.data);
3ab8e1e2f0f7 Upstream: variables support in certificates. Maxim Dounin <mdounin@mdounin.ru> parents: 7811 diff changeset	1982
3ab8e1e2f0f7 Upstream: variables support in certificates. Maxim Dounin <mdounin@mdounin.ru> parents: 7811 diff changeset	1983 if (*cert.data == '\0') {
3ab8e1e2f0f7 Upstream: variables support in certificates. Maxim Dounin <mdounin@mdounin.ru> parents: 7811 diff changeset	1984 return NGX_OK;
3ab8e1e2f0f7 Upstream: variables support in certificates. Maxim Dounin <mdounin@mdounin.ru> parents: 7811 diff changeset	1985 }
3ab8e1e2f0f7 Upstream: variables support in certificates. Maxim Dounin <mdounin@mdounin.ru> parents: 7811 diff changeset	1986
3ab8e1e2f0f7 Upstream: variables support in certificates. Maxim Dounin <mdounin@mdounin.ru> parents: 7811 diff changeset	1987 if (ngx_http_complex_value(r, u->conf->ssl_certificate_key, &key)
3ab8e1e2f0f7 Upstream: variables support in certificates. Maxim Dounin <mdounin@mdounin.ru> parents: 7811 diff changeset	1988 != NGX_OK)
3ab8e1e2f0f7 Upstream: variables support in certificates. Maxim Dounin <mdounin@mdounin.ru> parents: 7811 diff changeset	1989 {
3ab8e1e2f0f7 Upstream: variables support in certificates. Maxim Dounin <mdounin@mdounin.ru> parents: 7811 diff changeset	1990 return NGX_ERROR;
3ab8e1e2f0f7 Upstream: variables support in certificates. Maxim Dounin <mdounin@mdounin.ru> parents: 7811 diff changeset	1991 }
3ab8e1e2f0f7 Upstream: variables support in certificates. Maxim Dounin <mdounin@mdounin.ru> parents: 7811 diff changeset	1992
3ab8e1e2f0f7 Upstream: variables support in certificates. Maxim Dounin <mdounin@mdounin.ru> parents: 7811 diff changeset	1993 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
3ab8e1e2f0f7 Upstream: variables support in certificates. Maxim Dounin <mdounin@mdounin.ru> parents: 7811 diff changeset	1994 "http upstream ssl key: \"%s\"", key.data);
3ab8e1e2f0f7 Upstream: variables support in certificates. Maxim Dounin <mdounin@mdounin.ru> parents: 7811 diff changeset	1995
3ab8e1e2f0f7 Upstream: variables support in certificates. Maxim Dounin <mdounin@mdounin.ru> parents: 7811 diff changeset	1996 if (ngx_ssl_connection_certificate(c, r->pool, &cert, &key,
3ab8e1e2f0f7 Upstream: variables support in certificates. Maxim Dounin <mdounin@mdounin.ru> parents: 7811 diff changeset	1997 u->conf->ssl_passwords)
3ab8e1e2f0f7 Upstream: variables support in certificates. Maxim Dounin <mdounin@mdounin.ru> parents: 7811 diff changeset	1998 != NGX_OK)
3ab8e1e2f0f7 Upstream: variables support in certificates. Maxim Dounin <mdounin@mdounin.ru> parents: 7811 diff changeset	1999 {
3ab8e1e2f0f7 Upstream: variables support in certificates. Maxim Dounin <mdounin@mdounin.ru> parents: 7811 diff changeset	2000 return NGX_ERROR;
3ab8e1e2f0f7 Upstream: variables support in certificates. Maxim Dounin <mdounin@mdounin.ru> parents: 7811 diff changeset	2001 }
3ab8e1e2f0f7 Upstream: variables support in certificates. Maxim Dounin <mdounin@mdounin.ru> parents: 7811 diff changeset	2002
3ab8e1e2f0f7 Upstream: variables support in certificates. Maxim Dounin <mdounin@mdounin.ru> parents: 7811 diff changeset	2003 return NGX_OK;
3ab8e1e2f0f7 Upstream: variables support in certificates. Maxim Dounin <mdounin@mdounin.ru> parents: 7811 diff changeset	2004 }
3ab8e1e2f0f7 Upstream: variables support in certificates. Maxim Dounin <mdounin@mdounin.ru> parents: 7811 diff changeset	2005
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2006 #endif
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2007
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2008
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2009 static ngx_int_t
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	2010 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	2011 {
5848 106a8bfa4f42 Upstream: fixed file buffers reinit in ngx_http_upstream_reinit(). Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	2012 off_t file_pos;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2013 ngx_chain_t *cl;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2014
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2015 if (u->reinit_request(r) != NGX_OK) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2016 return NGX_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2017 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2018
4120 42135dd1f0ea Upstream: keepalive flag. Maxim Dounin <mdounin@mdounin.ru> parents: 4119 diff changeset	2019 u->keepalive = 0;
5072 7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	2020 u->upgrade = 0;
7679 05e42236e95b FastCGI: protection from responses with wrong length. Maxim Dounin <mdounin@mdounin.ru> parents: 7678 diff changeset	2021 u->error = 0;
4120 42135dd1f0ea Upstream: keepalive flag. Maxim Dounin <mdounin@mdounin.ru> parents: 4119 diff changeset	2022
1705 d22095839d86 optimize r->upstream usage Igor Sysoev <igor@sysoev.ru> parents: 1701 diff changeset	2023 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	2024 u->headers_in.content_length_n = -1;
5869 fd283aa92e04 Upstream: fix $upstream_cache_last_modified variable. Piotr Sikora <piotr@cloudflare.com> parents: 5848 diff changeset	2025 u->headers_in.last_modified_time = -1;
1705 d22095839d86 optimize r->upstream usage Igor Sysoev <igor@sysoev.ru> parents: 1701 diff changeset	2026
d22095839d86 optimize r->upstream usage Igor Sysoev <igor@sysoev.ru> parents: 1701 diff changeset	2027 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	2028 sizeof(ngx_table_elt_t))
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	2029 != NGX_OK)
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2030 {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2031 return NGX_ERROR;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2032 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2033
7230 098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	2034 if (ngx_list_init(&u->headers_in.trailers, r->pool, 2,
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	2035 sizeof(ngx_table_elt_t))
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	2036 != NGX_OK)
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	2037 {
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	2038 return NGX_ERROR;
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	2039 }
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	2040
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2041 /* reinit the request chain */
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2042
5848 106a8bfa4f42 Upstream: fixed file buffers reinit in ngx_http_upstream_reinit(). Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	2043 file_pos = 0;
106a8bfa4f42 Upstream: fixed file buffers reinit in ngx_http_upstream_reinit(). Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	2044
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2045 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	2046 cl->buf->pos = cl->buf->start;
5848 106a8bfa4f42 Upstream: fixed file buffers reinit in ngx_http_upstream_reinit(). Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	2047
106a8bfa4f42 Upstream: fixed file buffers reinit in ngx_http_upstream_reinit(). Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	2048 /* there is at most one file */
106a8bfa4f42 Upstream: fixed file buffers reinit in ngx_http_upstream_reinit(). Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	2049
106a8bfa4f42 Upstream: fixed file buffers reinit in ngx_http_upstream_reinit(). Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	2050 if (cl->buf->in_file) {
106a8bfa4f42 Upstream: fixed file buffers reinit in ngx_http_upstream_reinit(). Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	2051 cl->buf->file_pos = file_pos;
106a8bfa4f42 Upstream: fixed file buffers reinit in ngx_http_upstream_reinit(). Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	2052 file_pos = cl->buf->file_last;
106a8bfa4f42 Upstream: fixed file buffers reinit in ngx_http_upstream_reinit(). Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	2053 }
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2054 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2055
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2056 /* reinit the subrequest's ngx_output_chain() context */
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2057
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	2058 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	2059 && r != r->main && u->output.buf)
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	2060 {
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	2061 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	2062 if (u->output.free == NULL) {
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	2063 return NGX_ERROR;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2064 }
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	2065
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	2066 u->output.free->buf = u->output.buf;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	2067 u->output.free->next = NULL;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	2068
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	2069 u->output.buf->pos = u->output.buf->start;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	2070 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	2071 }
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2072
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2073 u->output.buf = NULL;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2074 u->output.in = NULL;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2075 u->output.busy = NULL;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2076
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2077 /* reinit u->buffer */
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2078
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2079 u->buffer.pos = u->buffer.start;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2080
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2081 #if (NGX_HTTP_CACHE)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2082
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2083 if (r->cache) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2084 u->buffer.pos += r->cache->header_start;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2085 }
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2086
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2087 #endif
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2088
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2089 u->buffer.last = u->buffer.pos;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2090
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2091 return NGX_OK;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2092 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2093
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2094
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	2095 static void
6050 a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2096 ngx_http_upstream_send_request(ngx_http_request_t r, ngx_http_upstream_t u,
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2097 ngx_uint_t do_write)
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2098 {
1153 c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2099 ngx_int_t rc;
483 621229427cba nginx-0.1.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	2100 ngx_connection_t *c;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2101
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2102 c = u->peer.connection;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2103
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2104 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	2105 "http upstream send request");
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2106
6147 74b6ef56ea56 Upstream: $upstream_connect_time. Ruslan Ermilov <ru@nginx.com> parents: 6146 diff changeset	2107 if (u->state->connect_time == (ngx_msec_t) -1) {
7397 860d3907da1c Upstream: revised upstream response time variables. Vladimir Homutov <vl@nginx.com> parents: 7371 diff changeset	2108 u->state->connect_time = ngx_current_msec - u->start_time;
6147 74b6ef56ea56 Upstream: $upstream_connect_time. Ruslan Ermilov <ru@nginx.com> parents: 6146 diff changeset	2109 }
74b6ef56ea56 Upstream: $upstream_connect_time. Ruslan Ermilov <ru@nginx.com> parents: 6146 diff changeset	2110
1153 c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2111 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	2112 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	2113 return;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2114 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2115
483 621229427cba nginx-0.1.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	2116 c->log->action = "sending request to upstream";
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2117
6050 a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2118 rc = ngx_http_upstream_send_request_body(r, u, do_write);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2119
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2120 if (rc == NGX_ERROR) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2121 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	2122 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2123 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2124
6050 a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2125 if (rc >= NGX_HTTP_SPECIAL_RESPONSE) {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2126 ngx_http_upstream_finalize_request(r, u, rc);
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2127 return;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2128 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2129
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2130 if (rc == NGX_AGAIN) {
7231 22f7bdbd96d3 Upstream: u->request_body_blocked flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7230 diff changeset	2131 if (!c->write->ready \|\| u->request_body_blocked) {
6050 a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2132 ngx_add_timer(c->write, u->conf->send_timeout);
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2133
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2134 } else if (c->write->timer_set) {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2135 ngx_del_timer(c->write);
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2136 }
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2137
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2138 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	2139 ngx_http_upstream_finalize_request(r, u,
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2140 NGX_HTTP_INTERNAL_SERVER_ERROR);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2141 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2142 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2143
7307 ece9b5454b8a Upstream: fixed tcp_nopush with gRPC. Maxim Dounin <mdounin@mdounin.ru> parents: 7306 diff changeset	2144 if (c->write->ready && c->tcp_nopush == NGX_TCP_NOPUSH_SET) {
ece9b5454b8a Upstream: fixed tcp_nopush with gRPC. Maxim Dounin <mdounin@mdounin.ru> parents: 7306 diff changeset	2145 if (ngx_tcp_push(c->fd) == -1) {
ece9b5454b8a Upstream: fixed tcp_nopush with gRPC. Maxim Dounin <mdounin@mdounin.ru> parents: 7306 diff changeset	2146 ngx_log_error(NGX_LOG_CRIT, c->log, ngx_socket_errno,
ece9b5454b8a Upstream: fixed tcp_nopush with gRPC. Maxim Dounin <mdounin@mdounin.ru> parents: 7306 diff changeset	2147 ngx_tcp_push_n " failed");
ece9b5454b8a Upstream: fixed tcp_nopush with gRPC. Maxim Dounin <mdounin@mdounin.ru> parents: 7306 diff changeset	2148 ngx_http_upstream_finalize_request(r, u,
ece9b5454b8a Upstream: fixed tcp_nopush with gRPC. Maxim Dounin <mdounin@mdounin.ru> parents: 7306 diff changeset	2149 NGX_HTTP_INTERNAL_SERVER_ERROR);
ece9b5454b8a Upstream: fixed tcp_nopush with gRPC. Maxim Dounin <mdounin@mdounin.ru> parents: 7306 diff changeset	2150 return;
ece9b5454b8a Upstream: fixed tcp_nopush with gRPC. Maxim Dounin <mdounin@mdounin.ru> parents: 7306 diff changeset	2151 }
ece9b5454b8a Upstream: fixed tcp_nopush with gRPC. Maxim Dounin <mdounin@mdounin.ru> parents: 7306 diff changeset	2152
ece9b5454b8a Upstream: fixed tcp_nopush with gRPC. Maxim Dounin <mdounin@mdounin.ru> parents: 7306 diff changeset	2153 c->tcp_nopush = NGX_TCP_NOPUSH_UNSET;
ece9b5454b8a Upstream: fixed tcp_nopush with gRPC. Maxim Dounin <mdounin@mdounin.ru> parents: 7306 diff changeset	2154 }
ece9b5454b8a Upstream: fixed tcp_nopush with gRPC. Maxim Dounin <mdounin@mdounin.ru> parents: 7306 diff changeset	2155
7906 058a67435e83 Upstream: fixed timeouts with gRPC, SSL and select (ticket #2229). Maxim Dounin <mdounin@mdounin.ru> parents: 7833 diff changeset	2156 if (c->read->ready) {
058a67435e83 Upstream: fixed timeouts with gRPC, SSL and select (ticket #2229). Maxim Dounin <mdounin@mdounin.ru> parents: 7833 diff changeset	2157 ngx_post_event(c->read, &ngx_posted_events);
058a67435e83 Upstream: fixed timeouts with gRPC, SSL and select (ticket #2229). Maxim Dounin <mdounin@mdounin.ru> parents: 7833 diff changeset	2158 }
058a67435e83 Upstream: fixed timeouts with gRPC, SSL and select (ticket #2229). Maxim Dounin <mdounin@mdounin.ru> parents: 7833 diff changeset	2159
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2160 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2161 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2162
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2163 /* rc == NGX_OK */
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2164
6050 a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2165 if (c->write->timer_set) {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2166 ngx_del_timer(c->write);
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2167 }
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2168
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2169 if (c->tcp_nopush == NGX_TCP_NOPUSH_SET) {
7239 400a3412b1e3 Fixed checking ngx_tcp_push() and ngx_tcp_nopush() return values. Ruslan Ermilov <ru@nginx.com> parents: 7232 diff changeset	2170 if (ngx_tcp_push(c->fd) == -1) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2171 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	2172 ngx_tcp_push_n " failed");
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2173 ngx_http_upstream_finalize_request(r, u,
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2174 NGX_HTTP_INTERNAL_SERVER_ERROR);
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2175 return;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2176 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2177
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2178 c->tcp_nopush = NGX_TCP_NOPUSH_UNSET;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2179 }
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2180
7232 a7ed15573ae9 Upstream: u->conf->preserve_output flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7231 diff changeset	2181 if (!u->conf->preserve_output) {
a7ed15573ae9 Upstream: u->conf->preserve_output flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7231 diff changeset	2182 u->write_event_handler = ngx_http_upstream_dummy_handler;
a7ed15573ae9 Upstream: u->conf->preserve_output flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7231 diff changeset	2183 }
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2184
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2185 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	2186 ngx_http_upstream_finalize_request(r, u,
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2187 NGX_HTTP_INTERNAL_SERVER_ERROR);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2188 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2189 }
5745 9d3a9c45fc43 Upstream: fixed handling of write event after sending request. Valentin Bartenev <vbart@nginx.com> parents: 5738 diff changeset	2190
7260 08f114ed5449 Upstream: fixed u->conf->preserve_output (ticket #1519). Maxim Dounin <mdounin@mdounin.ru> parents: 7255 diff changeset	2191 if (!u->request_body_sent) {
08f114ed5449 Upstream: fixed u->conf->preserve_output (ticket #1519). Maxim Dounin <mdounin@mdounin.ru> parents: 7255 diff changeset	2192 u->request_body_sent = 1;
08f114ed5449 Upstream: fixed u->conf->preserve_output (ticket #1519). Maxim Dounin <mdounin@mdounin.ru> parents: 7255 diff changeset	2193
08f114ed5449 Upstream: fixed u->conf->preserve_output (ticket #1519). Maxim Dounin <mdounin@mdounin.ru> parents: 7255 diff changeset	2194 if (u->header_sent) {
08f114ed5449 Upstream: fixed u->conf->preserve_output (ticket #1519). Maxim Dounin <mdounin@mdounin.ru> parents: 7255 diff changeset	2195 return;
08f114ed5449 Upstream: fixed u->conf->preserve_output (ticket #1519). Maxim Dounin <mdounin@mdounin.ru> parents: 7255 diff changeset	2196 }
08f114ed5449 Upstream: fixed u->conf->preserve_output (ticket #1519). Maxim Dounin <mdounin@mdounin.ru> parents: 7255 diff changeset	2197
08f114ed5449 Upstream: fixed u->conf->preserve_output (ticket #1519). Maxim Dounin <mdounin@mdounin.ru> parents: 7255 diff changeset	2198 ngx_add_timer(c->read, u->conf->read_timeout);
08f114ed5449 Upstream: fixed u->conf->preserve_output (ticket #1519). Maxim Dounin <mdounin@mdounin.ru> parents: 7255 diff changeset	2199
08f114ed5449 Upstream: fixed u->conf->preserve_output (ticket #1519). Maxim Dounin <mdounin@mdounin.ru> parents: 7255 diff changeset	2200 if (c->read->ready) {
08f114ed5449 Upstream: fixed u->conf->preserve_output (ticket #1519). Maxim Dounin <mdounin@mdounin.ru> parents: 7255 diff changeset	2201 ngx_http_upstream_process_header(r, u);
08f114ed5449 Upstream: fixed u->conf->preserve_output (ticket #1519). Maxim Dounin <mdounin@mdounin.ru> parents: 7255 diff changeset	2202 return;
08f114ed5449 Upstream: fixed u->conf->preserve_output (ticket #1519). Maxim Dounin <mdounin@mdounin.ru> parents: 7255 diff changeset	2203 }
5745 9d3a9c45fc43 Upstream: fixed handling of write event after sending request. Valentin Bartenev <vbart@nginx.com> parents: 5738 diff changeset	2204 }
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2205 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2206
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2207
6050 a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2208 static ngx_int_t
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2209 ngx_http_upstream_send_request_body(ngx_http_request_t *r,
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2210 ngx_http_upstream_t *u, ngx_uint_t do_write)
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2211 {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2212 ngx_int_t rc;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2213 ngx_chain_t out, cl, *ln;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2214 ngx_connection_t *c;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2215 ngx_http_core_loc_conf_t *clcf;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2216
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2217 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2218 "http upstream send request body");
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2219
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2220 if (!r->request_body_no_buffering) {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2221
6474 2cd019520210 Style. Ruslan Ermilov <ru@nginx.com> parents: 6467 diff changeset	2222 /* buffered request body */
2cd019520210 Style. Ruslan Ermilov <ru@nginx.com> parents: 6467 diff changeset	2223
2cd019520210 Style. Ruslan Ermilov <ru@nginx.com> parents: 6467 diff changeset	2224 if (!u->request_sent) {
2cd019520210 Style. Ruslan Ermilov <ru@nginx.com> parents: 6467 diff changeset	2225 u->request_sent = 1;
2cd019520210 Style. Ruslan Ermilov <ru@nginx.com> parents: 6467 diff changeset	2226 out = u->request_bufs;
2cd019520210 Style. Ruslan Ermilov <ru@nginx.com> parents: 6467 diff changeset	2227
2cd019520210 Style. Ruslan Ermilov <ru@nginx.com> parents: 6467 diff changeset	2228 } else {
2cd019520210 Style. Ruslan Ermilov <ru@nginx.com> parents: 6467 diff changeset	2229 out = NULL;
2cd019520210 Style. Ruslan Ermilov <ru@nginx.com> parents: 6467 diff changeset	2230 }
2cd019520210 Style. Ruslan Ermilov <ru@nginx.com> parents: 6467 diff changeset	2231
7231 22f7bdbd96d3 Upstream: u->request_body_blocked flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7230 diff changeset	2232 rc = ngx_output_chain(&u->output, out);
22f7bdbd96d3 Upstream: u->request_body_blocked flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7230 diff changeset	2233
22f7bdbd96d3 Upstream: u->request_body_blocked flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7230 diff changeset	2234 if (rc == NGX_AGAIN) {
22f7bdbd96d3 Upstream: u->request_body_blocked flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7230 diff changeset	2235 u->request_body_blocked = 1;
22f7bdbd96d3 Upstream: u->request_body_blocked flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7230 diff changeset	2236
22f7bdbd96d3 Upstream: u->request_body_blocked flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7230 diff changeset	2237 } else {
22f7bdbd96d3 Upstream: u->request_body_blocked flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7230 diff changeset	2238 u->request_body_blocked = 0;
22f7bdbd96d3 Upstream: u->request_body_blocked flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7230 diff changeset	2239 }
22f7bdbd96d3 Upstream: u->request_body_blocked flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7230 diff changeset	2240
22f7bdbd96d3 Upstream: u->request_body_blocked flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7230 diff changeset	2241 return rc;
6050 a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2242 }
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2243
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2244 if (!u->request_sent) {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2245 u->request_sent = 1;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2246 out = u->request_bufs;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2247
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2248 if (r->request_body->bufs) {
7341 15ea84e65d07 Upstream: fixed request chain traversal (ticket #1618). Vladimir Homutov <vl@nginx.com> parents: 7340 diff changeset	2249 for (cl = out; cl->next; cl = cl->next) { /* void */ }
6050 a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2250 cl->next = r->request_body->bufs;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2251 r->request_body->bufs = NULL;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2252 }
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2253
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2254 c = u->peer.connection;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2255 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2256
7007 ed1101bbf19f Introduced ngx_tcp_nodelay(). Ruslan Ermilov <ru@nginx.com> parents: 7006 diff changeset	2257 if (clcf->tcp_nodelay && ngx_tcp_nodelay(c) != NGX_OK) {
ed1101bbf19f Introduced ngx_tcp_nodelay(). Ruslan Ermilov <ru@nginx.com> parents: 7006 diff changeset	2258 return NGX_ERROR;
6050 a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2259 }
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2260
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2261 r->read_event_handler = ngx_http_upstream_read_request_handler;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2262
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2263 } else {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2264 out = NULL;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2265 }
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2266
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2267 for ( ;; ) {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2268
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2269 if (do_write) {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2270 rc = ngx_output_chain(&u->output, out);
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2271
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2272 if (rc == NGX_ERROR) {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2273 return NGX_ERROR;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2274 }
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2275
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2276 while (out) {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2277 ln = out;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2278 out = out->next;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2279 ngx_free_chain(r->pool, ln);
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2280 }
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2281
7231 22f7bdbd96d3 Upstream: u->request_body_blocked flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7230 diff changeset	2282 if (rc == NGX_AGAIN) {
22f7bdbd96d3 Upstream: u->request_body_blocked flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7230 diff changeset	2283 u->request_body_blocked = 1;
22f7bdbd96d3 Upstream: u->request_body_blocked flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7230 diff changeset	2284
22f7bdbd96d3 Upstream: u->request_body_blocked flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7230 diff changeset	2285 } else {
22f7bdbd96d3 Upstream: u->request_body_blocked flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7230 diff changeset	2286 u->request_body_blocked = 0;
22f7bdbd96d3 Upstream: u->request_body_blocked flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7230 diff changeset	2287 }
22f7bdbd96d3 Upstream: u->request_body_blocked flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7230 diff changeset	2288
6050 a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2289 if (rc == NGX_OK && !r->reading_body) {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2290 break;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2291 }
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2292 }
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2293
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2294 if (r->reading_body) {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2295 /* read client request body */
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2296
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2297 rc = ngx_http_read_unbuffered_request_body(r);
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2298
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2299 if (rc >= NGX_HTTP_SPECIAL_RESPONSE) {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2300 return rc;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2301 }
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2302
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2303 out = r->request_body->bufs;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2304 r->request_body->bufs = NULL;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2305 }
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2306
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2307 /* stop if there is nothing to send */
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2308
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2309 if (out == NULL) {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2310 rc = NGX_AGAIN;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2311 break;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2312 }
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2313
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2314 do_write = 1;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2315 }
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2316
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2317 if (!r->reading_body) {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2318 if (!u->store && !r->post_action && !u->conf->ignore_client_abort) {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2319 r->read_event_handler =
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2320 ngx_http_upstream_rd_check_broken_connection;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2321 }
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2322 }
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2323
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2324 return rc;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2325 }
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2326
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2327
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	2328 static void
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2329 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	2330 ngx_http_upstream_t *u)
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2331 {
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2332 ngx_connection_t *c;
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2333
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2334 c = u->peer.connection;
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2335
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2336 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	2337 "http upstream send request handler");
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2338
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2339 if (c->write->timedout) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2340 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	2341 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2342 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2343
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	2344 #if (NGX_HTTP_SSL)
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	2345
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	2346 if (u->ssl && c->ssl == NULL) {
591 8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	2347 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	2348 return;
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	2349 }
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	2350
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	2351 #endif
8c0cdd81580e nginx-0.3.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 589 diff changeset	2352
7232 a7ed15573ae9 Upstream: u->conf->preserve_output flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7231 diff changeset	2353 if (u->header_sent && !u->conf->preserve_output) {
2377 87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	2354 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	2355
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2356 (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	2357
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	2358 return;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	2359 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	2360
6050 a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2361 ngx_http_upstream_send_request(r, u, 1);
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2362 }
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2363
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2364
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2365 static void
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2366 ngx_http_upstream_read_request_handler(ngx_http_request_t *r)
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2367 {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2368 ngx_connection_t *c;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2369 ngx_http_upstream_t *u;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2370
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2371 c = r->connection;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2372 u = r->upstream;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2373
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2374 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2375 "http upstream read request handler");
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2376
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2377 if (c->read->timedout) {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2378 c->timedout = 1;
9255 208a4adb82ef Request body: logging of timeouts. Maxim Dounin <mdounin@mdounin.ru> parents: 9237 diff changeset	2379 ngx_connection_error(c, NGX_ETIMEDOUT, "client timed out");
6050 a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2380 ngx_http_upstream_finalize_request(r, u, NGX_HTTP_REQUEST_TIME_OUT);
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2381 return;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2382 }
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2383
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6031 diff changeset	2384 ngx_http_upstream_send_request(r, u, 0);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2385 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2386
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2387
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	2388 static void
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2389 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	2390 {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2391 ssize_t n;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2392 ngx_int_t rc;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2393 ngx_connection_t *c;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2394
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2395 c = u->peer.connection;
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2396
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2397 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	2398 "http upstream process header");
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2399
483 621229427cba nginx-0.1.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	2400 c->log->action = "reading response header from upstream";
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2401
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2402 if (c->read->timedout) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2403 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	2404 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2405 }
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	2406
1153 c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2407 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	2408 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	2409 return;
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2410 }
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2411
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2412 if (u->buffer.start == NULL) {
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2413 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	2414 if (u->buffer.start == NULL) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2415 ngx_http_upstream_finalize_request(r, u,
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2416 NGX_HTTP_INTERNAL_SERVER_ERROR);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2417 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2418 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2419
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2420 u->buffer.pos = u->buffer.start;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2421 u->buffer.last = u->buffer.start;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2422 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	2423 u->buffer.temporary = 1;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2424
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2425 u->buffer.tag = u->output.tag;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2426
1705 d22095839d86 optimize r->upstream usage Igor Sysoev <igor@sysoev.ru> parents: 1701 diff changeset	2427 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	2428 sizeof(ngx_table_elt_t))
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2429 != NGX_OK)
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2430 {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2431 ngx_http_upstream_finalize_request(r, u,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2432 NGX_HTTP_INTERNAL_SERVER_ERROR);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2433 return;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2434 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2435
7230 098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	2436 if (ngx_list_init(&u->headers_in.trailers, r->pool, 2,
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	2437 sizeof(ngx_table_elt_t))
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	2438 != NGX_OK)
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	2439 {
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	2440 ngx_http_upstream_finalize_request(r, u,
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	2441 NGX_HTTP_INTERNAL_SERVER_ERROR);
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	2442 return;
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	2443 }
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 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) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2448 u->buffer.pos += r->cache->header_start;
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	2449 u->buffer.last = u->buffer.pos;
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 #endif
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2452 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2453
2360 64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2454 for ( ;; ) {
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2455
9237 41db21d1ca7c Upstream: improved c->read->ready flag handling. Maxim Dounin <mdounin@mdounin.ru> parents: 9217 diff changeset	2456 if (c->read->ready) {
41db21d1ca7c Upstream: improved c->read->ready flag handling. Maxim Dounin <mdounin@mdounin.ru> parents: 9217 diff changeset	2457 n = c->recv(c, u->buffer.last, u->buffer.end - u->buffer.last);
41db21d1ca7c Upstream: improved c->read->ready flag handling. Maxim Dounin <mdounin@mdounin.ru> parents: 9217 diff changeset	2458
41db21d1ca7c Upstream: improved c->read->ready flag handling. Maxim Dounin <mdounin@mdounin.ru> parents: 9217 diff changeset	2459 } else {
41db21d1ca7c Upstream: improved c->read->ready flag handling. Maxim Dounin <mdounin@mdounin.ru> parents: 9217 diff changeset	2460 n = NGX_AGAIN;
41db21d1ca7c Upstream: improved c->read->ready flag handling. Maxim Dounin <mdounin@mdounin.ru> parents: 9217 diff changeset	2461 }
2360 64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2462
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2463 if (n == NGX_AGAIN) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2464 #if 0
2360 64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2465 ngx_add_timer(rev, u->read_timeout);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2466 #endif
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2467
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2468 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	2469 ngx_http_upstream_finalize_request(r, u,
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2470 NGX_HTTP_INTERNAL_SERVER_ERROR);
2360 64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2471 return;
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2472 }
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2473
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2474 return;
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2475 }
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2476
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2477 if (n == 0) {
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	2478 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	2479 "upstream prematurely closed connection");
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2480 }
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2481
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2482 if (n == NGX_ERROR \|\| n == 0) {
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2483 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	2484 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2485 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2486
6654 c131f20c9562 Upstream: the $upstream_bytes_received variable. Vladimir Homutov <vl@nginx.com> parents: 6594 diff changeset	2487 u->state->bytes_received += n;
c131f20c9562 Upstream: the $upstream_bytes_received variable. Vladimir Homutov <vl@nginx.com> parents: 6594 diff changeset	2488
2360 64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2489 u->buffer.last += n;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2490
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2491 #if 0
2360 64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2492 u->valid_header_in = 0;
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2493
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2494 u->peer.cached = 0;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2495 #endif
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2496
2360 64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2497 rc = u->process_header(r);
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2498
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2499 if (rc == NGX_AGAIN) {
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2500
4460 6299d1c4dbb4 Upstream: fixed "too big header" check. Maxim Dounin <mdounin@mdounin.ru> parents: 4412 diff changeset	2501 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	2502 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	2503 "upstream sent too big header");
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2504
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2505 ngx_http_upstream_next(r, u,
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2506 NGX_HTTP_UPSTREAM_FT_INVALID_HEADER);
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2507 return;
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2508 }
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2509
64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2510 continue;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2511 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2512
2360 64854406b1f9 read and process upstream header in cycle, Igor Sysoev <igor@sysoev.ru> parents: 2308 diff changeset	2513 break;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2514 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2515
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2516 if (rc == NGX_HTTP_UPSTREAM_INVALID_HEADER) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2517 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	2518 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2519 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2520
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	2521 if (rc == NGX_ERROR) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2522 ngx_http_upstream_finalize_request(r, u,
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2523 NGX_HTTP_INTERNAL_SERVER_ERROR);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2524 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2525 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2526
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2527 /* rc == NGX_OK */
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2528
7397 860d3907da1c Upstream: revised upstream response time variables. Vladimir Homutov <vl@nginx.com> parents: 7371 diff changeset	2529 u->state->header_time = ngx_current_msec - u->start_time;
5964 0a198a517eaf Upstream: $upstream_header_time variable. Vladimir Homutov <vl@nginx.com> parents: 5960 diff changeset	2530
5209 07e515e65984 Upstream: allow to intercept responses with status 300. Ruslan Ermilov <ru@nginx.com> parents: 5169 diff changeset	2531 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	2532
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2533 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	2534 return;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2535 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	2536
2267 920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2537 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	2538 return;
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	2539 }
31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	2540 }
31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	2541
9217 6765e5f6d991 Upstream: fixed X-Accel-Redirect handling from cache files. Maxim Dounin <mdounin@mdounin.ru> parents: 9204 diff changeset	2542 rc = ngx_http_upstream_process_headers(r, u);
6765e5f6d991 Upstream: fixed X-Accel-Redirect handling from cache files. Maxim Dounin <mdounin@mdounin.ru> parents: 9204 diff changeset	2543
6765e5f6d991 Upstream: fixed X-Accel-Redirect handling from cache files. Maxim Dounin <mdounin@mdounin.ru> parents: 9204 diff changeset	2544 if (rc == NGX_DONE) {
6765e5f6d991 Upstream: fixed X-Accel-Redirect handling from cache files. Maxim Dounin <mdounin@mdounin.ru> parents: 9204 diff changeset	2545 return;
6765e5f6d991 Upstream: fixed X-Accel-Redirect handling from cache files. Maxim Dounin <mdounin@mdounin.ru> parents: 9204 diff changeset	2546 }
6765e5f6d991 Upstream: fixed X-Accel-Redirect handling from cache files. Maxim Dounin <mdounin@mdounin.ru> parents: 9204 diff changeset	2547
6765e5f6d991 Upstream: fixed X-Accel-Redirect handling from cache files. Maxim Dounin <mdounin@mdounin.ru> parents: 9204 diff changeset	2548 if (rc == NGX_ERROR) {
6765e5f6d991 Upstream: fixed X-Accel-Redirect handling from cache files. Maxim Dounin <mdounin@mdounin.ru> parents: 9204 diff changeset	2549 ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
515 417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	2550 return;
417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	2551 }
417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	2552
7220 20f139e9ffa8 Generic subrequests in memory. Roman Arutyunyan <arut@nginx.com> parents: 7199 diff changeset	2553 ngx_http_upstream_send_response(r, u);
777 4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2554 }
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2555
4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	2556
1153 c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2557 static ngx_int_t
2268 33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2558 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	2559 {
7255 4db4fe3bdeda Upstream: fixed ngx_http_upstream_test_next() conditions. Maxim Dounin <mdounin@mdounin.ru> parents: 7239 diff changeset	2560 ngx_msec_t timeout;
4db4fe3bdeda Upstream: fixed ngx_http_upstream_test_next() conditions. Maxim Dounin <mdounin@mdounin.ru> parents: 7239 diff changeset	2561 ngx_uint_t status, mask;
2268 33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2562 ngx_http_upstream_next_t *un;
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2563
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2564 status = u->headers_in.status_n;
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2565
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2566 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	2567
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2568 if (status != un->status) {
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2569 continue;
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2570 }
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2571
7255 4db4fe3bdeda Upstream: fixed ngx_http_upstream_test_next() conditions. Maxim Dounin <mdounin@mdounin.ru> parents: 7239 diff changeset	2572 timeout = u->conf->next_upstream_timeout;
4db4fe3bdeda Upstream: fixed ngx_http_upstream_test_next() conditions. Maxim Dounin <mdounin@mdounin.ru> parents: 7239 diff changeset	2573
4db4fe3bdeda Upstream: fixed ngx_http_upstream_test_next() conditions. Maxim Dounin <mdounin@mdounin.ru> parents: 7239 diff changeset	2574 if (u->request_sent
4db4fe3bdeda Upstream: fixed ngx_http_upstream_test_next() conditions. Maxim Dounin <mdounin@mdounin.ru> parents: 7239 diff changeset	2575 && (r->method & (NGX_HTTP_POST\|NGX_HTTP_LOCK\|NGX_HTTP_PATCH)))
4db4fe3bdeda Upstream: fixed ngx_http_upstream_test_next() conditions. Maxim Dounin <mdounin@mdounin.ru> parents: 7239 diff changeset	2576 {
4db4fe3bdeda Upstream: fixed ngx_http_upstream_test_next() conditions. Maxim Dounin <mdounin@mdounin.ru> parents: 7239 diff changeset	2577 mask = un->mask \| NGX_HTTP_UPSTREAM_FT_NON_IDEMPOTENT;
4db4fe3bdeda Upstream: fixed ngx_http_upstream_test_next() conditions. Maxim Dounin <mdounin@mdounin.ru> parents: 7239 diff changeset	2578
4db4fe3bdeda Upstream: fixed ngx_http_upstream_test_next() conditions. Maxim Dounin <mdounin@mdounin.ru> parents: 7239 diff changeset	2579 } else {
4db4fe3bdeda Upstream: fixed ngx_http_upstream_test_next() conditions. Maxim Dounin <mdounin@mdounin.ru> parents: 7239 diff changeset	2580 mask = un->mask;
4db4fe3bdeda Upstream: fixed ngx_http_upstream_test_next() conditions. Maxim Dounin <mdounin@mdounin.ru> parents: 7239 diff changeset	2581 }
4db4fe3bdeda Upstream: fixed ngx_http_upstream_test_next() conditions. Maxim Dounin <mdounin@mdounin.ru> parents: 7239 diff changeset	2582
4db4fe3bdeda Upstream: fixed ngx_http_upstream_test_next() conditions. Maxim Dounin <mdounin@mdounin.ru> parents: 7239 diff changeset	2583 if (u->peer.tries > 1
4db4fe3bdeda Upstream: fixed ngx_http_upstream_test_next() conditions. Maxim Dounin <mdounin@mdounin.ru> parents: 7239 diff changeset	2584 && ((u->conf->next_upstream & mask) == mask)
4db4fe3bdeda Upstream: fixed ngx_http_upstream_test_next() conditions. Maxim Dounin <mdounin@mdounin.ru> parents: 7239 diff changeset	2585 && !(u->request_sent && r->request_body_no_buffering)
4db4fe3bdeda Upstream: fixed ngx_http_upstream_test_next() conditions. Maxim Dounin <mdounin@mdounin.ru> parents: 7239 diff changeset	2586 && !(timeout && ngx_current_msec - u->peer.start_time >= timeout))
4db4fe3bdeda Upstream: fixed ngx_http_upstream_test_next() conditions. Maxim Dounin <mdounin@mdounin.ru> parents: 7239 diff changeset	2587 {
2268 33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2588 ngx_http_upstream_next(r, u, un->mask);
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2589 return NGX_OK;
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2590 }
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2591
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2592 #if (NGX_HTTP_CACHE)
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2593
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	2594 if (u->cache_status == NGX_HTTP_CACHE_EXPIRED
7702 7015f26aef90 Cache: ignore stale-if-error for 4xx and 5xx codes. Roman Arutyunyan <arut@nginx.com> parents: 7679 diff changeset	2595 && (u->conf->cache_use_stale & un->mask))
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	2596 {
2824 d106509491b5 fix building --without-http-cache Igor Sysoev <igor@sysoev.ru> parents: 2807 diff changeset	2597 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	2598
60551422e150 reinit proxy/fastcgi header parser before ngx_http_upstream_cache_send() Igor Sysoev <igor@sysoev.ru> parents: 2804 diff changeset	2599 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	2600
7126 77fe752b4586 Upstream: fixed error handling of stale and revalidated cache send. Sergey Kandaurov <pluknet@nginx.com> parents: 7125 diff changeset	2601 if (rc != NGX_OK) {
77fe752b4586 Upstream: fixed error handling of stale and revalidated cache send. Sergey Kandaurov <pluknet@nginx.com> parents: 7125 diff changeset	2602 ngx_http_upstream_finalize_request(r, u, rc);
77fe752b4586 Upstream: fixed error handling of stale and revalidated cache send. Sergey Kandaurov <pluknet@nginx.com> parents: 7125 diff changeset	2603 return NGX_OK;
77fe752b4586 Upstream: fixed error handling of stale and revalidated cache send. Sergey Kandaurov <pluknet@nginx.com> parents: 7125 diff changeset	2604 }
77fe752b4586 Upstream: fixed error handling of stale and revalidated cache send. Sergey Kandaurov <pluknet@nginx.com> parents: 7125 diff changeset	2605
77fe752b4586 Upstream: fixed error handling of stale and revalidated cache send. Sergey Kandaurov <pluknet@nginx.com> parents: 7125 diff changeset	2606 u->cache_status = NGX_HTTP_CACHE_STALE;
77fe752b4586 Upstream: fixed error handling of stale and revalidated cache send. Sergey Kandaurov <pluknet@nginx.com> parents: 7125 diff changeset	2607 rc = ngx_http_upstream_cache_send(r, u);
77fe752b4586 Upstream: fixed error handling of stale and revalidated cache send. Sergey Kandaurov <pluknet@nginx.com> parents: 7125 diff changeset	2608
77fe752b4586 Upstream: fixed error handling of stale and revalidated cache send. Sergey Kandaurov <pluknet@nginx.com> parents: 7125 diff changeset	2609 if (rc == NGX_DONE) {
77fe752b4586 Upstream: fixed error handling of stale and revalidated cache send. Sergey Kandaurov <pluknet@nginx.com> parents: 7125 diff changeset	2610 return NGX_OK;
77fe752b4586 Upstream: fixed error handling of stale and revalidated cache send. Sergey Kandaurov <pluknet@nginx.com> parents: 7125 diff changeset	2611 }
77fe752b4586 Upstream: fixed error handling of stale and revalidated cache send. Sergey Kandaurov <pluknet@nginx.com> parents: 7125 diff changeset	2612
77fe752b4586 Upstream: fixed error handling of stale and revalidated cache send. Sergey Kandaurov <pluknet@nginx.com> parents: 7125 diff changeset	2613 if (rc == NGX_HTTP_UPSTREAM_INVALID_HEADER) {
77fe752b4586 Upstream: fixed error handling of stale and revalidated cache send. Sergey Kandaurov <pluknet@nginx.com> parents: 7125 diff changeset	2614 rc = NGX_HTTP_INTERNAL_SERVER_ERROR;
2805 60551422e150 reinit proxy/fastcgi header parser before ngx_http_upstream_cache_send() Igor Sysoev <igor@sysoev.ru> parents: 2804 diff changeset	2615 }
60551422e150 reinit proxy/fastcgi header parser before ngx_http_upstream_cache_send() Igor Sysoev <igor@sysoev.ru> parents: 2804 diff changeset	2616
60551422e150 reinit proxy/fastcgi header parser before ngx_http_upstream_cache_send() Igor Sysoev <igor@sysoev.ru> parents: 2804 diff changeset	2617 ngx_http_upstream_finalize_request(r, u, rc);
2268 33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2618 return NGX_OK;
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2619 }
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2620
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2621 #endif
7649 3c8082c3f98a Upstream: jump out of loop after matching the status code. Jinhua Tan <312841925@qq.com> parents: 7538 diff changeset	2622
3c8082c3f98a Upstream: jump out of loop after matching the status code. Jinhua Tan <312841925@qq.com> parents: 7538 diff changeset	2623 break;
2268 33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2624 }
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2625
5441 43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2626 #if (NGX_HTTP_CACHE)
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2627
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2628 if (status == NGX_HTTP_NOT_MODIFIED
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2629 && u->cache_status == NGX_HTTP_CACHE_EXPIRED
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2630 && u->conf->cache_revalidate)
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2631 {
6905 9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	2632 time_t now, valid, updating, error;
5441 43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2633 ngx_int_t rc;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2634
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2635 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	2636 "http upstream not modified");
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2637
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2638 now = ngx_time();
6905 9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	2639
5441 43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2640 valid = r->cache->valid_sec;
6905 9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	2641 updating = r->cache->updating_sec;
9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	2642 error = r->cache->error_sec;
5441 43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2643
9295 c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	2644 if (ngx_http_upstream_no_cache(r, u) != NGX_OK) {
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	2645 ngx_http_upstream_finalize_request(r, u,
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	2646 NGX_HTTP_INTERNAL_SERVER_ERROR);
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	2647 return NGX_OK;
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	2648 }
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	2649
5441 43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2650 rc = u->reinit_request(r);
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2651
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2652 if (rc != NGX_OK) {
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2653 ngx_http_upstream_finalize_request(r, u, rc);
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2654 return NGX_OK;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2655 }
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2656
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2657 u->cache_status = NGX_HTTP_CACHE_REVALIDATED;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2658 rc = ngx_http_upstream_cache_send(r, u);
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2659
7126 77fe752b4586 Upstream: fixed error handling of stale and revalidated cache send. Sergey Kandaurov <pluknet@nginx.com> parents: 7125 diff changeset	2660 if (rc == NGX_DONE) {
77fe752b4586 Upstream: fixed error handling of stale and revalidated cache send. Sergey Kandaurov <pluknet@nginx.com> parents: 7125 diff changeset	2661 return NGX_OK;
77fe752b4586 Upstream: fixed error handling of stale and revalidated cache send. Sergey Kandaurov <pluknet@nginx.com> parents: 7125 diff changeset	2662 }
77fe752b4586 Upstream: fixed error handling of stale and revalidated cache send. Sergey Kandaurov <pluknet@nginx.com> parents: 7125 diff changeset	2663
77fe752b4586 Upstream: fixed error handling of stale and revalidated cache send. Sergey Kandaurov <pluknet@nginx.com> parents: 7125 diff changeset	2664 if (rc == NGX_HTTP_UPSTREAM_INVALID_HEADER) {
77fe752b4586 Upstream: fixed error handling of stale and revalidated cache send. Sergey Kandaurov <pluknet@nginx.com> parents: 7125 diff changeset	2665 rc = NGX_HTTP_INTERNAL_SERVER_ERROR;
77fe752b4586 Upstream: fixed error handling of stale and revalidated cache send. Sergey Kandaurov <pluknet@nginx.com> parents: 7125 diff changeset	2666 }
77fe752b4586 Upstream: fixed error handling of stale and revalidated cache send. Sergey Kandaurov <pluknet@nginx.com> parents: 7125 diff changeset	2667
9295 c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	2668 if (u->cacheable) {
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	2669
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	2670 if (valid == 0) {
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	2671 valid = r->cache->valid_sec;
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	2672 updating = r->cache->updating_sec;
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	2673 error = r->cache->error_sec;
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	2674 }
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	2675
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	2676 if (valid == 0) {
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	2677 valid = ngx_http_file_cache_valid(u->conf->cache_valid,
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	2678 u->headers_in.status_n);
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	2679 if (valid) {
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	2680 valid = now + valid;
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	2681 }
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	2682 }
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	2683
5441 43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2684 if (valid) {
9295 c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	2685 r->cache->valid_sec = valid;
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	2686 r->cache->updating_sec = updating;
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	2687 r->cache->error_sec = error;
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	2688
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	2689 r->cache->date = now;
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	2690
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	2691 ngx_http_file_cache_update_header(r);
5441 43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2692 }
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2693 }
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2694
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2695 ngx_http_upstream_finalize_request(r, u, rc);
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2696 return NGX_OK;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2697 }
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2698
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2699 #endif
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	2700
2268 33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2701 return NGX_DECLINED;
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2702 }
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2703
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2704
33556140681a ) ngx_http_upstream_test_next() Igor Sysoev <igor@sysoev.ru>* parents: 2267 diff changeset	2705 static ngx_int_t
2267 920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2706 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	2707 ngx_http_upstream_t *u)
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2708 {
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2709 ngx_int_t status;
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2710 ngx_uint_t i;
8036 f739c8142fb2 Upstream: multiple WWW-Authenticate headers (ticket #485). Maxim Dounin <mdounin@mdounin.ru> parents: 8035 diff changeset	2711 ngx_table_elt_t h, ho, **ph;
2267 920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2712 ngx_http_err_page_t *err_page;
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2713 ngx_http_core_loc_conf_t *clcf;
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2714
2441 0c117a89f399 in miss case memcached module returned END instead of default 404 page body Igor Sysoev <igor@sysoev.ru> parents: 2422 diff changeset	2715 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	2716
0c117a89f399 in miss case memcached module returned END instead of default 404 page body Igor Sysoev <igor@sysoev.ru> parents: 2422 diff changeset	2717 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	2718 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	2719 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	2720 }
0c117a89f399 in miss case memcached module returned END instead of default 404 page body Igor Sysoev <igor@sysoev.ru> parents: 2422 diff changeset	2721
2267 920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2722 if (!u->conf->intercept_errors) {
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2723 return NGX_DECLINED;
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2724 }
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2725
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2726 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	2727
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2728 if (clcf->error_pages == NULL) {
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2729 return NGX_DECLINED;
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2730 }
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2731
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2732 err_page = clcf->error_pages->elts;
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2733 for (i = 0; i < clcf->error_pages->nelts; i++) {
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2734
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2735 if (err_page[i].status == status) {
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2736
2953 aa12525236da fix segfault if there is error_page 401, proxy_intercept_errors is on Igor Sysoev <igor@sysoev.ru> parents: 2952 diff changeset	2737 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	2738 && 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	2739 {
8036 f739c8142fb2 Upstream: multiple WWW-Authenticate headers (ticket #485). Maxim Dounin <mdounin@mdounin.ru> parents: 8035 diff changeset	2740 h = u->headers_in.www_authenticate;
f739c8142fb2 Upstream: multiple WWW-Authenticate headers (ticket #485). Maxim Dounin <mdounin@mdounin.ru> parents: 8035 diff changeset	2741 ph = &r->headers_out.www_authenticate;
f739c8142fb2 Upstream: multiple WWW-Authenticate headers (ticket #485). Maxim Dounin <mdounin@mdounin.ru> parents: 8035 diff changeset	2742
f739c8142fb2 Upstream: multiple WWW-Authenticate headers (ticket #485). Maxim Dounin <mdounin@mdounin.ru> parents: 8035 diff changeset	2743 while (h) {
f739c8142fb2 Upstream: multiple WWW-Authenticate headers (ticket #485). Maxim Dounin <mdounin@mdounin.ru> parents: 8035 diff changeset	2744 ho = ngx_list_push(&r->headers_out.headers);
f739c8142fb2 Upstream: multiple WWW-Authenticate headers (ticket #485). Maxim Dounin <mdounin@mdounin.ru> parents: 8035 diff changeset	2745
f739c8142fb2 Upstream: multiple WWW-Authenticate headers (ticket #485). Maxim Dounin <mdounin@mdounin.ru> parents: 8035 diff changeset	2746 if (ho == NULL) {
f739c8142fb2 Upstream: multiple WWW-Authenticate headers (ticket #485). Maxim Dounin <mdounin@mdounin.ru> parents: 8035 diff changeset	2747 ngx_http_upstream_finalize_request(r, u,
2267 920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2748 NGX_HTTP_INTERNAL_SERVER_ERROR);
8036 f739c8142fb2 Upstream: multiple WWW-Authenticate headers (ticket #485). Maxim Dounin <mdounin@mdounin.ru> parents: 8035 diff changeset	2749 return NGX_OK;
f739c8142fb2 Upstream: multiple WWW-Authenticate headers (ticket #485). Maxim Dounin <mdounin@mdounin.ru> parents: 8035 diff changeset	2750 }
f739c8142fb2 Upstream: multiple WWW-Authenticate headers (ticket #485). Maxim Dounin <mdounin@mdounin.ru> parents: 8035 diff changeset	2751
f739c8142fb2 Upstream: multiple WWW-Authenticate headers (ticket #485). Maxim Dounin <mdounin@mdounin.ru> parents: 8035 diff changeset	2752 ho = h;
f739c8142fb2 Upstream: multiple WWW-Authenticate headers (ticket #485). Maxim Dounin <mdounin@mdounin.ru> parents: 8035 diff changeset	2753 ho->next = NULL;
f739c8142fb2 Upstream: multiple WWW-Authenticate headers (ticket #485). Maxim Dounin <mdounin@mdounin.ru> parents: 8035 diff changeset	2754
f739c8142fb2 Upstream: multiple WWW-Authenticate headers (ticket #485). Maxim Dounin <mdounin@mdounin.ru> parents: 8035 diff changeset	2755 *ph = ho;
f739c8142fb2 Upstream: multiple WWW-Authenticate headers (ticket #485). Maxim Dounin <mdounin@mdounin.ru> parents: 8035 diff changeset	2756 ph = &ho->next;
f739c8142fb2 Upstream: multiple WWW-Authenticate headers (ticket #485). Maxim Dounin <mdounin@mdounin.ru> parents: 8035 diff changeset	2757
f739c8142fb2 Upstream: multiple WWW-Authenticate headers (ticket #485). Maxim Dounin <mdounin@mdounin.ru> parents: 8035 diff changeset	2758 h = h->next;
2267 920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2759 }
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2760 }
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2761
3706 ea908f6ae499 an intercepted error code was not cached Igor Sysoev <igor@sysoev.ru> parents: 3705 diff changeset	2762 #if (NGX_HTTP_CACHE)
ea908f6ae499 an intercepted error code was not cached Igor Sysoev <igor@sysoev.ru> parents: 3705 diff changeset	2763
3709 64777690c697 fix r3707: cache node should be freed be a response is not cached Igor Sysoev <igor@sysoev.ru> parents: 3708 diff changeset	2764 if (r->cache) {
7117 dbd77a638eb7 Cache: fixed caching of intercepted errors (ticket #1382). Maxim Dounin <mdounin@mdounin.ru> parents: 7116 diff changeset	2765
9295 c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	2766 if (ngx_http_upstream_no_cache(r, u) != NGX_OK) {
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	2767 ngx_http_upstream_finalize_request(r, u,
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	2768 NGX_HTTP_INTERNAL_SERVER_ERROR);
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	2769 return NGX_OK;
8041 0784ab86ad08 Upstream: fixed X-Accel-Expires/Cache-Control/Expires handling. Maxim Dounin <mdounin@mdounin.ru> parents: 8040 diff changeset	2770 }
0784ab86ad08 Upstream: fixed X-Accel-Expires/Cache-Control/Expires handling. Maxim Dounin <mdounin@mdounin.ru> parents: 8040 diff changeset	2771
7117 dbd77a638eb7 Cache: fixed caching of intercepted errors (ticket #1382). Maxim Dounin <mdounin@mdounin.ru> parents: 7116 diff changeset	2772 if (u->cacheable) {
dbd77a638eb7 Cache: fixed caching of intercepted errors (ticket #1382). Maxim Dounin <mdounin@mdounin.ru> parents: 7116 diff changeset	2773 time_t valid;
dbd77a638eb7 Cache: fixed caching of intercepted errors (ticket #1382). Maxim Dounin <mdounin@mdounin.ru> parents: 7116 diff changeset	2774
dbd77a638eb7 Cache: fixed caching of intercepted errors (ticket #1382). Maxim Dounin <mdounin@mdounin.ru> parents: 7116 diff changeset	2775 valid = r->cache->valid_sec;
dbd77a638eb7 Cache: fixed caching of intercepted errors (ticket #1382). Maxim Dounin <mdounin@mdounin.ru> parents: 7116 diff changeset	2776
dbd77a638eb7 Cache: fixed caching of intercepted errors (ticket #1382). Maxim Dounin <mdounin@mdounin.ru> parents: 7116 diff changeset	2777 if (valid == 0) {
dbd77a638eb7 Cache: fixed caching of intercepted errors (ticket #1382). Maxim Dounin <mdounin@mdounin.ru> parents: 7116 diff changeset	2778 valid = ngx_http_file_cache_valid(u->conf->cache_valid,
dbd77a638eb7 Cache: fixed caching of intercepted errors (ticket #1382). Maxim Dounin <mdounin@mdounin.ru> parents: 7116 diff changeset	2779 status);
dbd77a638eb7 Cache: fixed caching of intercepted errors (ticket #1382). Maxim Dounin <mdounin@mdounin.ru> parents: 7116 diff changeset	2780 if (valid) {
dbd77a638eb7 Cache: fixed caching of intercepted errors (ticket #1382). Maxim Dounin <mdounin@mdounin.ru> parents: 7116 diff changeset	2781 r->cache->valid_sec = ngx_time() + valid;
dbd77a638eb7 Cache: fixed caching of intercepted errors (ticket #1382). Maxim Dounin <mdounin@mdounin.ru> parents: 7116 diff changeset	2782 }
dbd77a638eb7 Cache: fixed caching of intercepted errors (ticket #1382). Maxim Dounin <mdounin@mdounin.ru> parents: 7116 diff changeset	2783 }
dbd77a638eb7 Cache: fixed caching of intercepted errors (ticket #1382). Maxim Dounin <mdounin@mdounin.ru> parents: 7116 diff changeset	2784
dbd77a638eb7 Cache: fixed caching of intercepted errors (ticket #1382). Maxim Dounin <mdounin@mdounin.ru> parents: 7116 diff changeset	2785 if (valid) {
dbd77a638eb7 Cache: fixed caching of intercepted errors (ticket #1382). Maxim Dounin <mdounin@mdounin.ru> parents: 7116 diff changeset	2786 r->cache->error = status;
dbd77a638eb7 Cache: fixed caching of intercepted errors (ticket #1382). Maxim Dounin <mdounin@mdounin.ru> parents: 7116 diff changeset	2787 }
3706 ea908f6ae499 an intercepted error code was not cached Igor Sysoev <igor@sysoev.ru> parents: 3705 diff changeset	2788 }
ea908f6ae499 an intercepted error code was not cached Igor Sysoev <igor@sysoev.ru> parents: 3705 diff changeset	2789
3711 ce6ba077c270 several changes in cache cleanup handling: Igor Sysoev <igor@sysoev.ru> parents: 3709 diff changeset	2790 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	2791 }
ea908f6ae499 an intercepted error code was not cached Igor Sysoev <igor@sysoev.ru> parents: 3705 diff changeset	2792 #endif
2267 920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2793 ngx_http_upstream_finalize_request(r, u, status);
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2794
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2795 return NGX_OK;
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2796 }
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2797 }
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2798
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2799 return NGX_DECLINED;
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2800 }
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2801
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2802
920be89a3d2d ngx_http_upstream_intercept_errors() Igor Sysoev <igor@sysoev.ru> parents: 2244 diff changeset	2803 static ngx_int_t
1153 c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2804 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	2805 {
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2806 int err;
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2807 socklen_t len;
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2808
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2809 #if (NGX_HAVE_KQUEUE)
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2810
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2811 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	2812 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	2813 if (c->write->pending_eof) {
e62219793beb Upstream: better detection of connect() failures with kqueue. Maxim Dounin <mdounin@mdounin.ru> parents: 4895 diff changeset	2814 err = c->write->kq_errno;
e62219793beb Upstream: better detection of connect() failures with kqueue. Maxim Dounin <mdounin@mdounin.ru> parents: 4895 diff changeset	2815
e62219793beb Upstream: better detection of connect() failures with kqueue. Maxim Dounin <mdounin@mdounin.ru> parents: 4895 diff changeset	2816 } else {
e62219793beb Upstream: better detection of connect() failures with kqueue. Maxim Dounin <mdounin@mdounin.ru> parents: 4895 diff changeset	2817 err = c->read->kq_errno;
e62219793beb Upstream: better detection of connect() failures with kqueue. Maxim Dounin <mdounin@mdounin.ru> parents: 4895 diff changeset	2818 }
e62219793beb Upstream: better detection of connect() failures with kqueue. Maxim Dounin <mdounin@mdounin.ru> parents: 4895 diff changeset	2819
1469 0a269c464eaf connection error should be logged with "connecting to upstream" action, Igor Sysoev <igor@sysoev.ru> parents: 1468 diff changeset	2820 c->log->action = "connecting to upstream";
4916 79c8e87b1fcb Trailing whitespace fix. Maxim Dounin <mdounin@mdounin.ru> parents: 4915 diff changeset	2821 (void) ngx_connection_error(c, err,
1166 bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2822 "kevent() reported that connect() failed");
bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2823 return NGX_ERROR;
bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2824 }
1153 c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2825
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2826 } else
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2827 #endif
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2828 {
1166 bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2829 err = 0;
bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2830 len = sizeof(int);
bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2831
bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2832 /*
bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2833 * 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	2834 * Solaris returns -1 and sets errno
bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2835 */
bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2836
bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2837 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	2838 == -1)
bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2839 {
5557 188481078faf Use ngx_socket_errno where appropriate. Piotr Sikora <piotr@cloudflare.com> parents: 5546 diff changeset	2840 err = ngx_socket_errno;
1166 bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2841 }
bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2842
bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2843 if (err) {
1469 0a269c464eaf connection error should be logged with "connecting to upstream" action, Igor Sysoev <igor@sysoev.ru> parents: 1468 diff changeset	2844 c->log->action = "connecting to upstream";
1166 bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2845 (void) ngx_connection_error(c, err, "connect() failed");
bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2846 return NGX_ERROR;
bde5e4134759 style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 1162 diff changeset	2847 }
1153 c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2848 }
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2849
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2850 return NGX_OK;
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2851 }
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2852
c843f3df3b85 separate ngx_http_upstream_test_connect() and Igor Sysoev <igor@sysoev.ru> parents: 1143 diff changeset	2853
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2854 static ngx_int_t
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2855 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	2856 {
5489 6d357b2a9d6e Upstream: keep $upstream_http_x_accel_redirect intact. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	2857 ngx_str_t uri, args;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2858 ngx_uint_t i, flags;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2859 ngx_list_part_t *part;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2860 ngx_table_elt_t *h;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2861 ngx_http_upstream_header_t *hh;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2862 ngx_http_upstream_main_conf_t *umcf;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2863
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2864 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	2865
8041 0784ab86ad08 Upstream: fixed X-Accel-Expires/Cache-Control/Expires handling. Maxim Dounin <mdounin@mdounin.ru> parents: 8040 diff changeset	2866 if (u->headers_in.no_cache \|\| u->headers_in.expired) {
0784ab86ad08 Upstream: fixed X-Accel-Expires/Cache-Control/Expires handling. Maxim Dounin <mdounin@mdounin.ru> parents: 8040 diff changeset	2867 u->cacheable = 0;
0784ab86ad08 Upstream: fixed X-Accel-Expires/Cache-Control/Expires handling. Maxim Dounin <mdounin@mdounin.ru> parents: 8040 diff changeset	2868 }
0784ab86ad08 Upstream: fixed X-Accel-Expires/Cache-Control/Expires handling. Maxim Dounin <mdounin@mdounin.ru> parents: 8040 diff changeset	2869
2786 4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	2870 if (u->headers_in.x_accel_redirect
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	2871 && !(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	2872 {
9217 6765e5f6d991 Upstream: fixed X-Accel-Redirect handling from cache files. Maxim Dounin <mdounin@mdounin.ru> parents: 9204 diff changeset	2873 if (u->cleanup) {
6765e5f6d991 Upstream: fixed X-Accel-Redirect handling from cache files. Maxim Dounin <mdounin@mdounin.ru> parents: 9204 diff changeset	2874 ngx_http_upstream_finalize_request(r, u, NGX_DECLINED);
6765e5f6d991 Upstream: fixed X-Accel-Redirect handling from cache files. Maxim Dounin <mdounin@mdounin.ru> parents: 9204 diff changeset	2875 }
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2876
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2877 part = &u->headers_in.headers.part;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2878 h = part->elts;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2879
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2880 for (i = 0; /* void */; i++) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2881
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2882 if (i >= part->nelts) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2883 if (part->next == NULL) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2884 break;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2885 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2886
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2887 part = part->next;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2888 h = part->elts;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2889 i = 0;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2890 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2891
8034 413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	2892 if (h[i].hash == 0) {
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	2893 continue;
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	2894 }
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	2895
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2896 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	2897 h[i].lowcase_key, h[i].key.len);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2898
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2899 if (hh && hh->redirect) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2900 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	2901 ngx_http_finalize_request(r,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2902 NGX_HTTP_INTERNAL_SERVER_ERROR);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2903 return NGX_DONE;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2904 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2905 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2906 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2907
5489 6d357b2a9d6e Upstream: keep $upstream_http_x_accel_redirect intact. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	2908 uri = u->headers_in.x_accel_redirect->value;
5901 7d7eac6e31df Upstream: support named location for X-Accel-Redirect. Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp> parents: 5885 diff changeset	2909
7d7eac6e31df Upstream: support named location for X-Accel-Redirect. Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp> parents: 5885 diff changeset	2910 if (uri.data[0] == '@') {
7d7eac6e31df Upstream: support named location for X-Accel-Redirect. Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp> parents: 5885 diff changeset	2911 ngx_http_named_location(r, &uri);
7d7eac6e31df Upstream: support named location for X-Accel-Redirect. Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp> parents: 5885 diff changeset	2912
7d7eac6e31df Upstream: support named location for X-Accel-Redirect. Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp> parents: 5885 diff changeset	2913 } else {
7d7eac6e31df Upstream: support named location for X-Accel-Redirect. Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp> parents: 5885 diff changeset	2914 ngx_str_null(&args);
7d7eac6e31df Upstream: support named location for X-Accel-Redirect. Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp> parents: 5885 diff changeset	2915 flags = NGX_HTTP_LOG_UNSAFE;
7d7eac6e31df Upstream: support named location for X-Accel-Redirect. Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp> parents: 5885 diff changeset	2916
7d7eac6e31df Upstream: support named location for X-Accel-Redirect. Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp> parents: 5885 diff changeset	2917 if (ngx_http_parse_unsafe_uri(r, &uri, &args, &flags) != NGX_OK) {
7d7eac6e31df Upstream: support named location for X-Accel-Redirect. Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp> parents: 5885 diff changeset	2918 ngx_http_finalize_request(r, NGX_HTTP_NOT_FOUND);
7d7eac6e31df Upstream: support named location for X-Accel-Redirect. Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp> parents: 5885 diff changeset	2919 return NGX_DONE;
7d7eac6e31df Upstream: support named location for X-Accel-Redirect. Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp> parents: 5885 diff changeset	2920 }
7d7eac6e31df Upstream: support named location for X-Accel-Redirect. Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp> parents: 5885 diff changeset	2921
7d7eac6e31df Upstream: support named location for X-Accel-Redirect. Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp> parents: 5885 diff changeset	2922 if (r->method != NGX_HTTP_HEAD) {
7d7eac6e31df Upstream: support named location for X-Accel-Redirect. Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp> parents: 5885 diff changeset	2923 r->method = NGX_HTTP_GET;
6334 b31928ca3870 Upstream: fixed changing method on X-Accel-Redirect. Maxim Dounin <mdounin@mdounin.ru> parents: 6332 diff changeset	2924 r->method_name = ngx_http_core_get_method;
5901 7d7eac6e31df Upstream: support named location for X-Accel-Redirect. Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp> parents: 5885 diff changeset	2925 }
7d7eac6e31df Upstream: support named location for X-Accel-Redirect. Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp> parents: 5885 diff changeset	2926
7d7eac6e31df Upstream: support named location for X-Accel-Redirect. Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp> parents: 5885 diff changeset	2927 ngx_http_internal_redirect(r, &uri, &args);
7d7eac6e31df Upstream: support named location for X-Accel-Redirect. Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp> parents: 5885 diff changeset	2928 }
7d7eac6e31df Upstream: support named location for X-Accel-Redirect. Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp> parents: 5885 diff changeset	2929
3120 40b8b398dbbc fix request counter for X-Accel-Redirect, the bug was introduced in r3050 Igor Sysoev <igor@sysoev.ru> parents: 3112 diff changeset	2930 ngx_http_finalize_request(r, NGX_DONE);
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2931 return NGX_DONE;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2932 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2933
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2934 part = &u->headers_in.headers.part;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2935 h = part->elts;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2936
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2937 for (i = 0; /* void */; i++) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2938
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2939 if (i >= part->nelts) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2940 if (part->next == NULL) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2941 break;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2942 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2943
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2944 part = part->next;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2945 h = part->elts;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2946 i = 0;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2947 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2948
8034 413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	2949 if (h[i].hash == 0) {
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	2950 continue;
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	2951 }
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	2952
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2953 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	2954 h[i].lowcase_key, h[i].key.len))
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2955 {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2956 continue;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2957 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2958
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2959 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	2960 h[i].lowcase_key, h[i].key.len);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2961
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2962 if (hh) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2963 if (hh->copy_handler(r, &h[i], hh->conf) != NGX_OK) {
9217 6765e5f6d991 Upstream: fixed X-Accel-Redirect handling from cache files. Maxim Dounin <mdounin@mdounin.ru> parents: 9204 diff changeset	2964 return NGX_ERROR;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2965 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2966
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2967 continue;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2968 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2969
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2970 if (ngx_http_upstream_copy_header_line(r, &h[i], 0) != NGX_OK) {
9217 6765e5f6d991 Upstream: fixed X-Accel-Redirect handling from cache files. Maxim Dounin <mdounin@mdounin.ru> parents: 9204 diff changeset	2971 return NGX_ERROR;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2972 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2973 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2974
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2975 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	2976 r->headers_out.server->hash = 0;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2977 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2978
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2979 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	2980 r->headers_out.date->hash = 0;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2981 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2982
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2983 r->headers_out.status = u->headers_in.status_n;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	2984 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	2985
4117 103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	2986 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	2987
5735 5fb1e57c758a Entity tags: explicit flag to skip not modified filter. Maxim Dounin <mdounin@mdounin.ru> parents: 5732 diff changeset	2988 r->disable_not_modified = !u->cacheable;
5fb1e57c758a Entity tags: explicit flag to skip not modified filter. Maxim Dounin <mdounin@mdounin.ru> parents: 5732 diff changeset	2989
5874 2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5869 diff changeset	2990 if (u->conf->force_ranges) {
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5869 diff changeset	2991 r->allow_ranges = 1;
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5869 diff changeset	2992 r->single_range = 1;
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5869 diff changeset	2993
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5869 diff changeset	2994 #if (NGX_HTTP_CACHE)
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5869 diff changeset	2995 if (r->cached) {
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5869 diff changeset	2996 r->single_range = 0;
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5869 diff changeset	2997 }
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5869 diff changeset	2998 #endif
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5869 diff changeset	2999 }
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5869 diff changeset	3000
5300 f538a67c9f77 Upstream: u->length now defaults to -1 (API change). Maxim Dounin <mdounin@mdounin.ru> parents: 5299 diff changeset	3001 u->length = -1;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	3002
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	3003 return NGX_OK;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	3004 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	3005
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	3006
7230 098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	3007 static ngx_int_t
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	3008 ngx_http_upstream_process_trailers(ngx_http_request_t *r,
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	3009 ngx_http_upstream_t *u)
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	3010 {
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	3011 ngx_uint_t i;
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	3012 ngx_list_part_t *part;
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	3013 ngx_table_elt_t h, ho;
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	3014
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	3015 if (!u->conf->pass_trailers) {
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	3016 return NGX_OK;
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	3017 }
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	3018
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	3019 part = &u->headers_in.trailers.part;
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	3020 h = part->elts;
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	3021
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	3022 for (i = 0; /* void */; i++) {
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	3023
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	3024 if (i >= part->nelts) {
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	3025 if (part->next == NULL) {
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	3026 break;
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	3027 }
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	3028
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	3029 part = part->next;
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	3030 h = part->elts;
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	3031 i = 0;
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	3032 }
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	3033
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	3034 if (ngx_hash_find(&u->conf->hide_headers_hash, h[i].hash,
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	3035 h[i].lowcase_key, h[i].key.len))
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	3036 {
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	3037 continue;
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	3038 }
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	3039
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	3040 ho = ngx_list_push(&r->headers_out.trailers);
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	3041 if (ho == NULL) {
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	3042 return NGX_ERROR;
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	3043 }
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	3044
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	3045 *ho = h[i];
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	3046 }
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	3047
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	3048 return NGX_OK;
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	3049 }
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	3050
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	3051
777 4ab852b691f5 <!--#include virtual=... set=... --> Igor Sysoev <igor@sysoev.ru> parents: 757 diff changeset	3052 static void
681 7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 675 diff changeset	3053 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	3054 {
2402 cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	3055 ssize_t n;
681 7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 675 diff changeset	3056 ngx_int_t rc;
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 675 diff changeset	3057 ngx_event_pipe_t *p;
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 675 diff changeset	3058 ngx_connection_t *c;
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 675 diff changeset	3059 ngx_http_core_loc_conf_t *clcf;
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 675 diff changeset	3060
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	3061 rc = ngx_http_send_header(r);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3062
2701 756f73ca1e39 support HEAD in proxy cache Igor Sysoev <igor@sysoev.ru> parents: 2692 diff changeset	3063 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	3064 ngx_http_upstream_finalize_request(r, u, rc);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3065 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3066 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3067
5353 1608b1135a1d Upstream: setting u->header_sent before ngx_http_upstream_upgrade(). Maxim Dounin <mdounin@mdounin.ru> parents: 5340 diff changeset	3068 u->header_sent = 1;
1608b1135a1d Upstream: setting u->header_sent before ngx_http_upstream_upgrade(). Maxim Dounin <mdounin@mdounin.ru> parents: 5340 diff changeset	3069
5072 7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3070 if (u->upgrade) {
6794 93b294c5d581 Upstream: avoid holding a cache node with upgraded connections. Maxim Dounin <mdounin@mdounin.ru> parents: 6793 diff changeset	3071
93b294c5d581 Upstream: avoid holding a cache node with upgraded connections. Maxim Dounin <mdounin@mdounin.ru> parents: 6793 diff changeset	3072 #if (NGX_HTTP_CACHE)
93b294c5d581 Upstream: avoid holding a cache node with upgraded connections. Maxim Dounin <mdounin@mdounin.ru> parents: 6793 diff changeset	3073
93b294c5d581 Upstream: avoid holding a cache node with upgraded connections. Maxim Dounin <mdounin@mdounin.ru> parents: 6793 diff changeset	3074 if (r->cache) {
93b294c5d581 Upstream: avoid holding a cache node with upgraded connections. Maxim Dounin <mdounin@mdounin.ru> parents: 6793 diff changeset	3075 ngx_http_file_cache_free(r->cache, u->pipe->temp_file);
93b294c5d581 Upstream: avoid holding a cache node with upgraded connections. Maxim Dounin <mdounin@mdounin.ru> parents: 6793 diff changeset	3076 }
93b294c5d581 Upstream: avoid holding a cache node with upgraded connections. Maxim Dounin <mdounin@mdounin.ru> parents: 6793 diff changeset	3077
93b294c5d581 Upstream: avoid holding a cache node with upgraded connections. Maxim Dounin <mdounin@mdounin.ru> parents: 6793 diff changeset	3078 #endif
93b294c5d581 Upstream: avoid holding a cache node with upgraded connections. Maxim Dounin <mdounin@mdounin.ru> parents: 6793 diff changeset	3079
5072 7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3080 ngx_http_upstream_upgrade(r, u);
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3081 return;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3082 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3083
2704 ac1e2e199c9f shutdown client connection for cacheable header only responses Igor Sysoev <igor@sysoev.ru> parents: 2703 diff changeset	3084 c = r->connection;
ac1e2e199c9f shutdown client connection for cacheable header only responses Igor Sysoev <igor@sysoev.ru> parents: 2703 diff changeset	3085
2701 756f73ca1e39 support HEAD in proxy cache Igor Sysoev <igor@sysoev.ru> parents: 2692 diff changeset	3086 if (r->header_only) {
2704 ac1e2e199c9f shutdown client connection for cacheable header only responses Igor Sysoev <igor@sysoev.ru> parents: 2703 diff changeset	3087
5746 35990c69b3ac Upstream: p->downstream_error instead of closing connection. Maxim Dounin <mdounin@mdounin.ru> parents: 5745 diff changeset	3088 if (!u->buffering) {
2701 756f73ca1e39 support HEAD in proxy cache Igor Sysoev <igor@sysoev.ru> parents: 2692 diff changeset	3089 ngx_http_upstream_finalize_request(r, u, rc);
756f73ca1e39 support HEAD in proxy cache Igor Sysoev <igor@sysoev.ru> parents: 2692 diff changeset	3090 return;
756f73ca1e39 support HEAD in proxy cache Igor Sysoev <igor@sysoev.ru> parents: 2692 diff changeset	3091 }
5746 35990c69b3ac Upstream: p->downstream_error instead of closing connection. Maxim Dounin <mdounin@mdounin.ru> parents: 5745 diff changeset	3092
35990c69b3ac Upstream: p->downstream_error instead of closing connection. Maxim Dounin <mdounin@mdounin.ru> parents: 5745 diff changeset	3093 if (!u->cacheable && !u->store) {
35990c69b3ac Upstream: p->downstream_error instead of closing connection. Maxim Dounin <mdounin@mdounin.ru> parents: 5745 diff changeset	3094 ngx_http_upstream_finalize_request(r, u, rc);
35990c69b3ac Upstream: p->downstream_error instead of closing connection. Maxim Dounin <mdounin@mdounin.ru> parents: 5745 diff changeset	3095 return;
35990c69b3ac Upstream: p->downstream_error instead of closing connection. Maxim Dounin <mdounin@mdounin.ru> parents: 5745 diff changeset	3096 }
35990c69b3ac Upstream: p->downstream_error instead of closing connection. Maxim Dounin <mdounin@mdounin.ru> parents: 5745 diff changeset	3097
35990c69b3ac Upstream: p->downstream_error instead of closing connection. Maxim Dounin <mdounin@mdounin.ru> parents: 5745 diff changeset	3098 u->pipe->downstream_error = 1;
2701 756f73ca1e39 support HEAD in proxy cache Igor Sysoev <igor@sysoev.ru> parents: 2692 diff changeset	3099 }
756f73ca1e39 support HEAD in proxy cache Igor Sysoev <igor@sysoev.ru> parents: 2692 diff changeset	3100
7070 f583559aadc7 Upstream: keep request body file from removal if requested. Roman Arutyunyan <arut@nginx.com> parents: 7067 diff changeset	3101 if (r->request_body && r->request_body->temp_file
7297 a10e5fe44762 Upstream: disable body cleanup with preserve_output (ticket #1565). Maxim Dounin <mdounin@mdounin.ru> parents: 7260 diff changeset	3102 && r == r->main && !r->preserve_body
a10e5fe44762 Upstream: disable body cleanup with preserve_output (ticket #1565). Maxim Dounin <mdounin@mdounin.ru> parents: 7260 diff changeset	3103 && !u->conf->preserve_output)
7070 f583559aadc7 Upstream: keep request body file from removal if requested. Roman Arutyunyan <arut@nginx.com> parents: 7067 diff changeset	3104 {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	3105 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	3106 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	3107 }
9c2f3ed7a247 nginx-0.3.3-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	3108
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3109 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	3110
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	3111 if (!u->buffering) {
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3112
6794 93b294c5d581 Upstream: avoid holding a cache node with upgraded connections. Maxim Dounin <mdounin@mdounin.ru> parents: 6793 diff changeset	3113 #if (NGX_HTTP_CACHE)
93b294c5d581 Upstream: avoid holding a cache node with upgraded connections. Maxim Dounin <mdounin@mdounin.ru> parents: 6793 diff changeset	3114
93b294c5d581 Upstream: avoid holding a cache node with upgraded connections. Maxim Dounin <mdounin@mdounin.ru> parents: 6793 diff changeset	3115 if (r->cache) {
93b294c5d581 Upstream: avoid holding a cache node with upgraded connections. Maxim Dounin <mdounin@mdounin.ru> parents: 6793 diff changeset	3116 ngx_http_file_cache_free(r->cache, u->pipe->temp_file);
93b294c5d581 Upstream: avoid holding a cache node with upgraded connections. Maxim Dounin <mdounin@mdounin.ru> parents: 6793 diff changeset	3117 }
93b294c5d581 Upstream: avoid holding a cache node with upgraded connections. Maxim Dounin <mdounin@mdounin.ru> parents: 6793 diff changeset	3118
93b294c5d581 Upstream: avoid holding a cache node with upgraded connections. Maxim Dounin <mdounin@mdounin.ru> parents: 6793 diff changeset	3119 #endif
93b294c5d581 Upstream: avoid holding a cache node with upgraded connections. Maxim Dounin <mdounin@mdounin.ru> parents: 6793 diff changeset	3120
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3121 if (u->input_filter == NULL) {
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3122 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	3123 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	3124 u->input_filter_ctx = r;
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
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3127 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	3128 r->write_event_handler =
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3129 ngx_http_upstream_process_non_buffered_downstream;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3130
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3131 r->limit_rate = 0;
7504 c19ca381b2e6 Variables support in limit_rate and limit_rate_after (ticket #293). Ruslan Ermilov <ru@nginx.com> parents: 7456 diff changeset	3132 r->limit_rate_set = 1;
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3133
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3134 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	3135 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	3136 return;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3137 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3138
7007 ed1101bbf19f Introduced ngx_tcp_nodelay(). Ruslan Ermilov <ru@nginx.com> parents: 7006 diff changeset	3139 if (clcf->tcp_nodelay && ngx_tcp_nodelay(c) != NGX_OK) {
ed1101bbf19f Introduced ngx_tcp_nodelay(). Ruslan Ermilov <ru@nginx.com> parents: 7006 diff changeset	3140 ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
ed1101bbf19f Introduced ngx_tcp_nodelay(). Ruslan Ermilov <ru@nginx.com> parents: 7006 diff changeset	3141 return;
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	3142 }
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	3143
2402 cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	3144 n = u->buffer.last - u->buffer.pos;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	3145
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	3146 if (n) {
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3147 u->buffer.last = u->buffer.pos;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3148
2402 cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	3149 u->state->response_length += n;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	3150
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	3151 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	3152 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	3153 return;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3154 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3155
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3156 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	3157
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3158 } else {
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3159 u->buffer.pos = u->buffer.start;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3160 u->buffer.last = u->buffer.start;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3161
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3162 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	3163 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	3164 return;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3165 }
1468 491e5059ea19 read EOF of header only responses in non-buffered proxying Igor Sysoev <igor@sysoev.ru> parents: 1397 diff changeset	3166
7809 b1302f1dd2f6 Upstream: fixed non-buffered proxying with eventport. Maxim Dounin <mdounin@mdounin.ru> parents: 7760 diff changeset	3167 ngx_http_upstream_process_non_buffered_upstream(r, u);
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3168 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3169
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3170 return;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3171 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3172
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3173 /* TODO: preallocate event_pipe bufs, look "Content-Length" */
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3174
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	3175 #if (NGX_HTTP_CACHE)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	3176
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	3177 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	3178 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	3179 r->cache->file.fd = NGX_INVALID_FILE;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3180 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3181
9295 c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	3182 if (ngx_http_upstream_no_cache(r, u) != NGX_OK) {
5295 a489c31c9783 Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5294 diff changeset	3183 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	3184 }
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	3185
1565 4c43e25d11ea fix English grammar Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	3186 if (u->cacheable) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	3187 time_t now, valid;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	3188
2663 09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	3189 now = ngx_time();
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	3190
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	3191 valid = r->cache->valid_sec;
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	3192
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	3193 if (valid == 0) {
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	3194 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	3195 u->headers_in.status_n);
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	3196 if (valid) {
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	3197 r->cache->valid_sec = now + valid;
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	3198 }
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	3199 }
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	3200
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	3201 if (valid) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	3202 r->cache->date = now;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	3203 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	3204
5935 1573fc7875fa Cache: send conditional requests only for cached 200/206 responses. Piotr Sikora <piotr@cloudflare.com> parents: 5928 diff changeset	3205 if (u->headers_in.status_n == NGX_HTTP_OK
1573fc7875fa Cache: send conditional requests only for cached 200/206 responses. Piotr Sikora <piotr@cloudflare.com> parents: 5928 diff changeset	3206 \|\| u->headers_in.status_n == NGX_HTTP_PARTIAL_CONTENT)
1573fc7875fa Cache: send conditional requests only for cached 200/206 responses. Piotr Sikora <piotr@cloudflare.com> parents: 5928 diff changeset	3207 {
1573fc7875fa Cache: send conditional requests only for cached 200/206 responses. Piotr Sikora <piotr@cloudflare.com> parents: 5928 diff changeset	3208 r->cache->last_modified = u->headers_in.last_modified_time;
1573fc7875fa Cache: send conditional requests only for cached 200/206 responses. Piotr Sikora <piotr@cloudflare.com> parents: 5928 diff changeset	3209
1573fc7875fa Cache: send conditional requests only for cached 200/206 responses. Piotr Sikora <piotr@cloudflare.com> parents: 5928 diff changeset	3210 if (u->headers_in.etag) {
1573fc7875fa Cache: send conditional requests only for cached 200/206 responses. Piotr Sikora <piotr@cloudflare.com> parents: 5928 diff changeset	3211 r->cache->etag = u->headers_in.etag->value;
5992 174512857ccf Cache: do not inherit last_modified and etag from stale response. Roman Arutyunyan <arut@nginx.com> parents: 5977 diff changeset	3212
174512857ccf Cache: do not inherit last_modified and etag from stale response. Roman Arutyunyan <arut@nginx.com> parents: 5977 diff changeset	3213 } else {
174512857ccf Cache: do not inherit last_modified and etag from stale response. Roman Arutyunyan <arut@nginx.com> parents: 5977 diff changeset	3214 ngx_str_null(&r->cache->etag);
5935 1573fc7875fa Cache: send conditional requests only for cached 200/206 responses. Piotr Sikora <piotr@cloudflare.com> parents: 5928 diff changeset	3215 }
5992 174512857ccf Cache: do not inherit last_modified and etag from stale response. Roman Arutyunyan <arut@nginx.com> parents: 5977 diff changeset	3216
174512857ccf Cache: do not inherit last_modified and etag from stale response. Roman Arutyunyan <arut@nginx.com> parents: 5977 diff changeset	3217 } else {
174512857ccf Cache: do not inherit last_modified and etag from stale response. Roman Arutyunyan <arut@nginx.com> parents: 5977 diff changeset	3218 r->cache->last_modified = -1;
174512857ccf Cache: do not inherit last_modified and etag from stale response. Roman Arutyunyan <arut@nginx.com> parents: 5977 diff changeset	3219 ngx_str_null(&r->cache->etag);
5737 44b9ab7752e3 Cache: ETag now saved into cache header. Maxim Dounin <mdounin@mdounin.ru> parents: 5735 diff changeset	3220 }
44b9ab7752e3 Cache: ETag now saved into cache header. Maxim Dounin <mdounin@mdounin.ru> parents: 5735 diff changeset	3221
5959 f7584d7c0ccb Cache: update variant while setting header. Valentin Bartenev <vbart@nginx.com> parents: 5951 diff changeset	3222 if (ngx_http_file_cache_set_header(r, u->buffer.start) != NGX_OK) {
f7584d7c0ccb Cache: update variant while setting header. Valentin Bartenev <vbart@nginx.com> parents: 5951 diff changeset	3223 ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
f7584d7c0ccb Cache: update variant while setting header. Valentin Bartenev <vbart@nginx.com> parents: 5951 diff changeset	3224 return;
f7584d7c0ccb Cache: update variant while setting header. Valentin Bartenev <vbart@nginx.com> parents: 5951 diff changeset	3225 }
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	3226
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	3227 } else {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	3228 u->cacheable = 0;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	3229 }
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3230 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3231
2690 d3cffe32b930 add debug logging Igor Sysoev <igor@sysoev.ru> parents: 2669 diff changeset	3232 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
d3cffe32b930 add debug logging Igor Sysoev <igor@sysoev.ru> parents: 2669 diff changeset	3233 "http cacheable: %d", u->cacheable);
d3cffe32b930 add debug logging Igor Sysoev <igor@sysoev.ru> parents: 2669 diff changeset	3234
3083 ffe8bfb38184 clean cache updating state if a response has uncacheable code or Igor Sysoev <igor@sysoev.ru> parents: 3056 diff changeset	3235 if (u->cacheable == 0 && r->cache) {
3711 ce6ba077c270 several changes in cache cleanup handling: Igor Sysoev <igor@sysoev.ru> parents: 3709 diff changeset	3236 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	3237 }
ffe8bfb38184 clean cache updating state if a response has uncacheable code or Igor Sysoev <igor@sysoev.ru> parents: 3056 diff changeset	3238
6428 545b5e4d83b2 Upstream: avoid closing client connection in edge case. Justin Li <jli.justinli@gmail.com> parents: 6427 diff changeset	3239 if (r->header_only && !u->cacheable && !u->store) {
545b5e4d83b2 Upstream: avoid closing client connection in edge case. Justin Li <jli.justinli@gmail.com> parents: 6427 diff changeset	3240 ngx_http_upstream_finalize_request(r, u, 0);
545b5e4d83b2 Upstream: avoid closing client connection in edge case. Justin Li <jli.justinli@gmail.com> parents: 6427 diff changeset	3241 return;
545b5e4d83b2 Upstream: avoid closing client connection in edge case. Justin Li <jli.justinli@gmail.com> parents: 6427 diff changeset	3242 }
545b5e4d83b2 Upstream: avoid closing client connection in edge case. Justin Li <jli.justinli@gmail.com> parents: 6427 diff changeset	3243
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3244 #endif
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3245
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3246 p = u->pipe;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3247
6443 fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	3248 p->output_filter = ngx_http_upstream_output_filter;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3249 p->output_ctx = r;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3250 p->tag = u->output.tag;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3251 p->bufs = u->conf->bufs;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3252 p->busy_size = u->conf->busy_buffers_size;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3253 p->upstream = u->peer.connection;
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	3254 p->downstream = c;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3255 p->pool = r->pool;
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	3256 p->log = c->log;
5883 973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3257 p->limit_rate = u->conf->limit_rate;
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	3258 p->start_sec = ngx_time();
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3259
1565 4c43e25d11ea fix English grammar Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	3260 p->cacheable = u->cacheable \|\| u->store;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3261
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 487 diff changeset	3262 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	3263 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	3264 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	3265 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3266 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3267
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3268 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	3269 p->temp_file->file.log = c->log;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3270 p->temp_file->path = u->conf->temp_path;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3271 p->temp_file->pool = r->pool;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	3272
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	3273 if (p->cacheable) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3274 p->temp_file->persistent = 1;
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3275
5960 e9effef98874 Upstream: use_temp_path parameter of proxy_cache_path and friends. Valentin Bartenev <vbart@nginx.com> parents: 5959 diff changeset	3276 #if (NGX_HTTP_CACHE)
6795 1a917932db96 Cache: prefix-based temporary files. Maxim Dounin <mdounin@mdounin.ru> parents: 6794 diff changeset	3277 if (r->cache && !r->cache->file_cache->use_temp_path) {
1a917932db96 Cache: prefix-based temporary files. Maxim Dounin <mdounin@mdounin.ru> parents: 6794 diff changeset	3278 p->temp_file->path = r->cache->file_cache->path;
1a917932db96 Cache: prefix-based temporary files. Maxim Dounin <mdounin@mdounin.ru> parents: 6794 diff changeset	3279 p->temp_file->file.name = r->cache->file.name;
5960 e9effef98874 Upstream: use_temp_path parameter of proxy_cache_path and friends. Valentin Bartenev <vbart@nginx.com> parents: 5959 diff changeset	3280 }
e9effef98874 Upstream: use_temp_path parameter of proxy_cache_path and friends. Valentin Bartenev <vbart@nginx.com> parents: 5959 diff changeset	3281 #endif
e9effef98874 Upstream: use_temp_path parameter of proxy_cache_path and friends. Valentin Bartenev <vbart@nginx.com> parents: 5959 diff changeset	3282
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3283 } else {
667 63a820b0bc6c nginx-0.3.55-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 665 diff changeset	3284 p->temp_file->log_level = NGX_LOG_WARN;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3285 p->temp_file->warn = "an upstream response is buffered "
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3286 "to a temporary file";
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3287 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3288
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3289 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	3290 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	3291
6443 fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	3292 #if (NGX_THREADS)
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	3293 if (clcf->aio == NGX_HTTP_AIO_THREADS && clcf->aio_write) {
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	3294 p->thread_handler = ngx_http_upstream_thread_handler;
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	3295 p->thread_ctx = r;
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	3296 }
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	3297 #endif
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	3298
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 487 diff changeset	3299 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	3300 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	3301 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	3302 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3303 }
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3304
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3305 p->preread_bufs->buf = &u->buffer;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3306 p->preread_bufs->next = NULL;
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3307 u->buffer.recycled = 1;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3308
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3309 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	3310
1565 4c43e25d11ea fix English grammar Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	3311 if (u->cacheable) {
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3312
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3313 p->buf_to_file = ngx_calloc_buf(r->pool);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3314 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	3315 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	3316 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3317 }
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	3318
4895 508e61393b6c Event pipe: fixed handling of buf_to_file data. Maxim Dounin <mdounin@mdounin.ru> parents: 4769 diff changeset	3319 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	3320 p->buf_to_file->pos = u->buffer.start;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3321 p->buf_to_file->last = u->buffer.pos;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3322 p->buf_to_file->temporary = 1;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3323 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3324
6125 4dc8e7b62216 Removed the obsolete aio module. Ruslan Ermilov <ru@nginx.com> parents: 6068 diff changeset	3325 if (ngx_event_flags & NGX_USE_IOCP_EVENT) {
4499 778ef9c3fd2d Fixed spelling in single-line comments. Ruslan Ermilov <ru@nginx.com> parents: 4474 diff changeset	3326 /* 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	3327 p->single_buf = 1;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3328 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3329
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3330 /* 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	3331 p->free_bufs = 1;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3332
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3333 /*
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3334 * 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	3335 * as though these bytes were read
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3336 */
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3337 u->buffer.last = u->buffer.pos;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3338
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3339 if (u->conf->cyclic_temp_file) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3340
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3341 /*
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3342 * 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	3343 * 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	3344 * 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	3345 */
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3346
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3347 p->cyclic_temp_file = 1;
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	3348 c->sendfile = 0;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3349
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3350 } else {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3351 p->cyclic_temp_file = 0;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3352 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3353
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3354 p->read_timeout = u->conf->read_timeout;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3355 p->send_timeout = clcf->send_timeout;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3356 p->send_lowat = clcf->send_lowat;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3357
4119 b66712cde67d Upstream: pipe length and input_filter_init in buffered mode. Maxim Dounin <mdounin@mdounin.ru> parents: 4118 diff changeset	3358 p->length = -1;
b66712cde67d Upstream: pipe length and input_filter_init in buffered mode. Maxim Dounin <mdounin@mdounin.ru> parents: 4118 diff changeset	3359
b66712cde67d Upstream: pipe length and input_filter_init in buffered mode. Maxim Dounin <mdounin@mdounin.ru> parents: 4118 diff changeset	3360 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	3361 && 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	3362 {
5295 a489c31c9783 Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5294 diff changeset	3363 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	3364 return;
b66712cde67d Upstream: pipe length and input_filter_init in buffered mode. Maxim Dounin <mdounin@mdounin.ru> parents: 4118 diff changeset	3365 }
b66712cde67d Upstream: pipe length and input_filter_init in buffered mode. Maxim Dounin <mdounin@mdounin.ru> parents: 4118 diff changeset	3366
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3367 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	3368 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	3369
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	3370 ngx_http_upstream_process_upstream(r, u);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3371 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3372
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3373
9295 c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	3374 #if (NGX_HTTP_CACHE)
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	3375
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	3376 static ngx_int_t
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	3377 ngx_http_upstream_no_cache(ngx_http_request_t r, ngx_http_upstream_t u)
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	3378 {
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	3379 ngx_int_t rc;
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	3380
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	3381 if (!u->cacheable) {
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	3382 return NGX_OK;
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	3383 }
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	3384
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	3385 if (u->headers_in.no_cache \|\| u->headers_in.expired) {
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	3386 u->cacheable = 0;
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	3387 return NGX_OK;
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	3388 }
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	3389
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	3390 rc = ngx_http_test_predicates(r, u->conf->no_cache);
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	3391
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	3392 if (rc == NGX_ERROR) {
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	3393 return NGX_ERROR;
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	3394 }
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	3395
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	3396 if (rc == NGX_DECLINED) {
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	3397 u->cacheable = 0;
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	3398 return NGX_OK;
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	3399 }
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	3400
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	3401 /* rc == NGX_OK */
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	3402
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	3403 if (u->cache_status == NGX_HTTP_CACHE_BYPASS) {
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	3404
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	3405 /* create cache if previously bypassed */
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	3406
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	3407 if (ngx_http_file_cache_create(r) != NGX_OK) {
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	3408 return NGX_ERROR;
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	3409 }
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	3410 }
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	3411
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	3412 return NGX_OK;
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	3413 }
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	3414
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	3415 #endif
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	3416
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	3417
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	3418 static void
5072 7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3419 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	3420 {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3421 ngx_connection_t *c;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3422 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	3423
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3424 c = r->connection;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3425 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	3426
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3427 /* 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	3428
7131 6a5a91de5b74 Upstream: disabled upgrading in subrequests. Roman Arutyunyan <arut@nginx.com> parents: 7130 diff changeset	3429 if (r != r->main) {
6a5a91de5b74 Upstream: disabled upgrading in subrequests. Roman Arutyunyan <arut@nginx.com> parents: 7130 diff changeset	3430 ngx_log_error(NGX_LOG_ERR, c->log, 0,
6a5a91de5b74 Upstream: disabled upgrading in subrequests. Roman Arutyunyan <arut@nginx.com> parents: 7130 diff changeset	3431 "connection upgrade in subrequest");
6a5a91de5b74 Upstream: disabled upgrading in subrequests. Roman Arutyunyan <arut@nginx.com> parents: 7130 diff changeset	3432 ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
6a5a91de5b74 Upstream: disabled upgrading in subrequests. Roman Arutyunyan <arut@nginx.com> parents: 7130 diff changeset	3433 return;
6a5a91de5b74 Upstream: disabled upgrading in subrequests. Roman Arutyunyan <arut@nginx.com> parents: 7130 diff changeset	3434 }
6a5a91de5b74 Upstream: disabled upgrading in subrequests. Roman Arutyunyan <arut@nginx.com> parents: 7130 diff changeset	3435
5072 7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3436 r->keepalive = 0;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3437 c->log->action = "proxying upgraded connection";
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3438
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3439 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	3440 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	3441 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	3442 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	3443
5142 afea5259e05c Upstream: fixed tcp_nodelay with connection upgrade (ticket #325). Maxim Dounin <mdounin@mdounin.ru> parents: 5132 diff changeset	3444 if (clcf->tcp_nodelay) {
7007 ed1101bbf19f Introduced ngx_tcp_nodelay(). Ruslan Ermilov <ru@nginx.com> parents: 7006 diff changeset	3445
ed1101bbf19f Introduced ngx_tcp_nodelay(). Ruslan Ermilov <ru@nginx.com> parents: 7006 diff changeset	3446 if (ngx_tcp_nodelay(c) != NGX_OK) {
ed1101bbf19f Introduced ngx_tcp_nodelay(). Ruslan Ermilov <ru@nginx.com> parents: 7006 diff changeset	3447 ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
ed1101bbf19f Introduced ngx_tcp_nodelay(). Ruslan Ermilov <ru@nginx.com> parents: 7006 diff changeset	3448 return;
ed1101bbf19f Introduced ngx_tcp_nodelay(). Ruslan Ermilov <ru@nginx.com> parents: 7006 diff changeset	3449 }
ed1101bbf19f Introduced ngx_tcp_nodelay(). Ruslan Ermilov <ru@nginx.com> parents: 7006 diff changeset	3450
ed1101bbf19f Introduced ngx_tcp_nodelay(). Ruslan Ermilov <ru@nginx.com> parents: 7006 diff changeset	3451 if (ngx_tcp_nodelay(u->peer.connection) != NGX_OK) {
ed1101bbf19f Introduced ngx_tcp_nodelay(). Ruslan Ermilov <ru@nginx.com> parents: 7006 diff changeset	3452 ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
ed1101bbf19f Introduced ngx_tcp_nodelay(). Ruslan Ermilov <ru@nginx.com> parents: 7006 diff changeset	3453 return;
5072 7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3454 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3455 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3456
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3457 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	3458 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	3459 return;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3460 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3461
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3462 if (u->peer.connection->read->ready
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3463 \|\| u->buffer.pos != u->buffer.last)
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3464 {
5579 7586e7b2dbe9 Upstream: ngx_post_event() instead of upgraded call (ticket #503). Maxim Dounin <mdounin@mdounin.ru> parents: 5557 diff changeset	3465 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	3466 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	3467 return;
5072 7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3468 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3469
5532 17134d29782e Upstream: reading from a client after connection upgrade. Maxim Dounin <mdounin@mdounin.ru> parents: 5500 diff changeset	3470 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	3471 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3472
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3473
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3474 static void
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3475 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	3476 {
5073 52eb762c68a9 Proxy: fixed do_write handling in previous commit. Maxim Dounin <mdounin@mdounin.ru> parents: 5072 diff changeset	3477 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	3478 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3479
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3480
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3481 static void
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3482 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	3483 {
5073 52eb762c68a9 Proxy: fixed do_write handling in previous commit. Maxim Dounin <mdounin@mdounin.ru> parents: 5072 diff changeset	3484 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	3485 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3486
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3487
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3488 static void
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3489 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	3490 ngx_http_upstream_t *u)
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3491 {
5073 52eb762c68a9 Proxy: fixed do_write handling in previous commit. Maxim Dounin <mdounin@mdounin.ru> parents: 5072 diff changeset	3492 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	3493 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3494
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3495
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3496 static void
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3497 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	3498 ngx_http_upstream_t *u)
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3499 {
5073 52eb762c68a9 Proxy: fixed do_write handling in previous commit. Maxim Dounin <mdounin@mdounin.ru> parents: 5072 diff changeset	3500 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	3501 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3502
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3503
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3504 static void
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3505 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	3506 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	3507 {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3508 size_t size;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3509 ssize_t n;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3510 ngx_buf_t *b;
7538 08ed570ad93c Upstream: fixed EOF handling in unbuffered and upgraded modes. Maxim Dounin <mdounin@mdounin.ru> parents: 7514 diff changeset	3511 ngx_uint_t flags;
5072 7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3512 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	3513 ngx_http_upstream_t *u;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3514 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	3515
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3516 c = r->connection;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3517 u = r->upstream;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3518
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3519 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	3520 "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	3521
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3522 downstream = c;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3523 upstream = u->peer.connection;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3524
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3525 if (downstream->write->timedout) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3526 c->timedout = 1;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3527 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	3528 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	3529 return;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3530 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3531
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3532 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	3533 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	3534 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	3535 return;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3536 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3537
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3538 if (from_upstream) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3539 src = upstream;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3540 dst = downstream;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3541 b = &u->buffer;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3542
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3543 } else {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3544 src = downstream;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3545 dst = upstream;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3546 b = &u->from_client;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3547
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3548 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	3549 b = r->header_in;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3550 b->end = b->last;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3551 do_write = 1;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3552 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3553
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3554 if (b->start == NULL) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3555 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	3556 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	3557 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	3558 return;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3559 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3560
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3561 b->pos = b->start;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3562 b->last = b->start;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3563 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	3564 b->temporary = 1;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3565 b->tag = u->output.tag;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3566 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3567 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3568
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3569 for ( ;; ) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3570
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3571 if (do_write) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3572
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3573 size = b->last - b->pos;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3574
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3575 if (size && dst->write->ready) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3576
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3577 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	3578
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3579 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	3580 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	3581 return;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3582 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3583
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3584 if (n > 0) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3585 b->pos += n;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3586
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3587 if (b->pos == b->last) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3588 b->pos = b->start;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3589 b->last = b->start;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3590 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3591 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3592 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3593 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3594
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3595 size = b->end - b->last;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3596
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3597 if (size && src->read->ready) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3598
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3599 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	3600
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3601 if (n == NGX_AGAIN \|\| n == 0) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3602 break;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3603 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3604
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3605 if (n > 0) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3606 do_write = 1;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3607 b->last += n;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3608
6654 c131f20c9562 Upstream: the $upstream_bytes_received variable. Vladimir Homutov <vl@nginx.com> parents: 6594 diff changeset	3609 if (from_upstream) {
c131f20c9562 Upstream: the $upstream_bytes_received variable. Vladimir Homutov <vl@nginx.com> parents: 6594 diff changeset	3610 u->state->bytes_received += n;
c131f20c9562 Upstream: the $upstream_bytes_received variable. Vladimir Homutov <vl@nginx.com> parents: 6594 diff changeset	3611 }
c131f20c9562 Upstream: the $upstream_bytes_received variable. Vladimir Homutov <vl@nginx.com> parents: 6594 diff changeset	3612
5072 7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3613 continue;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3614 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3615
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3616 if (n == NGX_ERROR) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3617 src->read->eof = 1;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3618 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3619 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3620
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3621 break;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3622 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3623
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3624 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	3625 \|\| (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	3626 \|\| (downstream->read->eof && upstream->read->eof))
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3627 {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3628 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	3629 "http upstream upgraded done");
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3630 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	3631 return;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3632 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3633
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3634 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	3635
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3636 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	3637 != NGX_OK)
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3638 {
5295 a489c31c9783 Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5294 diff changeset	3639 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	3640 return;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3641 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3642
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3643 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	3644 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	3645
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3646 } else if (upstream->write->timer_set) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3647 ngx_del_timer(upstream->write);
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3648 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3649
7538 08ed570ad93c Upstream: fixed EOF handling in unbuffered and upgraded modes. Maxim Dounin <mdounin@mdounin.ru> parents: 7514 diff changeset	3650 if (upstream->read->eof \|\| upstream->read->error) {
08ed570ad93c Upstream: fixed EOF handling in unbuffered and upgraded modes. Maxim Dounin <mdounin@mdounin.ru> parents: 7514 diff changeset	3651 flags = NGX_CLOSE_EVENT;
08ed570ad93c Upstream: fixed EOF handling in unbuffered and upgraded modes. Maxim Dounin <mdounin@mdounin.ru> parents: 7514 diff changeset	3652
08ed570ad93c Upstream: fixed EOF handling in unbuffered and upgraded modes. Maxim Dounin <mdounin@mdounin.ru> parents: 7514 diff changeset	3653 } else {
08ed570ad93c Upstream: fixed EOF handling in unbuffered and upgraded modes. Maxim Dounin <mdounin@mdounin.ru> parents: 7514 diff changeset	3654 flags = 0;
08ed570ad93c Upstream: fixed EOF handling in unbuffered and upgraded modes. Maxim Dounin <mdounin@mdounin.ru> parents: 7514 diff changeset	3655 }
08ed570ad93c Upstream: fixed EOF handling in unbuffered and upgraded modes. Maxim Dounin <mdounin@mdounin.ru> parents: 7514 diff changeset	3656
08ed570ad93c Upstream: fixed EOF handling in unbuffered and upgraded modes. Maxim Dounin <mdounin@mdounin.ru> parents: 7514 diff changeset	3657 if (ngx_handle_read_event(upstream->read, flags) != NGX_OK) {
5295 a489c31c9783 Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5294 diff changeset	3658 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	3659 return;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3660 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3661
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3662 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	3663 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	3664
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3665 } else if (upstream->read->timer_set) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3666 ngx_del_timer(upstream->read);
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3667 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3668
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3669 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	3670 != NGX_OK)
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3671 {
5295 a489c31c9783 Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5294 diff changeset	3672 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	3673 return;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3674 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3675
7538 08ed570ad93c Upstream: fixed EOF handling in unbuffered and upgraded modes. Maxim Dounin <mdounin@mdounin.ru> parents: 7514 diff changeset	3676 if (downstream->read->eof \|\| downstream->read->error) {
08ed570ad93c Upstream: fixed EOF handling in unbuffered and upgraded modes. Maxim Dounin <mdounin@mdounin.ru> parents: 7514 diff changeset	3677 flags = NGX_CLOSE_EVENT;
08ed570ad93c Upstream: fixed EOF handling in unbuffered and upgraded modes. Maxim Dounin <mdounin@mdounin.ru> parents: 7514 diff changeset	3678
08ed570ad93c Upstream: fixed EOF handling in unbuffered and upgraded modes. Maxim Dounin <mdounin@mdounin.ru> parents: 7514 diff changeset	3679 } else {
08ed570ad93c Upstream: fixed EOF handling in unbuffered and upgraded modes. Maxim Dounin <mdounin@mdounin.ru> parents: 7514 diff changeset	3680 flags = 0;
08ed570ad93c Upstream: fixed EOF handling in unbuffered and upgraded modes. Maxim Dounin <mdounin@mdounin.ru> parents: 7514 diff changeset	3681 }
08ed570ad93c Upstream: fixed EOF handling in unbuffered and upgraded modes. Maxim Dounin <mdounin@mdounin.ru> parents: 7514 diff changeset	3682
08ed570ad93c Upstream: fixed EOF handling in unbuffered and upgraded modes. Maxim Dounin <mdounin@mdounin.ru> parents: 7514 diff changeset	3683 if (ngx_handle_read_event(downstream->read, flags) != NGX_OK) {
5295 a489c31c9783 Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5294 diff changeset	3684 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	3685 return;
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3686 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3687
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3688 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	3689 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	3690
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3691 } else if (downstream->write->timer_set) {
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3692 ngx_del_timer(downstream->write);
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3693 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3694 }
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3695
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3696
7fa7e60a7f66 Proxy: support for connection upgrade (101 Switching Protocols). Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	3697 static void
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3698 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	3699 {
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3700 ngx_event_t *wev;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3701 ngx_connection_t *c;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3702 ngx_http_upstream_t *u;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3703
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3704 c = r->connection;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3705 u = r->upstream;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3706 wev = c->write;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3707
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3708 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	3709 "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	3710
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3711 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	3712
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3713 if (wev->timedout) {
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3714 c->timedout = 1;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3715 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	3716 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	3717 return;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3718 }
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3719
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3720 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	3721 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3722
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3723
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3724 static void
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	3725 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	3726 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	3727 {
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	3728 ngx_connection_t *c;
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	3729
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	3730 c = u->peer.connection;
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3731
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3732 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	3733 "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	3734
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3735 c->log->action = "reading upstream";
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3736
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	3737 if (c->read->timedout) {
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3738 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	3739 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	3740 return;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3741 }
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3742
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3743 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	3744 }
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3745
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3746
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3747 static void
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3748 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	3749 ngx_uint_t do_write)
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3750 {
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3751 size_t size;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3752 ssize_t n;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3753 ngx_buf_t *b;
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	3754 ngx_int_t rc;
7538 08ed570ad93c Upstream: fixed EOF handling in unbuffered and upgraded modes. Maxim Dounin <mdounin@mdounin.ru> parents: 7514 diff changeset	3755 ngx_uint_t flags;
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3756 ngx_connection_t downstream, upstream;
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3757 ngx_http_upstream_t *u;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3758 ngx_http_core_loc_conf_t *clcf;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3759
756 d904b5cb3bba fix building introduced by previous commit Igor Sysoev <igor@sysoev.ru> parents: 755 diff changeset	3760 u = r->upstream;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3761 downstream = r->connection;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3762 upstream = u->peer.connection;
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3763
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3764 b = &u->buffer;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3765
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3766 do_write = do_write \|\| u->length == 0;
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3767
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3768 for ( ;; ) {
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3769
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3770 if (do_write) {
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3771
7166 a762ddf22dbb Upstream: flush low-level buffers on write retry. Patryk Lesiewicz <patryk@google.com> parents: 7131 diff changeset	3772 if (u->out_bufs \|\| u->busy_bufs \|\| downstream->buffered) {
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	3773 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	3774
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	3775 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	3776 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	3777 return;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3778 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3779
4114 5db098f97e0e API change: ngx_chain_update_chains() now requires pool. Maxim Dounin <mdounin@mdounin.ru> parents: 3976 diff changeset	3780 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	3781 &u->out_bufs, u->output.tag);
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3782 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3783
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3784 if (u->busy_bufs == NULL) {
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3785
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3786 if (u->length == 0
5301 a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3787 \|\| (upstream->read->eof && u->length == -1))
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3788 {
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3789 ngx_http_upstream_finalize_request(r, u, 0);
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3790 return;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3791 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3792
5301 a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3793 if (upstream->read->eof) {
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3794 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	3795 "upstream prematurely closed connection");
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3796
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3797 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	3798 NGX_HTTP_BAD_GATEWAY);
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3799 return;
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3800 }
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3801
7679 05e42236e95b FastCGI: protection from responses with wrong length. Maxim Dounin <mdounin@mdounin.ru> parents: 7678 diff changeset	3802 if (upstream->read->error \|\| u->error) {
5301 a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3803 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	3804 NGX_HTTP_BAD_GATEWAY);
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3805 return;
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3806 }
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	3807
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3808 b->pos = b->start;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3809 b->last = b->start;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3810 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3811 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3812
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3813 size = b->end - b->last;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3814
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3815 if (size && upstream->read->ready) {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3816
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3817 n = upstream->recv(upstream, b->last, size);
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3818
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3819 if (n == NGX_AGAIN) {
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3820 break;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3821 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3822
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3823 if (n > 0) {
6654 c131f20c9562 Upstream: the $upstream_bytes_received variable. Vladimir Homutov <vl@nginx.com> parents: 6594 diff changeset	3824 u->state->bytes_received += n;
2402 cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	3825 u->state->response_length += n;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	3826
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3827 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	3828 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	3829 return;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3830 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3831 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3832
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3833 do_write = 1;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3834
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3835 continue;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3836 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3837
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3838 break;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3839 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3840
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	3841 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	3842
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3843 if (downstream->data == r) {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3844 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	3845 != NGX_OK)
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	3846 {
5295 a489c31c9783 Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5294 diff changeset	3847 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	3848 return;
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	3849 }
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3850 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3851
1063 e2a6ecc5a3ae a non-active client connection must not closed after send timeout Igor Sysoev <igor@sysoev.ru> parents: 1031 diff changeset	3852 if (downstream->write->active && !downstream->write->ready) {
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3853 ngx_add_timer(downstream->write, clcf->send_timeout);
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3854
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3855 } else if (downstream->write->timer_set) {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3856 ngx_del_timer(downstream->write);
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3857 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3858
7538 08ed570ad93c Upstream: fixed EOF handling in unbuffered and upgraded modes. Maxim Dounin <mdounin@mdounin.ru> parents: 7514 diff changeset	3859 if (upstream->read->eof \|\| upstream->read->error) {
08ed570ad93c Upstream: fixed EOF handling in unbuffered and upgraded modes. Maxim Dounin <mdounin@mdounin.ru> parents: 7514 diff changeset	3860 flags = NGX_CLOSE_EVENT;
08ed570ad93c Upstream: fixed EOF handling in unbuffered and upgraded modes. Maxim Dounin <mdounin@mdounin.ru> parents: 7514 diff changeset	3861
08ed570ad93c Upstream: fixed EOF handling in unbuffered and upgraded modes. Maxim Dounin <mdounin@mdounin.ru> parents: 7514 diff changeset	3862 } else {
08ed570ad93c Upstream: fixed EOF handling in unbuffered and upgraded modes. Maxim Dounin <mdounin@mdounin.ru> parents: 7514 diff changeset	3863 flags = 0;
08ed570ad93c Upstream: fixed EOF handling in unbuffered and upgraded modes. Maxim Dounin <mdounin@mdounin.ru> parents: 7514 diff changeset	3864 }
08ed570ad93c Upstream: fixed EOF handling in unbuffered and upgraded modes. Maxim Dounin <mdounin@mdounin.ru> parents: 7514 diff changeset	3865
08ed570ad93c Upstream: fixed EOF handling in unbuffered and upgraded modes. Maxim Dounin <mdounin@mdounin.ru> parents: 7514 diff changeset	3866 if (ngx_handle_read_event(upstream->read, flags) != NGX_OK) {
5295 a489c31c9783 Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5294 diff changeset	3867 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	3868 return;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3869 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3870
1063 e2a6ecc5a3ae a non-active client connection must not closed after send timeout Igor Sysoev <igor@sysoev.ru> parents: 1031 diff changeset	3871 if (upstream->read->active && !upstream->read->ready) {
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3872 ngx_add_timer(upstream->read, u->conf->read_timeout);
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3873
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3874 } else if (upstream->read->timer_set) {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	3875 ngx_del_timer(upstream->read);
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3876 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3877 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3878
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3879
7678 bffcc5af1d72 Upstream: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7649 diff changeset	3880 ngx_int_t
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3881 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	3882 {
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3883 return NGX_OK;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3884 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3885
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3886
7678 bffcc5af1d72 Upstream: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7649 diff changeset	3887 ngx_int_t
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3888 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	3889 {
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3890 ngx_http_request_t *r = data;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3891
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3892 ngx_buf_t *b;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3893 ngx_chain_t cl, *ll;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3894 ngx_http_upstream_t *u;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3895
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3896 u = r->upstream;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3897
7760 83c4622053b0 Upstream: fixed zero size buf alerts on extra data (ticket #2117). Maxim Dounin <mdounin@mdounin.ru> parents: 7702 diff changeset	3898 if (u->length == 0) {
83c4622053b0 Upstream: fixed zero size buf alerts on extra data (ticket #2117). Maxim Dounin <mdounin@mdounin.ru> parents: 7702 diff changeset	3899 ngx_log_error(NGX_LOG_WARN, r->connection->log, 0,
83c4622053b0 Upstream: fixed zero size buf alerts on extra data (ticket #2117). Maxim Dounin <mdounin@mdounin.ru> parents: 7702 diff changeset	3900 "upstream sent more data than specified in "
83c4622053b0 Upstream: fixed zero size buf alerts on extra data (ticket #2117). Maxim Dounin <mdounin@mdounin.ru> parents: 7702 diff changeset	3901 "\"Content-Length\" header");
83c4622053b0 Upstream: fixed zero size buf alerts on extra data (ticket #2117). Maxim Dounin <mdounin@mdounin.ru> parents: 7702 diff changeset	3902 return NGX_OK;
83c4622053b0 Upstream: fixed zero size buf alerts on extra data (ticket #2117). Maxim Dounin <mdounin@mdounin.ru> parents: 7702 diff changeset	3903 }
83c4622053b0 Upstream: fixed zero size buf alerts on extra data (ticket #2117). Maxim Dounin <mdounin@mdounin.ru> parents: 7702 diff changeset	3904
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3905 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	3906 ll = &cl->next;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3907 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3908
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3909 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	3910 if (cl == NULL) {
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3911 return NGX_ERROR;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3912 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3913
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3914 *ll = cl;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3915
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3916 cl->buf->flush = 1;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3917 cl->buf->memory = 1;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3918
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3919 b = &u->buffer;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3920
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3921 cl->buf->pos = b->last;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3922 b->last += bytes;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3923 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	3924 cl->buf->tag = u->output.tag;
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3925
4118 dbddec65fdab Upstream: r->upstream->length type change to off_t. Maxim Dounin <mdounin@mdounin.ru> parents: 4117 diff changeset	3926 if (u->length == -1) {
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3927 return NGX_OK;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3928 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3929
7678 bffcc5af1d72 Upstream: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7649 diff changeset	3930 if (bytes > u->length) {
bffcc5af1d72 Upstream: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7649 diff changeset	3931
bffcc5af1d72 Upstream: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7649 diff changeset	3932 ngx_log_error(NGX_LOG_WARN, r->connection->log, 0,
bffcc5af1d72 Upstream: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7649 diff changeset	3933 "upstream sent more data than specified in "
bffcc5af1d72 Upstream: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7649 diff changeset	3934 "\"Content-Length\" header");
bffcc5af1d72 Upstream: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7649 diff changeset	3935
bffcc5af1d72 Upstream: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7649 diff changeset	3936 cl->buf->last = cl->buf->pos + u->length;
bffcc5af1d72 Upstream: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7649 diff changeset	3937 u->length = 0;
bffcc5af1d72 Upstream: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7649 diff changeset	3938
bffcc5af1d72 Upstream: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7649 diff changeset	3939 return NGX_OK;
bffcc5af1d72 Upstream: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7649 diff changeset	3940 }
bffcc5af1d72 Upstream: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7649 diff changeset	3941
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3942 u->length -= bytes;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3943
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3944 return NGX_OK;
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3945 }
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3946
326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	3947
6443 fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	3948 #if (NGX_THREADS)
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	3949
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	3950 static ngx_int_t
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	3951 ngx_http_upstream_thread_handler(ngx_thread_task_t task, ngx_file_t file)
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	3952 {
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	3953 ngx_str_t name;
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	3954 ngx_event_pipe_t *p;
7974 555533169506 HTTP/2: fixed "task already active" with sendfile in threads. Maxim Dounin <mdounin@mdounin.ru> parents: 7949 diff changeset	3955 ngx_connection_t *c;
6443 fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	3956 ngx_thread_pool_t *tp;
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	3957 ngx_http_request_t *r;
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	3958 ngx_http_core_loc_conf_t *clcf;
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	3959
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	3960 r = file->thread_ctx;
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	3961 p = r->upstream->pipe;
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	3962
7974 555533169506 HTTP/2: fixed "task already active" with sendfile in threads. Maxim Dounin <mdounin@mdounin.ru> parents: 7949 diff changeset	3963 if (r->aio) {
555533169506 HTTP/2: fixed "task already active" with sendfile in threads. Maxim Dounin <mdounin@mdounin.ru> parents: 7949 diff changeset	3964 /*
555533169506 HTTP/2: fixed "task already active" with sendfile in threads. Maxim Dounin <mdounin@mdounin.ru> parents: 7949 diff changeset	3965 * tolerate sendfile() calls if another operation is already
555533169506 HTTP/2: fixed "task already active" with sendfile in threads. Maxim Dounin <mdounin@mdounin.ru> parents: 7949 diff changeset	3966 * running; this can happen due to subrequests, multiple calls
555533169506 HTTP/2: fixed "task already active" with sendfile in threads. Maxim Dounin <mdounin@mdounin.ru> parents: 7949 diff changeset	3967 * of the next body filter from a filter, or in HTTP/2 due to
555533169506 HTTP/2: fixed "task already active" with sendfile in threads. Maxim Dounin <mdounin@mdounin.ru> parents: 7949 diff changeset	3968 * a write event on the main connection
555533169506 HTTP/2: fixed "task already active" with sendfile in threads. Maxim Dounin <mdounin@mdounin.ru> parents: 7949 diff changeset	3969 */
555533169506 HTTP/2: fixed "task already active" with sendfile in threads. Maxim Dounin <mdounin@mdounin.ru> parents: 7949 diff changeset	3970
555533169506 HTTP/2: fixed "task already active" with sendfile in threads. Maxim Dounin <mdounin@mdounin.ru> parents: 7949 diff changeset	3971 c = r->connection;
555533169506 HTTP/2: fixed "task already active" with sendfile in threads. Maxim Dounin <mdounin@mdounin.ru> parents: 7949 diff changeset	3972
555533169506 HTTP/2: fixed "task already active" with sendfile in threads. Maxim Dounin <mdounin@mdounin.ru> parents: 7949 diff changeset	3973 #if (NGX_HTTP_V2)
555533169506 HTTP/2: fixed "task already active" with sendfile in threads. Maxim Dounin <mdounin@mdounin.ru> parents: 7949 diff changeset	3974 if (r->stream) {
555533169506 HTTP/2: fixed "task already active" with sendfile in threads. Maxim Dounin <mdounin@mdounin.ru> parents: 7949 diff changeset	3975 c = r->stream->connection->connection;
555533169506 HTTP/2: fixed "task already active" with sendfile in threads. Maxim Dounin <mdounin@mdounin.ru> parents: 7949 diff changeset	3976 }
555533169506 HTTP/2: fixed "task already active" with sendfile in threads. Maxim Dounin <mdounin@mdounin.ru> parents: 7949 diff changeset	3977 #endif
555533169506 HTTP/2: fixed "task already active" with sendfile in threads. Maxim Dounin <mdounin@mdounin.ru> parents: 7949 diff changeset	3978
555533169506 HTTP/2: fixed "task already active" with sendfile in threads. Maxim Dounin <mdounin@mdounin.ru> parents: 7949 diff changeset	3979 if (task == c->sendfile_task) {
555533169506 HTTP/2: fixed "task already active" with sendfile in threads. Maxim Dounin <mdounin@mdounin.ru> parents: 7949 diff changeset	3980 return NGX_OK;
555533169506 HTTP/2: fixed "task already active" with sendfile in threads. Maxim Dounin <mdounin@mdounin.ru> parents: 7949 diff changeset	3981 }
555533169506 HTTP/2: fixed "task already active" with sendfile in threads. Maxim Dounin <mdounin@mdounin.ru> parents: 7949 diff changeset	3982 }
555533169506 HTTP/2: fixed "task already active" with sendfile in threads. Maxim Dounin <mdounin@mdounin.ru> parents: 7949 diff changeset	3983
6443 fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	3984 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	3985 tp = clcf->thread_pool;
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	3986
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	3987 if (tp == NULL) {
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	3988 if (ngx_http_complex_value(r, clcf->thread_pool_value, &name)
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	3989 != NGX_OK)
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	3990 {
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	3991 return NGX_ERROR;
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	3992 }
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	3993
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	3994 tp = ngx_thread_pool_get((ngx_cycle_t *) ngx_cycle, &name);
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	3995
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	3996 if (tp == NULL) {
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	3997 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	3998 "thread pool \"%V\" not found", &name);
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	3999 return NGX_ERROR;
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4000 }
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4001 }
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4002
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4003 task->event.data = r;
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4004 task->event.handler = ngx_http_upstream_thread_event_handler;
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4005
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4006 if (ngx_thread_task_post(tp, task) != NGX_OK) {
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4007 return NGX_ERROR;
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4008 }
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4009
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4010 r->main->blocked++;
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4011 r->aio = 1;
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4012 p->aio = 1;
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4013
9202 e88cdaa0f1ff AIO operations now add timers (ticket #2162). Maxim Dounin <mdounin@mdounin.ru> parents: 9021 diff changeset	4014 ngx_add_timer(&task->event, 60000);
e88cdaa0f1ff AIO operations now add timers (ticket #2162). Maxim Dounin <mdounin@mdounin.ru> parents: 9021 diff changeset	4015
6443 fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4016 return NGX_OK;
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4017 }
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4018
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4019
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4020 static void
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4021 ngx_http_upstream_thread_event_handler(ngx_event_t *ev)
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4022 {
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4023 ngx_connection_t *c;
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4024 ngx_http_request_t *r;
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4025
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4026 r = ev->data;
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4027 c = r->connection;
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4028
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4029 ngx_http_set_log_request(c->log, r);
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4030
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4031 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4032 "http upstream thread: \"%V?%V\"", &r->uri, &r->args);
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4033
9202 e88cdaa0f1ff AIO operations now add timers (ticket #2162). Maxim Dounin <mdounin@mdounin.ru> parents: 9021 diff changeset	4034 if (ev->timedout) {
e88cdaa0f1ff AIO operations now add timers (ticket #2162). Maxim Dounin <mdounin@mdounin.ru> parents: 9021 diff changeset	4035 ngx_log_error(NGX_LOG_ALERT, c->log, 0,
e88cdaa0f1ff AIO operations now add timers (ticket #2162). Maxim Dounin <mdounin@mdounin.ru> parents: 9021 diff changeset	4036 "thread operation took too long");
e88cdaa0f1ff AIO operations now add timers (ticket #2162). Maxim Dounin <mdounin@mdounin.ru> parents: 9021 diff changeset	4037 ev->timedout = 0;
e88cdaa0f1ff AIO operations now add timers (ticket #2162). Maxim Dounin <mdounin@mdounin.ru> parents: 9021 diff changeset	4038 return;
e88cdaa0f1ff AIO operations now add timers (ticket #2162). Maxim Dounin <mdounin@mdounin.ru> parents: 9021 diff changeset	4039 }
e88cdaa0f1ff AIO operations now add timers (ticket #2162). Maxim Dounin <mdounin@mdounin.ru> parents: 9021 diff changeset	4040
e88cdaa0f1ff AIO operations now add timers (ticket #2162). Maxim Dounin <mdounin@mdounin.ru> parents: 9021 diff changeset	4041 if (ev->timer_set) {
e88cdaa0f1ff AIO operations now add timers (ticket #2162). Maxim Dounin <mdounin@mdounin.ru> parents: 9021 diff changeset	4042 ngx_del_timer(ev);
e88cdaa0f1ff AIO operations now add timers (ticket #2162). Maxim Dounin <mdounin@mdounin.ru> parents: 9021 diff changeset	4043 }
e88cdaa0f1ff AIO operations now add timers (ticket #2162). Maxim Dounin <mdounin@mdounin.ru> parents: 9021 diff changeset	4044
6443 fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4045 r->main->blocked--;
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4046 r->aio = 0;
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4047
7975 a7a77549265e HTTP/2: fixed sendfile() aio handling. Maxim Dounin <mdounin@mdounin.ru> parents: 7974 diff changeset	4048 #if (NGX_HTTP_V2)
a7a77549265e HTTP/2: fixed sendfile() aio handling. Maxim Dounin <mdounin@mdounin.ru> parents: 7974 diff changeset	4049
a7a77549265e HTTP/2: fixed sendfile() aio handling. Maxim Dounin <mdounin@mdounin.ru> parents: 7974 diff changeset	4050 if (r->stream) {
a7a77549265e HTTP/2: fixed sendfile() aio handling. Maxim Dounin <mdounin@mdounin.ru> parents: 7974 diff changeset	4051 /*
a7a77549265e HTTP/2: fixed sendfile() aio handling. Maxim Dounin <mdounin@mdounin.ru> parents: 7974 diff changeset	4052 * for HTTP/2, update write event to make sure processing will
a7a77549265e HTTP/2: fixed sendfile() aio handling. Maxim Dounin <mdounin@mdounin.ru> parents: 7974 diff changeset	4053 * reach the main connection to handle sendfile() in threads
a7a77549265e HTTP/2: fixed sendfile() aio handling. Maxim Dounin <mdounin@mdounin.ru> parents: 7974 diff changeset	4054 */
a7a77549265e HTTP/2: fixed sendfile() aio handling. Maxim Dounin <mdounin@mdounin.ru> parents: 7974 diff changeset	4055
a7a77549265e HTTP/2: fixed sendfile() aio handling. Maxim Dounin <mdounin@mdounin.ru> parents: 7974 diff changeset	4056 c->write->ready = 1;
a7a77549265e HTTP/2: fixed sendfile() aio handling. Maxim Dounin <mdounin@mdounin.ru> parents: 7974 diff changeset	4057 c->write->active = 0;
a7a77549265e HTTP/2: fixed sendfile() aio handling. Maxim Dounin <mdounin@mdounin.ru> parents: 7974 diff changeset	4058 }
a7a77549265e HTTP/2: fixed sendfile() aio handling. Maxim Dounin <mdounin@mdounin.ru> parents: 7974 diff changeset	4059
a7a77549265e HTTP/2: fixed sendfile() aio handling. Maxim Dounin <mdounin@mdounin.ru> parents: 7974 diff changeset	4060 #endif
a7a77549265e HTTP/2: fixed sendfile() aio handling. Maxim Dounin <mdounin@mdounin.ru> parents: 7974 diff changeset	4061
9203 0de20f43db25 Fixed request termination with AIO and subrequests (ticket #2555). Maxim Dounin <mdounin@mdounin.ru> parents: 9202 diff changeset	4062 if (r->done \|\| r->main->terminated) {
6950 4cb4ffe06785 Threads: fixed request hang with aio_write and subrequests. Maxim Dounin <mdounin@mdounin.ru> parents: 6923 diff changeset	4063 /*
4cb4ffe06785 Threads: fixed request hang with aio_write and subrequests. Maxim Dounin <mdounin@mdounin.ru> parents: 6923 diff changeset	4064 * trigger connection event handler if the subrequest was
9203 0de20f43db25 Fixed request termination with AIO and subrequests (ticket #2555). Maxim Dounin <mdounin@mdounin.ru> parents: 9202 diff changeset	4065 * already finalized (this can happen if the handler is used
0de20f43db25 Fixed request termination with AIO and subrequests (ticket #2555). Maxim Dounin <mdounin@mdounin.ru> parents: 9202 diff changeset	4066 * for sendfile() in threads), or if the request was terminated
6950 4cb4ffe06785 Threads: fixed request hang with aio_write and subrequests. Maxim Dounin <mdounin@mdounin.ru> parents: 6923 diff changeset	4067 */
4cb4ffe06785 Threads: fixed request hang with aio_write and subrequests. Maxim Dounin <mdounin@mdounin.ru> parents: 6923 diff changeset	4068
4cb4ffe06785 Threads: fixed request hang with aio_write and subrequests. Maxim Dounin <mdounin@mdounin.ru> parents: 6923 diff changeset	4069 c->write->handler(c->write);
4cb4ffe06785 Threads: fixed request hang with aio_write and subrequests. Maxim Dounin <mdounin@mdounin.ru> parents: 6923 diff changeset	4070
4cb4ffe06785 Threads: fixed request hang with aio_write and subrequests. Maxim Dounin <mdounin@mdounin.ru> parents: 6923 diff changeset	4071 } else {
4cb4ffe06785 Threads: fixed request hang with aio_write and subrequests. Maxim Dounin <mdounin@mdounin.ru> parents: 6923 diff changeset	4072 r->write_event_handler(r);
4cb4ffe06785 Threads: fixed request hang with aio_write and subrequests. Maxim Dounin <mdounin@mdounin.ru> parents: 6923 diff changeset	4073 ngx_http_run_posted_requests(c);
4cb4ffe06785 Threads: fixed request hang with aio_write and subrequests. Maxim Dounin <mdounin@mdounin.ru> parents: 6923 diff changeset	4074 }
6443 fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4075 }
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4076
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4077 #endif
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4078
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4079
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4080 static ngx_int_t
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4081 ngx_http_upstream_output_filter(void data, ngx_chain_t chain)
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4082 {
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4083 ngx_int_t rc;
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4084 ngx_event_pipe_t *p;
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4085 ngx_http_request_t *r;
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4086
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4087 r = data;
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4088 p = r->upstream->pipe;
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4089
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4090 rc = ngx_http_output_filter(r, chain);
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4091
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4092 p->aio = r->aio;
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4093
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4094 return rc;
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4095 }
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4096
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4097
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	4098 static void
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4099 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	4100 {
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	4101 ngx_event_t *wev;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	4102 ngx_connection_t *c;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4103 ngx_event_pipe_t *p;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4104 ngx_http_upstream_t *u;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4105
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	4106 c = r->connection;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4107 u = r->upstream;
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	4108 p = u->pipe;
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	4109 wev = c->write;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	4110
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	4111 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	4112 "http upstream process downstream");
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	4113
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	4114 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	4115
6443 fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4116 #if (NGX_THREADS)
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4117 p->aio = r->aio;
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4118 #endif
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4119
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	4120 if (wev->timedout) {
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	4121
6961 903fb1ddc07f Moved handling of wev->delayed to the connection event handler. Maxim Dounin <mdounin@mdounin.ru> parents: 6950 diff changeset	4122 p->downstream_error = 1;
903fb1ddc07f Moved handling of wev->delayed to the connection event handler. Maxim Dounin <mdounin@mdounin.ru> parents: 6950 diff changeset	4123 c->timedout = 1;
903fb1ddc07f Moved handling of wev->delayed to the connection event handler. Maxim Dounin <mdounin@mdounin.ru> parents: 6950 diff changeset	4124 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	4125
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4126 } else {
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	4127
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	4128 if (wev->delayed) {
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	4129
527 7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	4130 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	4131 "http downstream delayed");
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	4132
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	4133 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	4134 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	4135 }
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	4136
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	4137 return;
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	4138 }
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	4139
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	4140 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	4141 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	4142 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4143 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4144 }
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	4145
5995 5f179f344096 Upstream: upstream argument in ngx_http_upstream_process_request(). Maxim Dounin <mdounin@mdounin.ru> parents: 5994 diff changeset	4146 ngx_http_upstream_process_request(r, u);
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	4147 }
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	4148
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	4149
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	4150 static void
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	4151 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	4152 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	4153 {
5883 973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	4154 ngx_event_t *rev;
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	4155 ngx_event_pipe_t *p;
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	4156 ngx_connection_t *c;
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	4157
4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	4158 c = u->peer.connection;
5883 973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	4159 p = u->pipe;
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	4160 rev = c->read;
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	4161
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	4162 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	4163 "http upstream process upstream");
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	4164
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	4165 c->log->action = "reading upstream";
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	4166
5883 973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	4167 if (rev->timedout) {
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	4168
6961 903fb1ddc07f Moved handling of wev->delayed to the connection event handler. Maxim Dounin <mdounin@mdounin.ru> parents: 6950 diff changeset	4169 p->upstream_error = 1;
903fb1ddc07f Moved handling of wev->delayed to the connection event handler. Maxim Dounin <mdounin@mdounin.ru> parents: 6950 diff changeset	4170 ngx_connection_error(c, NGX_ETIMEDOUT, "upstream timed out");
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	4171
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	4172 } else {
5883 973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	4173
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	4174 if (rev->delayed) {
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	4175
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	4176 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	4177 "http upstream delayed");
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	4178
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	4179 if (ngx_handle_read_event(rev, 0) != NGX_OK) {
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	4180 ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	4181 }
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	4182
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	4183 return;
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	4184 }
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	4185
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5878 diff changeset	4186 if (ngx_event_pipe(p, 0) == NGX_ABORT) {
5297 0ae9a2958886 Upstream: NGX_ERROR after pipe errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5296 diff changeset	4187 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	4188 return;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	4189 }
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	4190 }
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	4191
5995 5f179f344096 Upstream: upstream argument in ngx_http_upstream_process_request(). Maxim Dounin <mdounin@mdounin.ru> parents: 5994 diff changeset	4192 ngx_http_upstream_process_request(r, u);
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	4193 }
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	4194
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	4195
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	4196 static void
5995 5f179f344096 Upstream: upstream argument in ngx_http_upstream_process_request(). Maxim Dounin <mdounin@mdounin.ru> parents: 5994 diff changeset	4197 ngx_http_upstream_process_request(ngx_http_request_t *r,
5f179f344096 Upstream: upstream argument in ngx_http_upstream_process_request(). Maxim Dounin <mdounin@mdounin.ru> parents: 5994 diff changeset	4198 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	4199 {
5996 ab660d7c9980 Style. Maxim Dounin <mdounin@mdounin.ru> parents: 5995 diff changeset	4200 ngx_temp_file_t *tf;
ab660d7c9980 Style. Maxim Dounin <mdounin@mdounin.ru> parents: 5995 diff changeset	4201 ngx_event_pipe_t *p;
5995 5f179f344096 Upstream: upstream argument in ngx_http_upstream_process_request(). Maxim Dounin <mdounin@mdounin.ru> parents: 5994 diff changeset	4202
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	4203 p = u->pipe;
3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	4204
6443 fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4205 #if (NGX_THREADS)
6876 a5d1b1383dea Upstream: fixed cache corruption and socket leaks with aio_write. Maxim Dounin <mdounin@mdounin.ru> parents: 6853 diff changeset	4206
a5d1b1383dea Upstream: fixed cache corruption and socket leaks with aio_write. Maxim Dounin <mdounin@mdounin.ru> parents: 6853 diff changeset	4207 if (p->writing && !p->aio) {
a5d1b1383dea Upstream: fixed cache corruption and socket leaks with aio_write. Maxim Dounin <mdounin@mdounin.ru> parents: 6853 diff changeset	4208
a5d1b1383dea Upstream: fixed cache corruption and socket leaks with aio_write. Maxim Dounin <mdounin@mdounin.ru> parents: 6853 diff changeset	4209 /*
a5d1b1383dea Upstream: fixed cache corruption and socket leaks with aio_write. Maxim Dounin <mdounin@mdounin.ru> parents: 6853 diff changeset	4210 * make sure to call ngx_event_pipe()
a5d1b1383dea Upstream: fixed cache corruption and socket leaks with aio_write. Maxim Dounin <mdounin@mdounin.ru> parents: 6853 diff changeset	4211 * if there is an incomplete aio write
a5d1b1383dea Upstream: fixed cache corruption and socket leaks with aio_write. Maxim Dounin <mdounin@mdounin.ru> parents: 6853 diff changeset	4212 */
a5d1b1383dea Upstream: fixed cache corruption and socket leaks with aio_write. Maxim Dounin <mdounin@mdounin.ru> parents: 6853 diff changeset	4213
a5d1b1383dea Upstream: fixed cache corruption and socket leaks with aio_write. Maxim Dounin <mdounin@mdounin.ru> parents: 6853 diff changeset	4214 if (ngx_event_pipe(p, 1) == NGX_ABORT) {
a5d1b1383dea Upstream: fixed cache corruption and socket leaks with aio_write. Maxim Dounin <mdounin@mdounin.ru> parents: 6853 diff changeset	4215 ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
a5d1b1383dea Upstream: fixed cache corruption and socket leaks with aio_write. Maxim Dounin <mdounin@mdounin.ru> parents: 6853 diff changeset	4216 return;
a5d1b1383dea Upstream: fixed cache corruption and socket leaks with aio_write. Maxim Dounin <mdounin@mdounin.ru> parents: 6853 diff changeset	4217 }
a5d1b1383dea Upstream: fixed cache corruption and socket leaks with aio_write. Maxim Dounin <mdounin@mdounin.ru> parents: 6853 diff changeset	4218 }
a5d1b1383dea Upstream: fixed cache corruption and socket leaks with aio_write. Maxim Dounin <mdounin@mdounin.ru> parents: 6853 diff changeset	4219
6443 fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4220 if (p->writing) {
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4221 return;
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4222 }
6876 a5d1b1383dea Upstream: fixed cache corruption and socket leaks with aio_write. Maxim Dounin <mdounin@mdounin.ru> parents: 6853 diff changeset	4223
6443 fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4224 #endif
fc72784b1f52 Threads: writing via threads pools in event pipe. Maxim Dounin <mdounin@mdounin.ru> parents: 6439 diff changeset	4225
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4226 if (u->peer.connection) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4227
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	4228 if (u->store) {
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	4229
2463 4bc8ea10d62b fix fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 2445 diff changeset	4230 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	4231
5298 a7b2db9119e0 Upstream: replaced u->pipe->temp_file with p->temp_file. Maxim Dounin <mdounin@mdounin.ru> parents: 5297 diff changeset	4232 tf = p->temp_file;
4469 24c0dca04eb9 Fix for proxy_store leaving temporary files for subrequests. Maxim Dounin <mdounin@mdounin.ru> parents: 4464 diff changeset	4233
2445 3c6af1fb7586 proxy/fastcgi_store did not delete incomplete files Igor Sysoev <igor@sysoev.ru> parents: 2441 diff changeset	4234 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	4235 && (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	4236 && (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	4237 \|\| 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	4238 {
3c6af1fb7586 proxy/fastcgi_store did not delete incomplete files Igor Sysoev <igor@sysoev.ru> parents: 2441 diff changeset	4239 ngx_http_upstream_store(r, u);
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	4240 }
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	4241 }
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	4242 }
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	4243
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4244 #if (NGX_HTTP_CACHE)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4245
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4246 if (u->cacheable) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4247
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4248 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	4249 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	4250
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4251 } else if (p->upstream_eof) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4252
5298 a7b2db9119e0 Upstream: replaced u->pipe->temp_file with p->temp_file. Maxim Dounin <mdounin@mdounin.ru> parents: 5297 diff changeset	4253 tf = p->temp_file;
4298 186f02886bed Upstream: don't cache unfinished responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4197 diff changeset	4254
5299 b779728b180c Upstream: fixed store/cache of unfinished responses. Maxim Dounin <mdounin@mdounin.ru> parents: 5298 diff changeset	4255 if (p->length == -1
b779728b180c Upstream: fixed store/cache of unfinished responses. Maxim Dounin <mdounin@mdounin.ru> parents: 5298 diff changeset	4256 && (u->headers_in.content_length_n == -1
b779728b180c Upstream: fixed store/cache of unfinished responses. Maxim Dounin <mdounin@mdounin.ru> parents: 5298 diff changeset	4257 \|\| u->headers_in.content_length_n
b779728b180c Upstream: fixed store/cache of unfinished responses. Maxim Dounin <mdounin@mdounin.ru> parents: 5298 diff changeset	4258 == 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	4259 {
186f02886bed Upstream: don't cache unfinished responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4197 diff changeset	4260 ngx_http_file_cache_update(r, tf);
186f02886bed Upstream: don't cache unfinished responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4197 diff changeset	4261
186f02886bed Upstream: don't cache unfinished responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4197 diff changeset	4262 } else {
186f02886bed Upstream: don't cache unfinished responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4197 diff changeset	4263 ngx_http_file_cache_free(r->cache, tf);
186f02886bed Upstream: don't cache unfinished responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4197 diff changeset	4264 }
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4265
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4266 } 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	4267 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	4268 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4269 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4270
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4271 #endif
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4272
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4273 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	4274 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	4275 "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	4276
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	4277 if (p->upstream_done
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	4278 \|\| (p->upstream_eof && p->length == -1))
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	4279 {
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	4280 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	4281 return;
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	4282 }
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	4283
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	4284 if (p->upstream_eof) {
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	4285 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	4286 "upstream prematurely closed connection");
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	4287 }
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	4288
a50e26148d21 Upstream: added check if a response is complete. Maxim Dounin <mdounin@mdounin.ru> parents: 5300 diff changeset	4289 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	4290 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4291 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4292 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4293
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4294 if (p->downstream_error) {
2381 3d7a70173d77 fix r2378, run posted requests after upstream event handling Igor Sysoev <igor@sysoev.ru> parents: 2377 diff changeset	4295 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	4296 "http upstream downstream error");
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4297
2757 9cc973b46af1 get a full response if the response is cacheable or storable even Igor Sysoev <igor@sysoev.ru> parents: 2708 diff changeset	4298 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	4299 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	4300 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4301 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4302 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4303
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4304
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	4305 static void
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	4306 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	4307 {
1947 94b03bbd328e use ngx_ext_rename_file() in proxy/fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1916 diff changeset	4308 size_t root;
94b03bbd328e use ngx_ext_rename_file() in proxy/fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1916 diff changeset	4309 time_t lm;
94b03bbd328e use ngx_ext_rename_file() in proxy/fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1916 diff changeset	4310 ngx_str_t path;
94b03bbd328e use ngx_ext_rename_file() in proxy/fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1916 diff changeset	4311 ngx_temp_file_t *tf;
94b03bbd328e use ngx_ext_rename_file() in proxy/fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1916 diff changeset	4312 ngx_ext_rename_file_t ext;
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	4313
1777 edaea30d83be optimization Igor Sysoev <igor@sysoev.ru> parents: 1707 diff changeset	4314 tf = u->pipe->temp_file;
edaea30d83be optimization Igor Sysoev <igor@sysoev.ru> parents: 1707 diff changeset	4315
edaea30d83be optimization Igor Sysoev <igor@sysoev.ru> parents: 1707 diff changeset	4316 if (tf->file.fd == NGX_INVALID_FILE) {
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	4317
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	4318 /* create file for empty 200 response */
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	4319
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	4320 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	4321 if (tf == NULL) {
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	4322 return;
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	4323 }
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	4324
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	4325 tf->file.fd = NGX_INVALID_FILE;
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	4326 tf->file.log = r->connection->log;
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	4327 tf->path = u->conf->temp_path;
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	4328 tf->pool = r->pool;
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	4329 tf->persistent = 1;
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	4330
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	4331 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	4332 tf->persistent, tf->clean, tf->access)
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	4333 != NGX_OK)
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	4334 {
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	4335 return;
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	4336 }
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	4337
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	4338 u->pipe->temp_file = tf;
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	4339 }
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	4340
1947 94b03bbd328e use ngx_ext_rename_file() in proxy/fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1916 diff changeset	4341 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	4342 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	4343 ext.time = -1;
94b03bbd328e use ngx_ext_rename_file() in proxy/fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1916 diff changeset	4344 ext.create_path = 1;
94b03bbd328e use ngx_ext_rename_file() in proxy/fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1916 diff changeset	4345 ext.delete_file = 1;
94b03bbd328e use ngx_ext_rename_file() in proxy/fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1916 diff changeset	4346 ext.log = r->connection->log;
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	4347
1705 d22095839d86 optimize r->upstream usage Igor Sysoev <igor@sysoev.ru> parents: 1701 diff changeset	4348 if (u->headers_in.last_modified) {
d22095839d86 optimize r->upstream usage Igor Sysoev <igor@sysoev.ru> parents: 1701 diff changeset	4349
6180 8b6fa4842133 Moved ngx_http_parse_time() to core, renamed accordingly. Maxim Dounin <mdounin@mdounin.ru> parents: 6147 diff changeset	4350 lm = ngx_parse_http_time(u->headers_in.last_modified->value.data,
1947 94b03bbd328e use ngx_ext_rename_file() in proxy/fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1916 diff changeset	4351 u->headers_in.last_modified->value.len);
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	4352
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	4353 if (lm != NGX_ERROR) {
1947 94b03bbd328e use ngx_ext_rename_file() in proxy/fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1916 diff changeset	4354 ext.time = lm;
94b03bbd328e use ngx_ext_rename_file() in proxy/fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1916 diff changeset	4355 ext.fd = tf->file.fd;
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	4356 }
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	4357 }
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	4358
1295 5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4359 if (u->conf->store_lengths == NULL) {
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4360
5770 9de5820bb3e0 Upstream: ngx_http_upstream_store() error handling fixes. Maxim Dounin <mdounin@mdounin.ru> parents: 5757 diff changeset	4361 if (ngx_http_map_uri_to_path(r, &path, &root, 0) == NULL) {
9de5820bb3e0 Upstream: ngx_http_upstream_store() error handling fixes. Maxim Dounin <mdounin@mdounin.ru> parents: 5757 diff changeset	4362 return;
9de5820bb3e0 Upstream: ngx_http_upstream_store() error handling fixes. Maxim Dounin <mdounin@mdounin.ru> parents: 5757 diff changeset	4363 }
1295 5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4364
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4365 } else {
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4366 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	4367 u->conf->store_values->elts)
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4368 == NULL)
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4369 {
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4370 return;
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4371 }
5383f5232364 proxy_store and fastcgi_store were changed, Igor Sysoev <igor@sysoev.ru> parents: 1291 diff changeset	4372 }
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	4373
3032 524ba56ba9f7 fix copy destination name length, introduced in r3025 Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	4374 path.len--;
524ba56ba9f7 fix copy destination name length, introduced in r3025 Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	4375
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	4376 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	4377 "upstream stores \"%s\" to \"%s\"",
94b03bbd328e use ngx_ext_rename_file() in proxy/fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1916 diff changeset	4378 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	4379
94b03bbd328e use ngx_ext_rename_file() in proxy/fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1916 diff changeset	4380 (void) ngx_ext_rename_file(&tf->file.name, &path, &ext);
5770 9de5820bb3e0 Upstream: ngx_http_upstream_store() error handling fixes. Maxim Dounin <mdounin@mdounin.ru> parents: 5757 diff changeset	4381
9de5820bb3e0 Upstream: ngx_http_upstream_store() error handling fixes. Maxim Dounin <mdounin@mdounin.ru> parents: 5757 diff changeset	4382 u->store = 0;
1291 13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	4383 }
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	4384
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	4385
13a4ce6e7f1e proxy_store and fastcgi_store Igor Sysoev <igor@sysoev.ru> parents: 1284 diff changeset	4386 static void
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	4387 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	4388 {
2386 4ccaa42de633 use already available r and u instead of ev Igor Sysoev <igor@sysoev.ru> parents: 2381 diff changeset	4389 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	4390 "http upstream dummy handler");
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4391 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4392
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4393
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	4394 static void
31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	4395 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	4396 ngx_uint_t ft_type)
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4397 {
5832 d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5827 diff changeset	4398 ngx_msec_t timeout;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4399 ngx_uint_t status, state;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4400
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4401 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	4402 "http next upstream, %xi", ft_type);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4403
5132 9bcf89ca78d2 Upstream: only call peer.free() if peer.get() selected a peer. Ruslan Ermilov <ru@nginx.com> parents: 5121 diff changeset	4404 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	4405
7429 e573d74299a0 Upstream: implemented $upstream_bytes_sent. Ruslan Ermilov <ru@nginx.com> parents: 7397 diff changeset	4406 if (u->peer.connection) {
e573d74299a0 Upstream: implemented $upstream_bytes_sent. Ruslan Ermilov <ru@nginx.com> parents: 7397 diff changeset	4407 u->state->bytes_sent = u->peer.connection->sent;
e573d74299a0 Upstream: implemented $upstream_bytes_sent. Ruslan Ermilov <ru@nginx.com> parents: 7397 diff changeset	4408 }
e573d74299a0 Upstream: implemented $upstream_bytes_sent. Ruslan Ermilov <ru@nginx.com> parents: 7397 diff changeset	4409
5231 05c53652e7b4 Upstream: http_403 support in proxy_next_upstream (and friends). Maxim Dounin <mdounin@mdounin.ru> parents: 5217 diff changeset	4410 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	4411 \|\| 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	4412 {
5132 9bcf89ca78d2 Upstream: only call peer.free() if peer.get() selected a peer. Ruslan Ermilov <ru@nginx.com> parents: 5121 diff changeset	4413 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	4414
5132 9bcf89ca78d2 Upstream: only call peer.free() if peer.get() selected a peer. Ruslan Ermilov <ru@nginx.com> parents: 5121 diff changeset	4415 } else {
9bcf89ca78d2 Upstream: only call peer.free() if peer.get() selected a peer. Ruslan Ermilov <ru@nginx.com> parents: 5121 diff changeset	4416 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	4417 }
9bcf89ca78d2 Upstream: only call peer.free() if peer.get() selected a peer. Ruslan Ermilov <ru@nginx.com> parents: 5121 diff changeset	4418
1378 0be898896d1a backup upstream servers Igor Sysoev <igor@sysoev.ru> parents: 1340 diff changeset	4419 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	4420 u->peer.sockaddr = NULL;
1378 0be898896d1a backup upstream servers Igor Sysoev <igor@sysoev.ru> parents: 1340 diff changeset	4421 }
525 09b42134ac0c nginx-0.1.37-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 515 diff changeset	4422
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4423 if (ft_type == NGX_HTTP_UPSTREAM_FT_TIMEOUT) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4424 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	4425 "upstream timed out");
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4426 }
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	4427
6466 984687f25998 Upstream: cached connections now tested against next_upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 6443 diff changeset	4428 if (u->peer.cached && ft_type == NGX_HTTP_UPSTREAM_FT_ERROR) {
4115 70a45a504905 Workaround for cpu hog on errors with cached connections. Maxim Dounin <mdounin@mdounin.ru> parents: 4114 diff changeset	4429 /* TODO: inform balancer instead */
70a45a504905 Workaround for cpu hog on errors with cached connections. Maxim Dounin <mdounin@mdounin.ru> parents: 4114 diff changeset	4430 u->peer.tries++;
6466 984687f25998 Upstream: cached connections now tested against next_upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 6443 diff changeset	4431 }
984687f25998 Upstream: cached connections now tested against next_upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 6443 diff changeset	4432
984687f25998 Upstream: cached connections now tested against next_upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 6443 diff changeset	4433 switch (ft_type) {
984687f25998 Upstream: cached connections now tested against next_upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 6443 diff changeset	4434
984687f25998 Upstream: cached connections now tested against next_upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 6443 diff changeset	4435 case NGX_HTTP_UPSTREAM_FT_TIMEOUT:
7130 882ad033d43c Upstream: fixed $upstream_status when upstream returns 503/504. Ruslan Ermilov <ru@nginx.com> parents: 7126 diff changeset	4436 case NGX_HTTP_UPSTREAM_FT_HTTP_504:
6466 984687f25998 Upstream: cached connections now tested against next_upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 6443 diff changeset	4437 status = NGX_HTTP_GATEWAY_TIME_OUT;
984687f25998 Upstream: cached connections now tested against next_upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 6443 diff changeset	4438 break;
984687f25998 Upstream: cached connections now tested against next_upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 6443 diff changeset	4439
984687f25998 Upstream: cached connections now tested against next_upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 6443 diff changeset	4440 case NGX_HTTP_UPSTREAM_FT_HTTP_500:
984687f25998 Upstream: cached connections now tested against next_upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 6443 diff changeset	4441 status = NGX_HTTP_INTERNAL_SERVER_ERROR;
984687f25998 Upstream: cached connections now tested against next_upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 6443 diff changeset	4442 break;
984687f25998 Upstream: cached connections now tested against next_upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 6443 diff changeset	4443
7130 882ad033d43c Upstream: fixed $upstream_status when upstream returns 503/504. Ruslan Ermilov <ru@nginx.com> parents: 7126 diff changeset	4444 case NGX_HTTP_UPSTREAM_FT_HTTP_503:
882ad033d43c Upstream: fixed $upstream_status when upstream returns 503/504. Ruslan Ermilov <ru@nginx.com> parents: 7126 diff changeset	4445 status = NGX_HTTP_SERVICE_UNAVAILABLE;
882ad033d43c Upstream: fixed $upstream_status when upstream returns 503/504. Ruslan Ermilov <ru@nginx.com> parents: 7126 diff changeset	4446 break;
882ad033d43c Upstream: fixed $upstream_status when upstream returns 503/504. Ruslan Ermilov <ru@nginx.com> parents: 7126 diff changeset	4447
6466 984687f25998 Upstream: cached connections now tested against next_upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 6443 diff changeset	4448 case NGX_HTTP_UPSTREAM_FT_HTTP_403:
984687f25998 Upstream: cached connections now tested against next_upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 6443 diff changeset	4449 status = NGX_HTTP_FORBIDDEN;
984687f25998 Upstream: cached connections now tested against next_upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 6443 diff changeset	4450 break;
984687f25998 Upstream: cached connections now tested against next_upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 6443 diff changeset	4451
984687f25998 Upstream: cached connections now tested against next_upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 6443 diff changeset	4452 case NGX_HTTP_UPSTREAM_FT_HTTP_404:
984687f25998 Upstream: cached connections now tested against next_upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 6443 diff changeset	4453 status = NGX_HTTP_NOT_FOUND;
984687f25998 Upstream: cached connections now tested against next_upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 6443 diff changeset	4454 break;
984687f25998 Upstream: cached connections now tested against next_upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 6443 diff changeset	4455
6966 fa56ab75cffc Upstream: allow recovery from "429 Too Many Requests" response. Piotr Sikora <piotrsikora@google.com> parents: 6961 diff changeset	4456 case NGX_HTTP_UPSTREAM_FT_HTTP_429:
fa56ab75cffc Upstream: allow recovery from "429 Too Many Requests" response. Piotr Sikora <piotrsikora@google.com> parents: 6961 diff changeset	4457 status = NGX_HTTP_TOO_MANY_REQUESTS;
fa56ab75cffc Upstream: allow recovery from "429 Too Many Requests" response. Piotr Sikora <piotrsikora@google.com> parents: 6961 diff changeset	4458 break;
fa56ab75cffc Upstream: allow recovery from "429 Too Many Requests" response. Piotr Sikora <piotrsikora@google.com> parents: 6961 diff changeset	4459
6466 984687f25998 Upstream: cached connections now tested against next_upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 6443 diff changeset	4460 /*
984687f25998 Upstream: cached connections now tested against next_upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 6443 diff changeset	4461 * NGX_HTTP_UPSTREAM_FT_BUSY_LOCK and NGX_HTTP_UPSTREAM_FT_MAX_WAITING
984687f25998 Upstream: cached connections now tested against next_upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 6443 diff changeset	4462 * never reach here
984687f25998 Upstream: cached connections now tested against next_upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 6443 diff changeset	4463 */
984687f25998 Upstream: cached connections now tested against next_upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 6443 diff changeset	4464
984687f25998 Upstream: cached connections now tested against next_upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 6443 diff changeset	4465 default:
984687f25998 Upstream: cached connections now tested against next_upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 6443 diff changeset	4466 status = NGX_HTTP_BAD_GATEWAY;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4467 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4468
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 581 diff changeset	4469 if (r->connection->error) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4470 ngx_http_upstream_finalize_request(r, u,
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4471 NGX_HTTP_CLIENT_CLOSED_REQUEST);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4472 return;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4473 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4474
6466 984687f25998 Upstream: cached connections now tested against next_upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 6443 diff changeset	4475 u->state->status = status;
984687f25998 Upstream: cached connections now tested against next_upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 6443 diff changeset	4476
984687f25998 Upstream: cached connections now tested against next_upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 6443 diff changeset	4477 timeout = u->conf->next_upstream_timeout;
984687f25998 Upstream: cached connections now tested against next_upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 6443 diff changeset	4478
6467 91c8d990fb45 Upstream: proxy_next_upstream non_idempotent. Maxim Dounin <mdounin@mdounin.ru> parents: 6466 diff changeset	4479 if (u->request_sent
91c8d990fb45 Upstream: proxy_next_upstream non_idempotent. Maxim Dounin <mdounin@mdounin.ru> parents: 6466 diff changeset	4480 && (r->method & (NGX_HTTP_POST\|NGX_HTTP_LOCK\|NGX_HTTP_PATCH)))
91c8d990fb45 Upstream: proxy_next_upstream non_idempotent. Maxim Dounin <mdounin@mdounin.ru> parents: 6466 diff changeset	4481 {
91c8d990fb45 Upstream: proxy_next_upstream non_idempotent. Maxim Dounin <mdounin@mdounin.ru> parents: 6466 diff changeset	4482 ft_type \|= NGX_HTTP_UPSTREAM_FT_NON_IDEMPOTENT;
91c8d990fb45 Upstream: proxy_next_upstream non_idempotent. Maxim Dounin <mdounin@mdounin.ru> parents: 6466 diff changeset	4483 }
91c8d990fb45 Upstream: proxy_next_upstream non_idempotent. Maxim Dounin <mdounin@mdounin.ru> parents: 6466 diff changeset	4484
6466 984687f25998 Upstream: cached connections now tested against next_upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 6443 diff changeset	4485 if (u->peer.tries == 0
6467 91c8d990fb45 Upstream: proxy_next_upstream non_idempotent. Maxim Dounin <mdounin@mdounin.ru> parents: 6466 diff changeset	4486 \|\| ((u->conf->next_upstream & ft_type) != ft_type)
6466 984687f25998 Upstream: cached connections now tested against next_upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 6443 diff changeset	4487 \|\| (u->request_sent && r->request_body_no_buffering)
984687f25998 Upstream: cached connections now tested against next_upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 6443 diff changeset	4488 \|\| (timeout && ngx_current_msec - u->peer.start_time >= timeout))
984687f25998 Upstream: cached connections now tested against next_upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 6443 diff changeset	4489 {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4490 #if (NGX_HTTP_CACHE)
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4491
6466 984687f25998 Upstream: cached connections now tested against next_upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 6443 diff changeset	4492 if (u->cache_status == NGX_HTTP_CACHE_EXPIRED
6905 9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	4493 && ((u->conf->cache_use_stale & ft_type) \|\| r->cache->stale_error))
6466 984687f25998 Upstream: cached connections now tested against next_upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 6443 diff changeset	4494 {
984687f25998 Upstream: cached connections now tested against next_upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 6443 diff changeset	4495 ngx_int_t rc;
984687f25998 Upstream: cached connections now tested against next_upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 6443 diff changeset	4496
984687f25998 Upstream: cached connections now tested against next_upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 6443 diff changeset	4497 rc = u->reinit_request(r);
984687f25998 Upstream: cached connections now tested against next_upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 6443 diff changeset	4498
7126 77fe752b4586 Upstream: fixed error handling of stale and revalidated cache send. Sergey Kandaurov <pluknet@nginx.com> parents: 7125 diff changeset	4499 if (rc != NGX_OK) {
77fe752b4586 Upstream: fixed error handling of stale and revalidated cache send. Sergey Kandaurov <pluknet@nginx.com> parents: 7125 diff changeset	4500 ngx_http_upstream_finalize_request(r, u, rc);
77fe752b4586 Upstream: fixed error handling of stale and revalidated cache send. Sergey Kandaurov <pluknet@nginx.com> parents: 7125 diff changeset	4501 return;
77fe752b4586 Upstream: fixed error handling of stale and revalidated cache send. Sergey Kandaurov <pluknet@nginx.com> parents: 7125 diff changeset	4502 }
77fe752b4586 Upstream: fixed error handling of stale and revalidated cache send. Sergey Kandaurov <pluknet@nginx.com> parents: 7125 diff changeset	4503
77fe752b4586 Upstream: fixed error handling of stale and revalidated cache send. Sergey Kandaurov <pluknet@nginx.com> parents: 7125 diff changeset	4504 u->cache_status = NGX_HTTP_CACHE_STALE;
77fe752b4586 Upstream: fixed error handling of stale and revalidated cache send. Sergey Kandaurov <pluknet@nginx.com> parents: 7125 diff changeset	4505 rc = ngx_http_upstream_cache_send(r, u);
77fe752b4586 Upstream: fixed error handling of stale and revalidated cache send. Sergey Kandaurov <pluknet@nginx.com> parents: 7125 diff changeset	4506
77fe752b4586 Upstream: fixed error handling of stale and revalidated cache send. Sergey Kandaurov <pluknet@nginx.com> parents: 7125 diff changeset	4507 if (rc == NGX_DONE) {
77fe752b4586 Upstream: fixed error handling of stale and revalidated cache send. Sergey Kandaurov <pluknet@nginx.com> parents: 7125 diff changeset	4508 return;
77fe752b4586 Upstream: fixed error handling of stale and revalidated cache send. Sergey Kandaurov <pluknet@nginx.com> parents: 7125 diff changeset	4509 }
77fe752b4586 Upstream: fixed error handling of stale and revalidated cache send. Sergey Kandaurov <pluknet@nginx.com> parents: 7125 diff changeset	4510
77fe752b4586 Upstream: fixed error handling of stale and revalidated cache send. Sergey Kandaurov <pluknet@nginx.com> parents: 7125 diff changeset	4511 if (rc == NGX_HTTP_UPSTREAM_INVALID_HEADER) {
77fe752b4586 Upstream: fixed error handling of stale and revalidated cache send. Sergey Kandaurov <pluknet@nginx.com> parents: 7125 diff changeset	4512 rc = NGX_HTTP_INTERNAL_SERVER_ERROR;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4513 }
6466 984687f25998 Upstream: cached connections now tested against next_upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 6443 diff changeset	4514
984687f25998 Upstream: cached connections now tested against next_upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 6443 diff changeset	4515 ngx_http_upstream_finalize_request(r, u, rc);
984687f25998 Upstream: cached connections now tested against next_upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 6443 diff changeset	4516 return;
984687f25998 Upstream: cached connections now tested against next_upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 6443 diff changeset	4517 }
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4518 #endif
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4519
6466 984687f25998 Upstream: cached connections now tested against next_upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 6443 diff changeset	4520 ngx_http_upstream_finalize_request(r, u, status);
984687f25998 Upstream: cached connections now tested against next_upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 6443 diff changeset	4521 return;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4522 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4523
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4524 if (u->peer.connection) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4525 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	4526 "close http upstream connection: %d",
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4527 u->peer.connection->fd);
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	4528 #if (NGX_HTTP_SSL)
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4529
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	4530 if (u->peer.connection->ssl) {
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4531 u->peer.connection->ssl->no_wait_shutdown = 1;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4532 u->peer.connection->ssl->no_send_shutdown = 1;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4533
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4534 (void) ngx_ssl_shutdown(u->peer.connection);
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	4535 }
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	4536 #endif
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4537
4138 70e1ee2307f9 Fix of separate pool for upstream connections (r4117). Maxim Dounin <mdounin@mdounin.ru> parents: 4124 diff changeset	4538 if (u->peer.connection->pool) {
70e1ee2307f9 Fix of separate pool for upstream connections (r4117). Maxim Dounin <mdounin@mdounin.ru> parents: 4124 diff changeset	4539 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	4540 }
70e1ee2307f9 Fix of separate pool for upstream connections (r4117). Maxim Dounin <mdounin@mdounin.ru> parents: 4124 diff changeset	4541
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4542 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	4543 u->peer.connection = NULL;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4544 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4545
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4546 ngx_http_upstream_connect(r, u);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4547 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4548
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4549
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	4550 static void
569 174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	4551 ngx_http_upstream_cleanup(void *data)
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	4552 {
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	4553 ngx_http_request_t *r = data;
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	4554
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	4555 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	4556 "cleanup http upstream request: \"%V\"", &r->uri);
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	4557
5167 85ee9d858dcb Upstream: removed surplus ngx_resolve_name_done() call. Valentin Bartenev <vbart@nginx.com> parents: 5142 diff changeset	4558 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	4559 }
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	4560
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	4561
174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	4562 static void
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	4563 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	4564 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	4565 {
6146 59fc60585f1e Upstream: times to obtain header/response are stored as ngx_msec_t. Ruslan Ermilov <ru@nginx.com> parents: 6125 diff changeset	4566 ngx_uint_t flush;
563 9c2f3ed7a247 nginx-0.3.3-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	4567
483 621229427cba nginx-0.1.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	4568 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	4569 "finalize http upstream request: %i", rc);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4570
5994 5abf5af257a7 Upstream: avoid duplicate finalization. Maxim Dounin <mdounin@mdounin.ru> parents: 5992 diff changeset	4571 if (u->cleanup == NULL) {
5abf5af257a7 Upstream: avoid duplicate finalization. Maxim Dounin <mdounin@mdounin.ru> parents: 5992 diff changeset	4572 /* the request was already finalized */
5abf5af257a7 Upstream: avoid duplicate finalization. Maxim Dounin <mdounin@mdounin.ru> parents: 5992 diff changeset	4573 ngx_http_finalize_request(r, NGX_DONE);
5abf5af257a7 Upstream: avoid duplicate finalization. Maxim Dounin <mdounin@mdounin.ru> parents: 5992 diff changeset	4574 return;
5abf5af257a7 Upstream: avoid duplicate finalization. Maxim Dounin <mdounin@mdounin.ru> parents: 5992 diff changeset	4575 }
5abf5af257a7 Upstream: avoid duplicate finalization. Maxim Dounin <mdounin@mdounin.ru> parents: 5992 diff changeset	4576
5abf5af257a7 Upstream: avoid duplicate finalization. Maxim Dounin <mdounin@mdounin.ru> parents: 5992 diff changeset	4577 *u->cleanup = NULL;
5abf5af257a7 Upstream: avoid duplicate finalization. Maxim Dounin <mdounin@mdounin.ru> parents: 5992 diff changeset	4578 u->cleanup = NULL;
569 174f1e853e1e nginx-0.3.6-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	4579
3169 b1013d768911 fix request counter in resolver handling, the bug was introduced in r3050 Igor Sysoev <igor@sysoev.ru> parents: 3161 diff changeset	4580 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	4581 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	4582 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	4583 }
b1013d768911 fix request counter in resolver handling, the bug was introduced in r3050 Igor Sysoev <igor@sysoev.ru> parents: 3161 diff changeset	4584
7397 860d3907da1c Upstream: revised upstream response time variables. Vladimir Homutov <vl@nginx.com> parents: 7371 diff changeset	4585 if (u->state && u->state->response_time == (ngx_msec_t) -1) {
860d3907da1c Upstream: revised upstream response time variables. Vladimir Homutov <vl@nginx.com> parents: 7371 diff changeset	4586 u->state->response_time = ngx_current_msec - u->start_time;
2402 cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4587
5169 f6bbe77794aa Upstream: fixed $upstream_response_length without buffering. Sergey Kandaurov <pluknet@nginx.com> parents: 5167 diff changeset	4588 if (u->pipe && u->pipe->read_length) {
6654 c131f20c9562 Upstream: the $upstream_bytes_received variable. Vladimir Homutov <vl@nginx.com> parents: 6594 diff changeset	4589 u->state->bytes_received += u->pipe->read_length
c131f20c9562 Upstream: the $upstream_bytes_received variable. Vladimir Homutov <vl@nginx.com> parents: 6594 diff changeset	4590 - u->pipe->preread_size;
2402 cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4591 u->state->response_length = u->pipe->read_length;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	4592 }
7429 e573d74299a0 Upstream: implemented $upstream_bytes_sent. Ruslan Ermilov <ru@nginx.com> parents: 7397 diff changeset	4593
e573d74299a0 Upstream: implemented $upstream_bytes_sent. Ruslan Ermilov <ru@nginx.com> parents: 7397 diff changeset	4594 if (u->peer.connection) {
e573d74299a0 Upstream: implemented $upstream_bytes_sent. Ruslan Ermilov <ru@nginx.com> parents: 7397 diff changeset	4595 u->state->bytes_sent = u->peer.connection->sent;
e573d74299a0 Upstream: implemented $upstream_bytes_sent. Ruslan Ermilov <ru@nginx.com> parents: 7397 diff changeset	4596 }
563 9c2f3ed7a247 nginx-0.3.3-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	4597 }
9c2f3ed7a247 nginx-0.3.3-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 561 diff changeset	4598
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4599 u->finalize_request(r, rc);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4600
5132 9bcf89ca78d2 Upstream: only call peer.free() if peer.get() selected a peer. Ruslan Ermilov <ru@nginx.com> parents: 5121 diff changeset	4601 if (u->peer.free && u->peer.sockaddr) {
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	4602 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	4603 u->peer.sockaddr = NULL;
1658 13f8dec720b5 proxy_pass variables support Igor Sysoev <igor@sysoev.ru> parents: 1654 diff changeset	4604 }
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4605
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4606 if (u->peer.connection) {
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4607
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	4608 #if (NGX_HTTP_SSL)
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	4609
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	4610 /* TODO: do not shutdown persistent connection */
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	4611
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	4612 if (u->peer.connection->ssl) {
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4613
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4614 /*
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4615 * We send the "close notify" shutdown alert to the upstream only
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4616 * and do not wait its "close notify" shutdown alert.
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4617 * It is acceptable according to the TLS standard.
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4618 */
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4619
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4620 u->peer.connection->ssl->no_wait_shutdown = 1;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4621
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4622 (void) ngx_ssl_shutdown(u->peer.connection);
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	4623 }
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	4624 #endif
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4625
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4626 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4627 "close http upstream connection: %d",
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4628 u->peer.connection->fd);
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	4629
4138 70e1ee2307f9 Fix of separate pool for upstream connections (r4117). Maxim Dounin <mdounin@mdounin.ru> parents: 4124 diff changeset	4630 if (u->peer.connection->pool) {
70e1ee2307f9 Fix of separate pool for upstream connections (r4117). Maxim Dounin <mdounin@mdounin.ru> parents: 4124 diff changeset	4631 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	4632 }
70e1ee2307f9 Fix of separate pool for upstream connections (r4117). Maxim Dounin <mdounin@mdounin.ru> parents: 4124 diff changeset	4633
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4634 ngx_close_connection(u->peer.connection);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4635 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4636
483 621229427cba nginx-0.1.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	4637 u->peer.connection = NULL;
621229427cba nginx-0.1.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	4638
9204 631ee3c6d38c Upstream: fixed usage of closed sockets with filter finalization. Maxim Dounin <mdounin@mdounin.ru> parents: 9203 diff changeset	4639 if (u->pipe) {
631ee3c6d38c Upstream: fixed usage of closed sockets with filter finalization. Maxim Dounin <mdounin@mdounin.ru> parents: 9203 diff changeset	4640 u->pipe->upstream = NULL;
631ee3c6d38c Upstream: fixed usage of closed sockets with filter finalization. Maxim Dounin <mdounin@mdounin.ru> parents: 9203 diff changeset	4641 }
631ee3c6d38c Upstream: fixed usage of closed sockets with filter finalization. Maxim Dounin <mdounin@mdounin.ru> parents: 9203 diff changeset	4642
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	4643 if (u->pipe && u->pipe->temp_file) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4644 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	4645 "http upstream temp fd: %d",
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	4646 u->pipe->temp_file->file.fd);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4647 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4648
4469 24c0dca04eb9 Fix for proxy_store leaving temporary files for subrequests. Maxim Dounin <mdounin@mdounin.ru> parents: 4464 diff changeset	4649 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	4650 && 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	4651 {
24c0dca04eb9 Fix for proxy_store leaving temporary files for subrequests. Maxim Dounin <mdounin@mdounin.ru> parents: 4464 diff changeset	4652 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	4653 == NGX_FILE_ERROR)
24c0dca04eb9 Fix for proxy_store leaving temporary files for subrequests. Maxim Dounin <mdounin@mdounin.ru> parents: 4464 diff changeset	4654 {
24c0dca04eb9 Fix for proxy_store leaving temporary files for subrequests. Maxim Dounin <mdounin@mdounin.ru> parents: 4464 diff changeset	4655 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	4656 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	4657 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	4658 }
24c0dca04eb9 Fix for proxy_store leaving temporary files for subrequests. Maxim Dounin <mdounin@mdounin.ru> parents: 4464 diff changeset	4659 }
24c0dca04eb9 Fix for proxy_store leaving temporary files for subrequests. Maxim Dounin <mdounin@mdounin.ru> parents: 4464 diff changeset	4660
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4661 #if (NGX_HTTP_CACHE)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4662
3940 22f3e9197096 revert r3935 and fix "stalled cache updating" alert Igor Sysoev <igor@sysoev.ru> parents: 3934 diff changeset	4663 if (r->cache) {
22f3e9197096 revert r3935 and fix "stalled cache updating" alert Igor Sysoev <igor@sysoev.ru> parents: 3934 diff changeset	4664
9295 c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	4665 if (rc == NGX_HTTP_BAD_GATEWAY \|\| rc == NGX_HTTP_GATEWAY_TIME_OUT) {
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	4666
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	4667 if (!u->header_sent) {
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	4668 if (ngx_http_upstream_no_cache(r, u) != NGX_OK) {
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	4669 u->cacheable = 0;
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	4670 }
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	4671 }
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	4672
c5623963c29e Upstream: fixed proxy_no_cache when caching errors. Maxim Dounin <mdounin@mdounin.ru> parents: 9276 diff changeset	4673 if (u->cacheable) {
3940 22f3e9197096 revert r3935 and fix "stalled cache updating" alert Igor Sysoev <igor@sysoev.ru> parents: 3934 diff changeset	4674 time_t valid;
22f3e9197096 revert r3935 and fix "stalled cache updating" alert Igor Sysoev <igor@sysoev.ru> parents: 3934 diff changeset	4675
22f3e9197096 revert r3935 and fix "stalled cache updating" alert Igor Sysoev <igor@sysoev.ru> parents: 3934 diff changeset	4676 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	4677
22f3e9197096 revert r3935 and fix "stalled cache updating" alert Igor Sysoev <igor@sysoev.ru> parents: 3934 diff changeset	4678 if (valid) {
22f3e9197096 revert r3935 and fix "stalled cache updating" alert Igor Sysoev <igor@sysoev.ru> parents: 3934 diff changeset	4679 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	4680 r->cache->error = rc;
22f3e9197096 revert r3935 and fix "stalled cache updating" alert Igor Sysoev <igor@sysoev.ru> parents: 3934 diff changeset	4681 }
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4682 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4683 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4684
3711 ce6ba077c270 several changes in cache cleanup handling: Igor Sysoev <igor@sysoev.ru> parents: 3709 diff changeset	4685 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	4686 }
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	4687
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4688 #endif
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4689
6909 5850fed24639 Upstream: read handler cleared on upstream finalization. Maxim Dounin <mdounin@mdounin.ru> parents: 6906 diff changeset	4690 r->read_event_handler = ngx_http_block_reading;
5850fed24639 Upstream: read handler cleared on upstream finalization. Maxim Dounin <mdounin@mdounin.ru> parents: 6906 diff changeset	4691
515 417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	4692 if (rc == NGX_DECLINED) {
417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	4693 return;
417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	4694 }
417a087c9c4d nginx-0.1.32-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 511 diff changeset	4695
483 621229427cba nginx-0.1.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	4696 r->connection->log->action = "sending to client";
621229427cba nginx-0.1.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 481 diff changeset	4697
5303 0fb714d80909 Upstream: request finalization rework. Maxim Dounin <mdounin@mdounin.ru> parents: 5302 diff changeset	4698 if (!u->header_sent
0fb714d80909 Upstream: request finalization rework. Maxim Dounin <mdounin@mdounin.ru> parents: 5302 diff changeset	4699 \|\| rc == NGX_HTTP_REQUEST_TIME_OUT
7188 93abb5a855d6 Upstream: fixed "header already sent" alerts on backend errors. Maxim Dounin <mdounin@mdounin.ru> parents: 7174 diff changeset	4700 \|\| rc == NGX_HTTP_CLIENT_CLOSED_REQUEST)
4151 3549db8ceaf2 Cache: fix for sending of stale responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4143 diff changeset	4701 {
5303 0fb714d80909 Upstream: request finalization rework. Maxim Dounin <mdounin@mdounin.ru> parents: 5302 diff changeset	4702 ngx_http_finalize_request(r, rc);
0fb714d80909 Upstream: request finalization rework. Maxim Dounin <mdounin@mdounin.ru> parents: 5302 diff changeset	4703 return;
0fb714d80909 Upstream: request finalization rework. Maxim Dounin <mdounin@mdounin.ru> parents: 5302 diff changeset	4704 }
0fb714d80909 Upstream: request finalization rework. Maxim Dounin <mdounin@mdounin.ru> parents: 5302 diff changeset	4705
5304 d3eab5e2df5f Upstream: no last buffer on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5303 diff changeset	4706 flush = 0;
d3eab5e2df5f Upstream: no last buffer on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5303 diff changeset	4707
d3eab5e2df5f Upstream: no last buffer on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5303 diff changeset	4708 if (rc >= NGX_HTTP_SPECIAL_RESPONSE) {
d3eab5e2df5f Upstream: no last buffer on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5303 diff changeset	4709 rc = NGX_ERROR;
d3eab5e2df5f Upstream: no last buffer on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5303 diff changeset	4710 flush = 1;
5303 0fb714d80909 Upstream: request finalization rework. Maxim Dounin <mdounin@mdounin.ru> parents: 5302 diff changeset	4711 }
0fb714d80909 Upstream: request finalization rework. Maxim Dounin <mdounin@mdounin.ru> parents: 5302 diff changeset	4712
7188 93abb5a855d6 Upstream: fixed "header already sent" alerts on backend errors. Maxim Dounin <mdounin@mdounin.ru> parents: 7174 diff changeset	4713 if (r->header_only
93abb5a855d6 Upstream: fixed "header already sent" alerts on backend errors. Maxim Dounin <mdounin@mdounin.ru> parents: 7174 diff changeset	4714 \|\| (u->pipe && u->pipe->downstream_error))
93abb5a855d6 Upstream: fixed "header already sent" alerts on backend errors. Maxim Dounin <mdounin@mdounin.ru> parents: 7174 diff changeset	4715 {
5303 0fb714d80909 Upstream: request finalization rework. Maxim Dounin <mdounin@mdounin.ru> parents: 5302 diff changeset	4716 ngx_http_finalize_request(r, rc);
0fb714d80909 Upstream: request finalization rework. Maxim Dounin <mdounin@mdounin.ru> parents: 5302 diff changeset	4717 return;
0fb714d80909 Upstream: request finalization rework. Maxim Dounin <mdounin@mdounin.ru> parents: 5302 diff changeset	4718 }
0fb714d80909 Upstream: request finalization rework. Maxim Dounin <mdounin@mdounin.ru> parents: 5302 diff changeset	4719
0fb714d80909 Upstream: request finalization rework. Maxim Dounin <mdounin@mdounin.ru> parents: 5302 diff changeset	4720 if (rc == 0) {
7230 098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	4721
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	4722 if (ngx_http_upstream_process_trailers(r, u) != NGX_OK) {
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	4723 ngx_http_finalize_request(r, NGX_ERROR);
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	4724 return;
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	4725 }
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	4726
2377 87b8c44906b5 ) refactor subrequest handling, now they run as separate posted requests Igor Sysoev <igor@sysoev.ru>* parents: 2360 diff changeset	4727 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	4728
d3eab5e2df5f Upstream: no last buffer on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5303 diff changeset	4729 } else if (flush) {
d3eab5e2df5f Upstream: no last buffer on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5303 diff changeset	4730 r->keepalive = 0;
d3eab5e2df5f Upstream: no last buffer on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 5303 diff changeset	4731 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	4732 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4733
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4734 ngx_http_finalize_request(r, rc);
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4735 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4736
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4737
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4738 static ngx_int_t
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4739 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	4740 ngx_uint_t offset)
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	4741 {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4742 ngx_table_elt_t **ph;
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	4743
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4744 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	4745
8034 413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	4746 if (*ph) {
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	4747 ngx_log_error(NGX_LOG_WARN, r->connection->log, 0,
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	4748 "upstream sent duplicate header line: \"%V: %V\", "
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	4749 "previous value: \"%V: %V\", ignored",
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	4750 &h->key, &h->value,
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	4751 &(ph)->key, &(ph)->value);
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	4752 h->hash = 0;
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	4753 return NGX_OK;
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	4754 }
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	4755
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	4756 *ph = h;
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	4757 h->next = NULL;
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	4758
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	4759 return NGX_OK;
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	4760 }
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	4761
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	4762
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	4763 static ngx_int_t
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	4764 ngx_http_upstream_process_multi_header_lines(ngx_http_request_t *r,
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	4765 ngx_table_elt_t *h, ngx_uint_t offset)
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	4766 {
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	4767 ngx_table_elt_t **ph;
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	4768
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	4769 ph = (ngx_table_elt_t *) ((char ) &r->upstream->headers_in + offset);
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	4770
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	4771 while (ph) { ph = &(ph)->next; }
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	4772
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	4773 *ph = h;
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	4774 h->next = NULL;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4775
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4776 return NGX_OK;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4777 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4778
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4779
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4780 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	4781 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	4782 ngx_uint_t offset)
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	4783 {
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	4784 return NGX_OK;
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	4785 }
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	4786
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	4787
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	4788 static ngx_int_t
4117 103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	4789 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	4790 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	4791 {
103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	4792 ngx_http_upstream_t *u;
103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	4793
103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	4794 u = r->upstream;
103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	4795
8033 2bf7792c262e Upstream: header handlers can now return parsing errors. Maxim Dounin <mdounin@mdounin.ru> parents: 8032 diff changeset	4796 if (u->headers_in.content_length) {
2bf7792c262e Upstream: header handlers can now return parsing errors. Maxim Dounin <mdounin@mdounin.ru> parents: 8032 diff changeset	4797 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
2bf7792c262e Upstream: header handlers can now return parsing errors. Maxim Dounin <mdounin@mdounin.ru> parents: 8032 diff changeset	4798 "upstream sent duplicate header line: \"%V: %V\", "
2bf7792c262e Upstream: header handlers can now return parsing errors. Maxim Dounin <mdounin@mdounin.ru> parents: 8032 diff changeset	4799 "previous value: \"%V: %V\"",
2bf7792c262e Upstream: header handlers can now return parsing errors. Maxim Dounin <mdounin@mdounin.ru> parents: 8032 diff changeset	4800 &h->key, &h->value,
2bf7792c262e Upstream: header handlers can now return parsing errors. Maxim Dounin <mdounin@mdounin.ru> parents: 8032 diff changeset	4801 &u->headers_in.content_length->key,
2bf7792c262e Upstream: header handlers can now return parsing errors. Maxim Dounin <mdounin@mdounin.ru> parents: 8032 diff changeset	4802 &u->headers_in.content_length->value);
2bf7792c262e Upstream: header handlers can now return parsing errors. Maxim Dounin <mdounin@mdounin.ru> parents: 8032 diff changeset	4803 return NGX_HTTP_UPSTREAM_INVALID_HEADER;
2bf7792c262e Upstream: header handlers can now return parsing errors. Maxim Dounin <mdounin@mdounin.ru> parents: 8032 diff changeset	4804 }
2bf7792c262e Upstream: header handlers can now return parsing errors. Maxim Dounin <mdounin@mdounin.ru> parents: 8032 diff changeset	4805
2bf7792c262e Upstream: header handlers can now return parsing errors. Maxim Dounin <mdounin@mdounin.ru> parents: 8032 diff changeset	4806 if (u->headers_in.transfer_encoding) {
2bf7792c262e Upstream: header handlers can now return parsing errors. Maxim Dounin <mdounin@mdounin.ru> parents: 8032 diff changeset	4807 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
2bf7792c262e Upstream: header handlers can now return parsing errors. Maxim Dounin <mdounin@mdounin.ru> parents: 8032 diff changeset	4808 "upstream sent \"Content-Length\" and "
2bf7792c262e Upstream: header handlers can now return parsing errors. Maxim Dounin <mdounin@mdounin.ru> parents: 8032 diff changeset	4809 "\"Transfer-Encoding\" headers at the same time");
2bf7792c262e Upstream: header handlers can now return parsing errors. Maxim Dounin <mdounin@mdounin.ru> parents: 8032 diff changeset	4810 return NGX_HTTP_UPSTREAM_INVALID_HEADER;
2bf7792c262e Upstream: header handlers can now return parsing errors. Maxim Dounin <mdounin@mdounin.ru> parents: 8032 diff changeset	4811 }
2bf7792c262e Upstream: header handlers can now return parsing errors. Maxim Dounin <mdounin@mdounin.ru> parents: 8032 diff changeset	4812
8032 2025aae94739 Upstream: all known headers in u->headers_in are linked lists now. Maxim Dounin <mdounin@mdounin.ru> parents: 8031 diff changeset	4813 h->next = NULL;
4117 103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	4814 u->headers_in.content_length = h;
103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	4815 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	4816
8033 2bf7792c262e Upstream: header handlers can now return parsing errors. Maxim Dounin <mdounin@mdounin.ru> parents: 8032 diff changeset	4817 if (u->headers_in.content_length_n == NGX_ERROR) {
2bf7792c262e Upstream: header handlers can now return parsing errors. Maxim Dounin <mdounin@mdounin.ru> parents: 8032 diff changeset	4818 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
2bf7792c262e Upstream: header handlers can now return parsing errors. Maxim Dounin <mdounin@mdounin.ru> parents: 8032 diff changeset	4819 "upstream sent invalid \"Content-Length\" header: "
2bf7792c262e Upstream: header handlers can now return parsing errors. Maxim Dounin <mdounin@mdounin.ru> parents: 8032 diff changeset	4820 "\"%V: %V\"", &h->key, &h->value);
2bf7792c262e Upstream: header handlers can now return parsing errors. Maxim Dounin <mdounin@mdounin.ru> parents: 8032 diff changeset	4821 return NGX_HTTP_UPSTREAM_INVALID_HEADER;
2bf7792c262e Upstream: header handlers can now return parsing errors. Maxim Dounin <mdounin@mdounin.ru> parents: 8032 diff changeset	4822 }
2bf7792c262e Upstream: header handlers can now return parsing errors. Maxim Dounin <mdounin@mdounin.ru> parents: 8032 diff changeset	4823
4117 103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	4824 return NGX_OK;
103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	4825 }
103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	4826
103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	4827
103b0d9afe07 Upstream: content_length_n API change. Maxim Dounin <mdounin@mdounin.ru> parents: 4116 diff changeset	4828 static ngx_int_t
5732 d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	4829 ngx_http_upstream_process_last_modified(ngx_http_request_t *r,
d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	4830 ngx_table_elt_t *h, ngx_uint_t offset)
d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	4831 {
d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	4832 ngx_http_upstream_t *u;
d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	4833
d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	4834 u = r->upstream;
d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	4835
8034 413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	4836 if (u->headers_in.last_modified) {
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	4837 ngx_log_error(NGX_LOG_WARN, r->connection->log, 0,
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	4838 "upstream sent duplicate header line: \"%V: %V\", "
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	4839 "previous value: \"%V: %V\", ignored",
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	4840 &h->key, &h->value,
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	4841 &u->headers_in.last_modified->key,
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	4842 &u->headers_in.last_modified->value);
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	4843 h->hash = 0;
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	4844 return NGX_OK;
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	4845 }
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	4846
8032 2025aae94739 Upstream: all known headers in u->headers_in are linked lists now. Maxim Dounin <mdounin@mdounin.ru> parents: 8031 diff changeset	4847 h->next = NULL;
5732 d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	4848 u->headers_in.last_modified = h;
7093 acc2cddc7b45 Upstream: unconditional parsing of last_modified_time. Maxim Dounin <mdounin@mdounin.ru> parents: 7077 diff changeset	4849 u->headers_in.last_modified_time = ngx_parse_http_time(h->value.data,
acc2cddc7b45 Upstream: unconditional parsing of last_modified_time. Maxim Dounin <mdounin@mdounin.ru> parents: 7077 diff changeset	4850 h->value.len);
5732 d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	4851
d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	4852 return NGX_OK;
d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	4853 }
d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	4854
d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	4855
d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	4856 static ngx_int_t
3669 1f5841b1fcd7 treat Set-Cookie as a header that forbids caching Igor Sysoev <igor@sysoev.ru> parents: 3667 diff changeset	4857 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	4858 ngx_uint_t offset)
1f5841b1fcd7 treat Set-Cookie as a header that forbids caching Igor Sysoev <igor@sysoev.ru> parents: 3667 diff changeset	4859 {
5677 3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4860 ngx_table_elt_t **ph;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4861 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	4862
1f5841b1fcd7 treat Set-Cookie as a header that forbids caching Igor Sysoev <igor@sysoev.ru> parents: 3667 diff changeset	4863 u = r->upstream;
8024 ef6a3a99a81a Reworked multi headers to use linked lists. Maxim Dounin <mdounin@mdounin.ru> parents: 8023 diff changeset	4864 ph = &u->headers_in.set_cookie;
ef6a3a99a81a Reworked multi headers to use linked lists. Maxim Dounin <mdounin@mdounin.ru> parents: 8023 diff changeset	4865
ef6a3a99a81a Reworked multi headers to use linked lists. Maxim Dounin <mdounin@mdounin.ru> parents: 8023 diff changeset	4866 while (ph) { ph = &(ph)->next; }
5677 3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4867
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4868 *ph = h;
8024 ef6a3a99a81a Reworked multi headers to use linked lists. Maxim Dounin <mdounin@mdounin.ru> parents: 8023 diff changeset	4869 h->next = NULL;
5677 3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4870
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	4871 #if (NGX_HTTP_CACHE)
3669 1f5841b1fcd7 treat Set-Cookie as a header that forbids caching Igor Sysoev <igor@sysoev.ru> parents: 3667 diff changeset	4872 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	4873 u->cacheable = 0;
1f5841b1fcd7 treat Set-Cookie as a header that forbids caching Igor Sysoev <igor@sysoev.ru> parents: 3667 diff changeset	4874 }
1f5841b1fcd7 treat Set-Cookie as a header that forbids caching Igor Sysoev <igor@sysoev.ru> parents: 3667 diff changeset	4875 #endif
1f5841b1fcd7 treat Set-Cookie as a header that forbids caching Igor Sysoev <igor@sysoev.ru> parents: 3667 diff changeset	4876
1f5841b1fcd7 treat Set-Cookie as a header that forbids caching Igor Sysoev <igor@sysoev.ru> parents: 3667 diff changeset	4877 return NGX_OK;
1f5841b1fcd7 treat Set-Cookie as a header that forbids caching Igor Sysoev <igor@sysoev.ru> parents: 3667 diff changeset	4878 }
1f5841b1fcd7 treat Set-Cookie as a header that forbids caching Igor Sysoev <igor@sysoev.ru> parents: 3667 diff changeset	4879
1f5841b1fcd7 treat Set-Cookie as a header that forbids caching Igor Sysoev <igor@sysoev.ru> parents: 3667 diff changeset	4880
1f5841b1fcd7 treat Set-Cookie as a header that forbids caching Igor Sysoev <igor@sysoev.ru> parents: 3667 diff changeset	4881 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	4882 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	4883 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	4884 {
8028 27d12017f300 Upstream: style. Maxim Dounin <mdounin@mdounin.ru> parents: 8024 diff changeset	4885 ngx_table_elt_t **ph;
27d12017f300 Upstream: style. Maxim Dounin <mdounin@mdounin.ru> parents: 8024 diff changeset	4886 ngx_http_upstream_t *u;
2786 4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	4887
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	4888 u = r->upstream;
8024 ef6a3a99a81a Reworked multi headers to use linked lists. Maxim Dounin <mdounin@mdounin.ru> parents: 8023 diff changeset	4889 ph = &u->headers_in.cache_control;
ef6a3a99a81a Reworked multi headers to use linked lists. Maxim Dounin <mdounin@mdounin.ru> parents: 8023 diff changeset	4890
ef6a3a99a81a Reworked multi headers to use linked lists. Maxim Dounin <mdounin@mdounin.ru> parents: 8023 diff changeset	4891 while (ph) { ph = &(ph)->next; }
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4892
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4893 *ph = h;
8024 ef6a3a99a81a Reworked multi headers to use linked lists. Maxim Dounin <mdounin@mdounin.ru> parents: 8023 diff changeset	4894 h->next = NULL;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	4895
2708 4c658be4ab63 fix building --without-http-cache, introduced in r2664 and later Igor Sysoev <igor@sysoev.ru> parents: 2704 diff changeset	4896 #if (NGX_HTTP_CACHE)
4c658be4ab63 fix building --without-http-cache, introduced in r2664 and later Igor Sysoev <igor@sysoev.ru> parents: 2704 diff changeset	4897 {
5911 88d55e5934f7 Cache: add support for Cache-Control's s-maxage response directive. Piotr Sikora <piotr@cloudflare.com> parents: 5905 diff changeset	4898 u_char p, start, *last;
2708 4c658be4ab63 fix building --without-http-cache, introduced in r2664 and later Igor Sysoev <igor@sysoev.ru> parents: 2704 diff changeset	4899 ngx_int_t n;
4c658be4ab63 fix building --without-http-cache, introduced in r2664 and later Igor Sysoev <igor@sysoev.ru> parents: 2704 diff changeset	4900
2786 4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	4901 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	4902 return NGX_OK;
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	4903 }
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	4904
2669 5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	4905 if (r->cache == NULL) {
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	4906 return NGX_OK;
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	4907 }
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	4908
5911 88d55e5934f7 Cache: add support for Cache-Control's s-maxage response directive. Piotr Sikora <piotr@cloudflare.com> parents: 5905 diff changeset	4909 start = h->value.data;
88d55e5934f7 Cache: add support for Cache-Control's s-maxage response directive. Piotr Sikora <piotr@cloudflare.com> parents: 5905 diff changeset	4910 last = start + h->value.len;
88d55e5934f7 Cache: add support for Cache-Control's s-maxage response directive. Piotr Sikora <piotr@cloudflare.com> parents: 5905 diff changeset	4911
8041 0784ab86ad08 Upstream: fixed X-Accel-Expires/Cache-Control/Expires handling. Maxim Dounin <mdounin@mdounin.ru> parents: 8040 diff changeset	4912 if (r->cache->valid_sec != 0 && u->headers_in.x_accel_expires != NULL) {
0784ab86ad08 Upstream: fixed X-Accel-Expires/Cache-Control/Expires handling. Maxim Dounin <mdounin@mdounin.ru> parents: 8040 diff changeset	4913 goto extensions;
0784ab86ad08 Upstream: fixed X-Accel-Expires/Cache-Control/Expires handling. Maxim Dounin <mdounin@mdounin.ru> parents: 8040 diff changeset	4914 }
0784ab86ad08 Upstream: fixed X-Accel-Expires/Cache-Control/Expires handling. Maxim Dounin <mdounin@mdounin.ru> parents: 8040 diff changeset	4915
5911 88d55e5934f7 Cache: add support for Cache-Control's s-maxage response directive. Piotr Sikora <piotr@cloudflare.com> parents: 5905 diff changeset	4916 if (ngx_strlcasestrn(start, last, (u_char *) "no-cache", 8 - 1) != NULL
88d55e5934f7 Cache: add support for Cache-Control's s-maxage response directive. Piotr Sikora <piotr@cloudflare.com> parents: 5905 diff changeset	4917 \|\| ngx_strlcasestrn(start, last, (u_char *) "no-store", 8 - 1) != NULL
88d55e5934f7 Cache: add support for Cache-Control's s-maxage response directive. Piotr Sikora <piotr@cloudflare.com> parents: 5905 diff changeset	4918 \|\| ngx_strlcasestrn(start, last, (u_char *) "private", 7 - 1) != NULL)
2669 5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	4919 {
8041 0784ab86ad08 Upstream: fixed X-Accel-Expires/Cache-Control/Expires handling. Maxim Dounin <mdounin@mdounin.ru> parents: 8040 diff changeset	4920 u->headers_in.no_cache = 1;
2669 5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	4921 return NGX_OK;
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	4922 }
5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	4923
5911 88d55e5934f7 Cache: add support for Cache-Control's s-maxage response directive. Piotr Sikora <piotr@cloudflare.com> parents: 5905 diff changeset	4924 p = ngx_strlcasestrn(start, last, (u_char *) "s-maxage=", 9 - 1);
88d55e5934f7 Cache: add support for Cache-Control's s-maxage response directive. Piotr Sikora <piotr@cloudflare.com> parents: 5905 diff changeset	4925 offset = 9;
88d55e5934f7 Cache: add support for Cache-Control's s-maxage response directive. Piotr Sikora <piotr@cloudflare.com> parents: 5905 diff changeset	4926
88d55e5934f7 Cache: add support for Cache-Control's s-maxage response directive. Piotr Sikora <piotr@cloudflare.com> parents: 5905 diff changeset	4927 if (p == NULL) {
88d55e5934f7 Cache: add support for Cache-Control's s-maxage response directive. Piotr Sikora <piotr@cloudflare.com> parents: 5905 diff changeset	4928 p = ngx_strlcasestrn(start, last, (u_char *) "max-age=", 8 - 1);
88d55e5934f7 Cache: add support for Cache-Control's s-maxage response directive. Piotr Sikora <piotr@cloudflare.com> parents: 5905 diff changeset	4929 offset = 8;
88d55e5934f7 Cache: add support for Cache-Control's s-maxage response directive. Piotr Sikora <piotr@cloudflare.com> parents: 5905 diff changeset	4930 }
2669 5e4d8bd4486c support Cache-Control no-cache and max-age in cache Igor Sysoev <igor@sysoev.ru> parents: 2667 diff changeset	4931
6905 9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	4932 if (p) {
9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	4933 n = 0;
9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	4934
9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	4935 for (p += offset; p < last; p++) {
9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	4936 if (p == ',' \|\| p == ';' \|\| *p == ' ') {
9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	4937 break;
9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	4938 }
9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	4939
9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	4940 if (p >= '0' && p <= '9') {
7067 e3723f2a11b7 Parenthesized ASCII-related calculations. Valentin Bartenev <vbart@nginx.com> parents: 7042 diff changeset	4941 n = n * 10 + (*p - '0');
6905 9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	4942 continue;
9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	4943 }
9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	4944
9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	4945 u->cacheable = 0;
9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	4946 return NGX_OK;
9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	4947 }
9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	4948
9305 8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	4949 if (n <= u->headers_in.age_n) {
8041 0784ab86ad08 Upstream: fixed X-Accel-Expires/Cache-Control/Expires handling. Maxim Dounin <mdounin@mdounin.ru> parents: 8040 diff changeset	4950 u->headers_in.no_cache = 1;
6905 9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	4951 return NGX_OK;
9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	4952 }
9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	4953
9305 8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	4954 r->cache->valid_sec = ngx_time() + n - u->headers_in.age_n;
8041 0784ab86ad08 Upstream: fixed X-Accel-Expires/Cache-Control/Expires handling. Maxim Dounin <mdounin@mdounin.ru> parents: 8040 diff changeset	4955 u->headers_in.expired = 0;
9305 8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	4956 u->headers_in.max_age = 1;
8041 0784ab86ad08 Upstream: fixed X-Accel-Expires/Cache-Control/Expires handling. Maxim Dounin <mdounin@mdounin.ru> parents: 8040 diff changeset	4957 }
0784ab86ad08 Upstream: fixed X-Accel-Expires/Cache-Control/Expires handling. Maxim Dounin <mdounin@mdounin.ru> parents: 8040 diff changeset	4958
0784ab86ad08 Upstream: fixed X-Accel-Expires/Cache-Control/Expires handling. Maxim Dounin <mdounin@mdounin.ru> parents: 8040 diff changeset	4959 extensions:
6905 9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	4960
9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	4961 p = ngx_strlcasestrn(start, last, (u_char *) "stale-while-revalidate=",
9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	4962 23 - 1);
9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	4963
9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	4964 if (p) {
9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	4965 n = 0;
9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	4966
9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	4967 for (p += 23; p < last; p++) {
9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	4968 if (p == ',' \|\| p == ';' \|\| *p == ' ') {
9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	4969 break;
9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	4970 }
9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	4971
9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	4972 if (p >= '0' && p <= '9') {
7067 e3723f2a11b7 Parenthesized ASCII-related calculations. Valentin Bartenev <vbart@nginx.com> parents: 7042 diff changeset	4973 n = n * 10 + (*p - '0');
6905 9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	4974 continue;
9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	4975 }
9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	4976
9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	4977 u->cacheable = 0;
9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	4978 return NGX_OK;
9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	4979 }
9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	4980
9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	4981 r->cache->updating_sec = n;
9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	4982 r->cache->error_sec = n;
9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	4983 }
9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	4984
9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	4985 p = ngx_strlcasestrn(start, last, (u_char *) "stale-if-error=", 15 - 1);
9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	4986
9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	4987 if (p) {
9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	4988 n = 0;
9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	4989
9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	4990 for (p += 15; p < last; p++) {
9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	4991 if (p == ',' \|\| p == ';' \|\| *p == ' ') {
9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	4992 break;
9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	4993 }
9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	4994
9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	4995 if (p >= '0' && p <= '9') {
7067 e3723f2a11b7 Parenthesized ASCII-related calculations. Valentin Bartenev <vbart@nginx.com> parents: 7042 diff changeset	4996 n = n * 10 + (*p - '0');
6905 9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	4997 continue;
9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	4998 }
9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	4999
9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	5000 u->cacheable = 0;
9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	5001 return NGX_OK;
9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	5002 }
9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	5003
9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	5004 r->cache->error_sec = n;
9a9e13686869 Cache: support for stale-while-revalidate and stale-if-error. Roman Arutyunyan <arut@nginx.com> parents: 6899 diff changeset	5005 }
2708 4c658be4ab63 fix building --without-http-cache, introduced in r2664 and later Igor Sysoev <igor@sysoev.ru> parents: 2704 diff changeset	5006 }
4c658be4ab63 fix building --without-http-cache, introduced in r2664 and later Igor Sysoev <igor@sysoev.ru> parents: 2704 diff changeset	5007 #endif
4c658be4ab63 fix building --without-http-cache, introduced in r2664 and later Igor Sysoev <igor@sysoev.ru> parents: 2704 diff changeset	5008
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5009 return NGX_OK;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5010 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5011
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5012
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5013 static ngx_int_t
2666 81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	5014 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	5015 ngx_uint_t offset)
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	5016 {
2786 4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	5017 ngx_http_upstream_t *u;
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	5018
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	5019 u = r->upstream;
8034 413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	5020
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	5021 if (u->headers_in.expires) {
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	5022 ngx_log_error(NGX_LOG_WARN, r->connection->log, 0,
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	5023 "upstream sent duplicate header line: \"%V: %V\", "
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	5024 "previous value: \"%V: %V\", ignored",
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	5025 &h->key, &h->value,
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	5026 &u->headers_in.expires->key,
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	5027 &u->headers_in.expires->value);
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	5028 h->hash = 0;
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	5029 return NGX_OK;
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	5030 }
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	5031
2786 4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	5032 u->headers_in.expires = h;
8032 2025aae94739 Upstream: all known headers in u->headers_in are linked lists now. Maxim Dounin <mdounin@mdounin.ru> parents: 8031 diff changeset	5033 h->next = NULL;
2708 4c658be4ab63 fix building --without-http-cache, introduced in r2664 and later Igor Sysoev <igor@sysoev.ru> parents: 2704 diff changeset	5034
4c658be4ab63 fix building --without-http-cache, introduced in r2664 and later Igor Sysoev <igor@sysoev.ru> parents: 2704 diff changeset	5035 #if (NGX_HTTP_CACHE)
4c658be4ab63 fix building --without-http-cache, introduced in r2664 and later Igor Sysoev <igor@sysoev.ru> parents: 2704 diff changeset	5036 {
2666 81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	5037 time_t expires;
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	5038
2786 4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	5039 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	5040 return NGX_OK;
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	5041 }
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	5042
2666 81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	5043 if (r->cache == NULL) {
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	5044 return NGX_OK;
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	5045 }
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	5046
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	5047 if (r->cache->valid_sec != 0) {
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	5048 return NGX_OK;
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	5049 }
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	5050
6180 8b6fa4842133 Moved ngx_http_parse_time() to core, renamed accordingly. Maxim Dounin <mdounin@mdounin.ru> parents: 6147 diff changeset	5051 expires = ngx_parse_http_time(h->value.data, h->value.len);
2666 81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	5052
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	5053 if (expires == NGX_ERROR \|\| expires < ngx_time()) {
8041 0784ab86ad08 Upstream: fixed X-Accel-Expires/Cache-Control/Expires handling. Maxim Dounin <mdounin@mdounin.ru> parents: 8040 diff changeset	5054 u->headers_in.expired = 1;
2666 81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	5055 return NGX_OK;
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	5056 }
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	5057
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	5058 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	5059 }
4c658be4ab63 fix building --without-http-cache, introduced in r2664 and later Igor Sysoev <igor@sysoev.ru> parents: 2704 diff changeset	5060 #endif
2666 81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	5061
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	5062 return NGX_OK;
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	5063 }
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	5064
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	5065
81556a9b6488 support Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2665 diff changeset	5066 static ngx_int_t
2663 09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	5067 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	5068 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	5069 {
2786 4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	5070 ngx_http_upstream_t *u;
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	5071
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	5072 u = r->upstream;
8034 413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	5073
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	5074 if (u->headers_in.x_accel_expires) {
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	5075 ngx_log_error(NGX_LOG_WARN, r->connection->log, 0,
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	5076 "upstream sent duplicate header line: \"%V: %V\", "
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	5077 "previous value: \"%V: %V\", ignored",
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	5078 &h->key, &h->value,
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	5079 &u->headers_in.x_accel_expires->key,
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	5080 &u->headers_in.x_accel_expires->value);
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	5081 h->hash = 0;
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	5082 return NGX_OK;
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	5083 }
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	5084
2786 4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	5085 u->headers_in.x_accel_expires = h;
8032 2025aae94739 Upstream: all known headers in u->headers_in are linked lists now. Maxim Dounin <mdounin@mdounin.ru> parents: 8031 diff changeset	5086 h->next = NULL;
2708 4c658be4ab63 fix building --without-http-cache, introduced in r2664 and later Igor Sysoev <igor@sysoev.ru> parents: 2704 diff changeset	5087
4c658be4ab63 fix building --without-http-cache, introduced in r2664 and later Igor Sysoev <igor@sysoev.ru> parents: 2704 diff changeset	5088 #if (NGX_HTTP_CACHE)
4c658be4ab63 fix building --without-http-cache, introduced in r2664 and later Igor Sysoev <igor@sysoev.ru> parents: 2704 diff changeset	5089 {
2663 09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	5090 u_char *p;
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	5091 size_t len;
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	5092 ngx_int_t n;
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	5093
2786 4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	5094 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	5095 return NGX_OK;
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	5096 }
4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	5097
2663 09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	5098 if (r->cache == NULL) {
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	5099 return NGX_OK;
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	5100 }
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	5101
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	5102 len = h->value.len;
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	5103 p = h->value.data;
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	5104
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	5105 if (p[0] != '@') {
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	5106 n = ngx_atoi(p, len);
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	5107
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	5108 switch (n) {
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	5109 case 0:
2786 4e002555652d proxy_ignore_headers and fastcgi_ignore_headers Igor Sysoev <igor@sysoev.ru> parents: 2757 diff changeset	5110 u->cacheable = 0;
4546 4988fa232629 For the sake of case/switch code readability, 'fall through' Maxim Konovalov <maxim@nginx.com> parents: 4499 diff changeset	5111 /* fall through */
4988fa232629 For the sake of case/switch code readability, 'fall through' Maxim Konovalov <maxim@nginx.com> parents: 4499 diff changeset	5112
2663 09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	5113 case NGX_ERROR:
2667 c1ac00c2bc75 update r2664 Igor Sysoev <igor@sysoev.ru> parents: 2666 diff changeset	5114 return NGX_OK;
2663 09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	5115
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	5116 default:
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	5117 r->cache->valid_sec = ngx_time() + n;
8041 0784ab86ad08 Upstream: fixed X-Accel-Expires/Cache-Control/Expires handling. Maxim Dounin <mdounin@mdounin.ru> parents: 8040 diff changeset	5118 u->headers_in.no_cache = 0;
0784ab86ad08 Upstream: fixed X-Accel-Expires/Cache-Control/Expires handling. Maxim Dounin <mdounin@mdounin.ru> parents: 8040 diff changeset	5119 u->headers_in.expired = 0;
9305 8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	5120 u->headers_in.max_age = 0;
2667 c1ac00c2bc75 update r2664 Igor Sysoev <igor@sysoev.ru> parents: 2666 diff changeset	5121 return NGX_OK;
2663 09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	5122 }
2667 c1ac00c2bc75 update r2664 Igor Sysoev <igor@sysoev.ru> parents: 2666 diff changeset	5123 }
c1ac00c2bc75 update r2664 Igor Sysoev <igor@sysoev.ru> parents: 2666 diff changeset	5124
c1ac00c2bc75 update r2664 Igor Sysoev <igor@sysoev.ru> parents: 2666 diff changeset	5125 p++;
c1ac00c2bc75 update r2664 Igor Sysoev <igor@sysoev.ru> parents: 2666 diff changeset	5126 len--;
c1ac00c2bc75 update r2664 Igor Sysoev <igor@sysoev.ru> parents: 2666 diff changeset	5127
c1ac00c2bc75 update r2664 Igor Sysoev <igor@sysoev.ru> parents: 2666 diff changeset	5128 n = ngx_atoi(p, len);
c1ac00c2bc75 update r2664 Igor Sysoev <igor@sysoev.ru> parents: 2666 diff changeset	5129
c1ac00c2bc75 update r2664 Igor Sysoev <igor@sysoev.ru> parents: 2666 diff changeset	5130 if (n != NGX_ERROR) {
c1ac00c2bc75 update r2664 Igor Sysoev <igor@sysoev.ru> parents: 2666 diff changeset	5131 r->cache->valid_sec = n;
8041 0784ab86ad08 Upstream: fixed X-Accel-Expires/Cache-Control/Expires handling. Maxim Dounin <mdounin@mdounin.ru> parents: 8040 diff changeset	5132 u->headers_in.no_cache = 0;
0784ab86ad08 Upstream: fixed X-Accel-Expires/Cache-Control/Expires handling. Maxim Dounin <mdounin@mdounin.ru> parents: 8040 diff changeset	5133 u->headers_in.expired = 0;
9305 8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	5134 u->headers_in.max_age = 0;
2663 09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	5135 }
2708 4c658be4ab63 fix building --without-http-cache, introduced in r2664 and later Igor Sysoev <igor@sysoev.ru> parents: 2704 diff changeset	5136 }
4c658be4ab63 fix building --without-http-cache, introduced in r2664 and later Igor Sysoev <igor@sysoev.ru> parents: 2704 diff changeset	5137 #endif
2663 09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	5138
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	5139 return NGX_OK;
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	5140 }
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	5141
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	5142
09725d69cb25 support X-Accel-Expires in cache Igor Sysoev <igor@sysoev.ru> parents: 2662 diff changeset	5143 static ngx_int_t
527 7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	5144 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	5145 ngx_uint_t offset)
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	5146 {
4197 cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	5147 ngx_int_t n;
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	5148 ngx_http_upstream_t *u;
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	5149
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	5150 u = r->upstream;
8034 413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	5151
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	5152 if (u->headers_in.x_accel_limit_rate) {
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	5153 ngx_log_error(NGX_LOG_WARN, r->connection->log, 0,
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	5154 "upstream sent duplicate header line: \"%V: %V\", "
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	5155 "previous value: \"%V: %V\", ignored",
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	5156 &h->key, &h->value,
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	5157 &u->headers_in.x_accel_limit_rate->key,
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	5158 &u->headers_in.x_accel_limit_rate->value);
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	5159 h->hash = 0;
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	5160 return NGX_OK;
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	5161 }
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	5162
4197 cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	5163 u->headers_in.x_accel_limit_rate = h;
8032 2025aae94739 Upstream: all known headers in u->headers_in are linked lists now. Maxim Dounin <mdounin@mdounin.ru> parents: 8031 diff changeset	5164 h->next = NULL;
4197 cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	5165
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	5166 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	5167 return NGX_OK;
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	5168 }
527 7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	5169
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	5170 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	5171
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	5172 if (n != NGX_ERROR) {
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	5173 r->limit_rate = (size_t) n;
7504 c19ca381b2e6 Variables support in limit_rate and limit_rate_after (ticket #293). Ruslan Ermilov <ru@nginx.com> parents: 7456 diff changeset	5174 r->limit_rate_set = 1;
527 7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	5175 }
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	5176
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	5177 return NGX_OK;
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	5178 }
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	5179
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	5180
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	5181 static ngx_int_t
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5182 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	5183 ngx_uint_t offset)
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5184 {
4197 cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	5185 u_char c0, c1, c2;
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	5186 ngx_http_upstream_t *u;
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	5187
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	5188 u = r->upstream;
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	5189
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	5190 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	5191 return NGX_OK;
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	5192 }
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	5193
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	5194 if (u->conf->change_buffering) {
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5195
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5196 if (h->value.len == 2) {
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5197 c0 = ngx_tolower(h->value.data[0]);
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5198 c1 = ngx_tolower(h->value.data[1]);
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5199
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5200 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	5201 u->buffering = 0;
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5202 }
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5203
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5204 } else if (h->value.len == 3) {
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5205 c0 = ngx_tolower(h->value.data[0]);
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5206 c1 = ngx_tolower(h->value.data[1]);
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5207 c2 = ngx_tolower(h->value.data[2]);
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5208
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5209 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	5210 u->buffering = 1;
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5211 }
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5212 }
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5213 }
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5214
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5215 return NGX_OK;
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5216 }
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5217
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5218
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	5219 static ngx_int_t
657 400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	5220 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	5221 ngx_uint_t offset)
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	5222 {
8028 27d12017f300 Upstream: style. Maxim Dounin <mdounin@mdounin.ru> parents: 8024 diff changeset	5223 ngx_http_upstream_t *u;
27d12017f300 Upstream: style. Maxim Dounin <mdounin@mdounin.ru> parents: 8024 diff changeset	5224
27d12017f300 Upstream: style. Maxim Dounin <mdounin@mdounin.ru> parents: 8024 diff changeset	5225 u = r->upstream;
27d12017f300 Upstream: style. Maxim Dounin <mdounin@mdounin.ru> parents: 8024 diff changeset	5226
27d12017f300 Upstream: style. Maxim Dounin <mdounin@mdounin.ru> parents: 8024 diff changeset	5227 if (u->conf->ignore_headers & NGX_HTTP_UPSTREAM_IGN_XA_CHARSET) {
4197 cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	5228 return NGX_OK;
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	5229 }
cf6a3467b5db Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4182 diff changeset	5230
657 400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	5231 r->headers_out.override_charset = &h->value;
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	5232
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	5233 return NGX_OK;
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	5234 }
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	5235
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	5236
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	5237 static ngx_int_t
4124 0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	5238 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	5239 ngx_uint_t offset)
0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	5240 {
8034 413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	5241 ngx_table_elt_t **ph;
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	5242 ngx_http_upstream_t *u;
8028 27d12017f300 Upstream: style. Maxim Dounin <mdounin@mdounin.ru> parents: 8024 diff changeset	5243
27d12017f300 Upstream: style. Maxim Dounin <mdounin@mdounin.ru> parents: 8024 diff changeset	5244 u = r->upstream;
8034 413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	5245 ph = &u->headers_in.connection;
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	5246
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	5247 while (ph) { ph = &(ph)->next; }
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	5248
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	5249 *ph = h;
8032 2025aae94739 Upstream: all known headers in u->headers_in are linked lists now. Maxim Dounin <mdounin@mdounin.ru> parents: 8031 diff changeset	5250 h->next = NULL;
4124 0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	5251
0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	5252 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	5253 (u_char *) "close", 5 - 1)
0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	5254 != NULL)
0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	5255 {
8028 27d12017f300 Upstream: style. Maxim Dounin <mdounin@mdounin.ru> parents: 8024 diff changeset	5256 u->headers_in.connection_close = 1;
4124 0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	5257 }
0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	5258
0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	5259 return NGX_OK;
0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	5260 }
0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	5261
0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	5262
0c30976f5bfa Upstream: Connection header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4123 diff changeset	5263 static ngx_int_t
4123 0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	5264 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	5265 ngx_table_elt_t *h, ngx_uint_t offset)
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	5266 {
8028 27d12017f300 Upstream: style. Maxim Dounin <mdounin@mdounin.ru> parents: 8024 diff changeset	5267 ngx_http_upstream_t *u;
27d12017f300 Upstream: style. Maxim Dounin <mdounin@mdounin.ru> parents: 8024 diff changeset	5268
27d12017f300 Upstream: style. Maxim Dounin <mdounin@mdounin.ru> parents: 8024 diff changeset	5269 u = r->upstream;
8033 2bf7792c262e Upstream: header handlers can now return parsing errors. Maxim Dounin <mdounin@mdounin.ru> parents: 8032 diff changeset	5270
2bf7792c262e Upstream: header handlers can now return parsing errors. Maxim Dounin <mdounin@mdounin.ru> parents: 8032 diff changeset	5271 if (u->headers_in.transfer_encoding) {
2bf7792c262e Upstream: header handlers can now return parsing errors. Maxim Dounin <mdounin@mdounin.ru> parents: 8032 diff changeset	5272 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
2bf7792c262e Upstream: header handlers can now return parsing errors. Maxim Dounin <mdounin@mdounin.ru> parents: 8032 diff changeset	5273 "upstream sent duplicate header line: \"%V: %V\", "
2bf7792c262e Upstream: header handlers can now return parsing errors. Maxim Dounin <mdounin@mdounin.ru> parents: 8032 diff changeset	5274 "previous value: \"%V: %V\"",
2bf7792c262e Upstream: header handlers can now return parsing errors. Maxim Dounin <mdounin@mdounin.ru> parents: 8032 diff changeset	5275 &h->key, &h->value,
2bf7792c262e Upstream: header handlers can now return parsing errors. Maxim Dounin <mdounin@mdounin.ru> parents: 8032 diff changeset	5276 &u->headers_in.transfer_encoding->key,
2bf7792c262e Upstream: header handlers can now return parsing errors. Maxim Dounin <mdounin@mdounin.ru> parents: 8032 diff changeset	5277 &u->headers_in.transfer_encoding->value);
2bf7792c262e Upstream: header handlers can now return parsing errors. Maxim Dounin <mdounin@mdounin.ru> parents: 8032 diff changeset	5278 return NGX_HTTP_UPSTREAM_INVALID_HEADER;
2bf7792c262e Upstream: header handlers can now return parsing errors. Maxim Dounin <mdounin@mdounin.ru> parents: 8032 diff changeset	5279 }
2bf7792c262e Upstream: header handlers can now return parsing errors. Maxim Dounin <mdounin@mdounin.ru> parents: 8032 diff changeset	5280
2bf7792c262e Upstream: header handlers can now return parsing errors. Maxim Dounin <mdounin@mdounin.ru> parents: 8032 diff changeset	5281 if (u->headers_in.content_length) {
2bf7792c262e Upstream: header handlers can now return parsing errors. Maxim Dounin <mdounin@mdounin.ru> parents: 8032 diff changeset	5282 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
2bf7792c262e Upstream: header handlers can now return parsing errors. Maxim Dounin <mdounin@mdounin.ru> parents: 8032 diff changeset	5283 "upstream sent \"Content-Length\" and "
2bf7792c262e Upstream: header handlers can now return parsing errors. Maxim Dounin <mdounin@mdounin.ru> parents: 8032 diff changeset	5284 "\"Transfer-Encoding\" headers at the same time");
2bf7792c262e Upstream: header handlers can now return parsing errors. Maxim Dounin <mdounin@mdounin.ru> parents: 8032 diff changeset	5285 return NGX_HTTP_UPSTREAM_INVALID_HEADER;
2bf7792c262e Upstream: header handlers can now return parsing errors. Maxim Dounin <mdounin@mdounin.ru> parents: 8032 diff changeset	5286 }
2bf7792c262e Upstream: header handlers can now return parsing errors. Maxim Dounin <mdounin@mdounin.ru> parents: 8032 diff changeset	5287
8028 27d12017f300 Upstream: style. Maxim Dounin <mdounin@mdounin.ru> parents: 8024 diff changeset	5288 u->headers_in.transfer_encoding = h;
8032 2025aae94739 Upstream: all known headers in u->headers_in are linked lists now. Maxim Dounin <mdounin@mdounin.ru> parents: 8031 diff changeset	5289 h->next = NULL;
4123 0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	5290
8033 2bf7792c262e Upstream: header handlers can now return parsing errors. Maxim Dounin <mdounin@mdounin.ru> parents: 8032 diff changeset	5291 if (h->value.len == 7
2bf7792c262e Upstream: header handlers can now return parsing errors. Maxim Dounin <mdounin@mdounin.ru> parents: 8032 diff changeset	5292 && ngx_strncasecmp(h->value.data, (u_char *) "chunked", 7) == 0)
4123 0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	5293 {
8028 27d12017f300 Upstream: style. Maxim Dounin <mdounin@mdounin.ru> parents: 8024 diff changeset	5294 u->headers_in.chunked = 1;
8033 2bf7792c262e Upstream: header handlers can now return parsing errors. Maxim Dounin <mdounin@mdounin.ru> parents: 8032 diff changeset	5295
2bf7792c262e Upstream: header handlers can now return parsing errors. Maxim Dounin <mdounin@mdounin.ru> parents: 8032 diff changeset	5296 } else {
2bf7792c262e Upstream: header handlers can now return parsing errors. Maxim Dounin <mdounin@mdounin.ru> parents: 8032 diff changeset	5297 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
2bf7792c262e Upstream: header handlers can now return parsing errors. Maxim Dounin <mdounin@mdounin.ru> parents: 8032 diff changeset	5298 "upstream sent unknown \"Transfer-Encoding\": \"%V\"",
2bf7792c262e Upstream: header handlers can now return parsing errors. Maxim Dounin <mdounin@mdounin.ru> parents: 8032 diff changeset	5299 &h->value);
2bf7792c262e Upstream: header handlers can now return parsing errors. Maxim Dounin <mdounin@mdounin.ru> parents: 8032 diff changeset	5300 return NGX_HTTP_UPSTREAM_INVALID_HEADER;
4123 0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	5301 }
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	5302
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	5303 return NGX_OK;
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	5304 }
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	5305
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	5306
0ee350b5177c Upstream: Transfer-Encoding header processing. Maxim Dounin <mdounin@mdounin.ru> parents: 4120 diff changeset	5307 static ngx_int_t
5877 60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	5308 ngx_http_upstream_process_vary(ngx_http_request_t *r,
60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	5309 ngx_table_elt_t *h, ngx_uint_t offset)
60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	5310 {
8034 413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	5311 ngx_table_elt_t **ph;
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	5312 ngx_http_upstream_t *u;
5877 60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	5313
60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	5314 u = r->upstream;
8034 413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	5315 ph = &u->headers_in.vary;
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	5316
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	5317 while (ph) { ph = &(ph)->next; }
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	5318
413dbda22f7d Upstream: duplicate headers ignored or properly linked. Maxim Dounin <mdounin@mdounin.ru> parents: 8033 diff changeset	5319 *ph = h;
8032 2025aae94739 Upstream: all known headers in u->headers_in are linked lists now. Maxim Dounin <mdounin@mdounin.ru> parents: 8031 diff changeset	5320 h->next = NULL;
5877 60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	5321
60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	5322 #if (NGX_HTTP_CACHE)
8040 e0cfab501dd1 Upstream: fixed build without http cache (broken by cd73509f21e2). Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	5323 {
e0cfab501dd1 Upstream: fixed build without http cache (broken by cd73509f21e2). Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	5324 u_char *p;
e0cfab501dd1 Upstream: fixed build without http cache (broken by cd73509f21e2). Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	5325 size_t len;
e0cfab501dd1 Upstream: fixed build without http cache (broken by cd73509f21e2). Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	5326 ngx_str_t vary;
5877 60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	5327
60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	5328 if (u->conf->ignore_headers & NGX_HTTP_UPSTREAM_IGN_VARY) {
60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	5329 return NGX_OK;
60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	5330 }
60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	5331
8035 cd73509f21e2 Upstream: handling of multiple Vary headers (ticket #1423). Maxim Dounin <mdounin@mdounin.ru> parents: 8034 diff changeset	5332 if (r->cache == NULL \|\| !u->cacheable) {
cd73509f21e2 Upstream: handling of multiple Vary headers (ticket #1423). Maxim Dounin <mdounin@mdounin.ru> parents: 8034 diff changeset	5333 return NGX_OK;
cd73509f21e2 Upstream: handling of multiple Vary headers (ticket #1423). Maxim Dounin <mdounin@mdounin.ru> parents: 8034 diff changeset	5334 }
cd73509f21e2 Upstream: handling of multiple Vary headers (ticket #1423). Maxim Dounin <mdounin@mdounin.ru> parents: 8034 diff changeset	5335
cd73509f21e2 Upstream: handling of multiple Vary headers (ticket #1423). Maxim Dounin <mdounin@mdounin.ru> parents: 8034 diff changeset	5336 if (h->value.len == 1 && h->value.data[0] == '*') {
cd73509f21e2 Upstream: handling of multiple Vary headers (ticket #1423). Maxim Dounin <mdounin@mdounin.ru> parents: 8034 diff changeset	5337 u->cacheable = 0;
5878 2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5877 diff changeset	5338 return NGX_OK;
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5877 diff changeset	5339 }
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5877 diff changeset	5340
8035 cd73509f21e2 Upstream: handling of multiple Vary headers (ticket #1423). Maxim Dounin <mdounin@mdounin.ru> parents: 8034 diff changeset	5341 if (u->headers_in.vary->next) {
cd73509f21e2 Upstream: handling of multiple Vary headers (ticket #1423). Maxim Dounin <mdounin@mdounin.ru> parents: 8034 diff changeset	5342
cd73509f21e2 Upstream: handling of multiple Vary headers (ticket #1423). Maxim Dounin <mdounin@mdounin.ru> parents: 8034 diff changeset	5343 len = 0;
cd73509f21e2 Upstream: handling of multiple Vary headers (ticket #1423). Maxim Dounin <mdounin@mdounin.ru> parents: 8034 diff changeset	5344
cd73509f21e2 Upstream: handling of multiple Vary headers (ticket #1423). Maxim Dounin <mdounin@mdounin.ru> parents: 8034 diff changeset	5345 for (h = u->headers_in.vary; h; h = h->next) {
cd73509f21e2 Upstream: handling of multiple Vary headers (ticket #1423). Maxim Dounin <mdounin@mdounin.ru> parents: 8034 diff changeset	5346 len += h->value.len + 2;
cd73509f21e2 Upstream: handling of multiple Vary headers (ticket #1423). Maxim Dounin <mdounin@mdounin.ru> parents: 8034 diff changeset	5347 }
cd73509f21e2 Upstream: handling of multiple Vary headers (ticket #1423). Maxim Dounin <mdounin@mdounin.ru> parents: 8034 diff changeset	5348
cd73509f21e2 Upstream: handling of multiple Vary headers (ticket #1423). Maxim Dounin <mdounin@mdounin.ru> parents: 8034 diff changeset	5349 len -= 2;
cd73509f21e2 Upstream: handling of multiple Vary headers (ticket #1423). Maxim Dounin <mdounin@mdounin.ru> parents: 8034 diff changeset	5350
cd73509f21e2 Upstream: handling of multiple Vary headers (ticket #1423). Maxim Dounin <mdounin@mdounin.ru> parents: 8034 diff changeset	5351 p = ngx_pnalloc(r->pool, len);
cd73509f21e2 Upstream: handling of multiple Vary headers (ticket #1423). Maxim Dounin <mdounin@mdounin.ru> parents: 8034 diff changeset	5352 if (p == NULL) {
cd73509f21e2 Upstream: handling of multiple Vary headers (ticket #1423). Maxim Dounin <mdounin@mdounin.ru> parents: 8034 diff changeset	5353 return NGX_ERROR;
cd73509f21e2 Upstream: handling of multiple Vary headers (ticket #1423). Maxim Dounin <mdounin@mdounin.ru> parents: 8034 diff changeset	5354 }
cd73509f21e2 Upstream: handling of multiple Vary headers (ticket #1423). Maxim Dounin <mdounin@mdounin.ru> parents: 8034 diff changeset	5355
cd73509f21e2 Upstream: handling of multiple Vary headers (ticket #1423). Maxim Dounin <mdounin@mdounin.ru> parents: 8034 diff changeset	5356 vary.len = len;
cd73509f21e2 Upstream: handling of multiple Vary headers (ticket #1423). Maxim Dounin <mdounin@mdounin.ru> parents: 8034 diff changeset	5357 vary.data = p;
cd73509f21e2 Upstream: handling of multiple Vary headers (ticket #1423). Maxim Dounin <mdounin@mdounin.ru> parents: 8034 diff changeset	5358
cd73509f21e2 Upstream: handling of multiple Vary headers (ticket #1423). Maxim Dounin <mdounin@mdounin.ru> parents: 8034 diff changeset	5359 for (h = u->headers_in.vary; h; h = h->next) {
cd73509f21e2 Upstream: handling of multiple Vary headers (ticket #1423). Maxim Dounin <mdounin@mdounin.ru> parents: 8034 diff changeset	5360 p = ngx_copy(p, h->value.data, h->value.len);
cd73509f21e2 Upstream: handling of multiple Vary headers (ticket #1423). Maxim Dounin <mdounin@mdounin.ru> parents: 8034 diff changeset	5361
cd73509f21e2 Upstream: handling of multiple Vary headers (ticket #1423). Maxim Dounin <mdounin@mdounin.ru> parents: 8034 diff changeset	5362 if (h->next == NULL) {
cd73509f21e2 Upstream: handling of multiple Vary headers (ticket #1423). Maxim Dounin <mdounin@mdounin.ru> parents: 8034 diff changeset	5363 break;
cd73509f21e2 Upstream: handling of multiple Vary headers (ticket #1423). Maxim Dounin <mdounin@mdounin.ru> parents: 8034 diff changeset	5364 }
cd73509f21e2 Upstream: handling of multiple Vary headers (ticket #1423). Maxim Dounin <mdounin@mdounin.ru> parents: 8034 diff changeset	5365
cd73509f21e2 Upstream: handling of multiple Vary headers (ticket #1423). Maxim Dounin <mdounin@mdounin.ru> parents: 8034 diff changeset	5366 p++ = ','; p++ = ' ';
cd73509f21e2 Upstream: handling of multiple Vary headers (ticket #1423). Maxim Dounin <mdounin@mdounin.ru> parents: 8034 diff changeset	5367 }
cd73509f21e2 Upstream: handling of multiple Vary headers (ticket #1423). Maxim Dounin <mdounin@mdounin.ru> parents: 8034 diff changeset	5368
cd73509f21e2 Upstream: handling of multiple Vary headers (ticket #1423). Maxim Dounin <mdounin@mdounin.ru> parents: 8034 diff changeset	5369 } else {
cd73509f21e2 Upstream: handling of multiple Vary headers (ticket #1423). Maxim Dounin <mdounin@mdounin.ru> parents: 8034 diff changeset	5370 vary = h->value;
cd73509f21e2 Upstream: handling of multiple Vary headers (ticket #1423). Maxim Dounin <mdounin@mdounin.ru> parents: 8034 diff changeset	5371 }
cd73509f21e2 Upstream: handling of multiple Vary headers (ticket #1423). Maxim Dounin <mdounin@mdounin.ru> parents: 8034 diff changeset	5372
cd73509f21e2 Upstream: handling of multiple Vary headers (ticket #1423). Maxim Dounin <mdounin@mdounin.ru> parents: 8034 diff changeset	5373 if (vary.len > NGX_HTTP_CACHE_VARY_LEN) {
5878 2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5877 diff changeset	5374 u->cacheable = 0;
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5877 diff changeset	5375 }
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5877 diff changeset	5376
8035 cd73509f21e2 Upstream: handling of multiple Vary headers (ticket #1423). Maxim Dounin <mdounin@mdounin.ru> parents: 8034 diff changeset	5377 r->cache->vary = vary;
8040 e0cfab501dd1 Upstream: fixed build without http cache (broken by cd73509f21e2). Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	5378 }
5877 60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	5379 #endif
60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	5380
60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	5381 return NGX_OK;
60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	5382 }
60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	5383
60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	5384
60fde1bc7236 Cache: disable caching of responses with Vary (ticket #118). Maxim Dounin <mdounin@mdounin.ru> parents: 5874 diff changeset	5385 static ngx_int_t
9305 8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	5386 ngx_http_upstream_process_age(ngx_http_request_t *r,
8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	5387 ngx_table_elt_t *h, ngx_uint_t offset)
8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	5388 {
8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	5389 ngx_http_upstream_t *u;
8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	5390
8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	5391 u = r->upstream;
8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	5392
8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	5393 if (u->headers_in.age) {
8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	5394 ngx_log_error(NGX_LOG_WARN, r->connection->log, 0,
8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	5395 "upstream sent duplicate header line: \"%V: %V\", "
8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	5396 "previous value: \"%V: %V\", ignored",
8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	5397 &h->key, &h->value,
8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	5398 &u->headers_in.age->key,
8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	5399 &u->headers_in.age->value);
8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	5400 h->hash = 0;
8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	5401 return NGX_OK;
8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	5402 }
8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	5403
8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	5404 u->headers_in.age = h;
8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	5405 h->next = NULL;
8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	5406
8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	5407 #if (NGX_HTTP_CACHE)
8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	5408 {
8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	5409 ngx_int_t n;
8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	5410
8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	5411 if (u->conf->ignore_headers & NGX_HTTP_UPSTREAM_IGN_AGE) {
8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	5412 return NGX_OK;
8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	5413 }
8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	5414
8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	5415 if (r->cache == NULL \|\| !u->cacheable) {
8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	5416 return NGX_OK;
8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	5417 }
8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	5418
8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	5419 n = ngx_atoi(h->value.data, h->value.len);
8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	5420
8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	5421 if (n != NGX_ERROR) {
8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	5422 u->headers_in.age_n = n;
8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	5423
8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	5424 if (u->headers_in.max_age) {
8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	5425 if (n >= r->cache->valid_sec - ngx_time()) {
8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	5426 u->headers_in.no_cache = 1;
8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	5427 return NGX_OK;
8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	5428 }
8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	5429
8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	5430 r->cache->valid_sec -= n;
8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	5431 }
8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	5432 }
8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	5433 }
8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	5434 #endif
8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	5435
8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	5436 return NGX_OK;
8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	5437 }
8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	5438
8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	5439
8cdab3d89c44 Upstream: using the "Age" header when caching responses. Maxim Dounin <mdounin@mdounin.ru> parents: 9295 diff changeset	5440 static ngx_int_t
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5441 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	5442 ngx_uint_t offset)
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5443 {
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5444 ngx_table_elt_t ho, *ph;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5445
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5446 ho = ngx_list_push(&r->headers_out.headers);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5447 if (ho == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5448 return NGX_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5449 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5450
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5451 ho = h;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5452
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5453 if (offset) {
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5454 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	5455 *ph = ho;
8031 d26db4f82d7d All known output headers can be linked lists now. Maxim Dounin <mdounin@mdounin.ru> parents: 8030 diff changeset	5456 ho->next = NULL;
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5457 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5458
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5459 return NGX_OK;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5460 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5461
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5462
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5463 static ngx_int_t
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5464 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	5465 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	5466 {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5467 ngx_table_elt_t ho, *ph;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5468
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5469 ho = ngx_list_push(&r->headers_out.headers);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5470 if (ho == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5471 return NGX_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5472 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5473
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5474 ho = h;
6986 0cdee26605f3 Cleaned up r->headers_out.headers allocation error handling. Sergey Kandaurov <pluknet@nginx.com> parents: 6966 diff changeset	5475
8024 ef6a3a99a81a Reworked multi headers to use linked lists. Maxim Dounin <mdounin@mdounin.ru> parents: 8023 diff changeset	5476 ph = (ngx_table_elt_t *) ((char ) &r->headers_out + offset);
ef6a3a99a81a Reworked multi headers to use linked lists. Maxim Dounin <mdounin@mdounin.ru> parents: 8023 diff changeset	5477
ef6a3a99a81a Reworked multi headers to use linked lists. Maxim Dounin <mdounin@mdounin.ru> parents: 8023 diff changeset	5478 while (ph) { ph = &(ph)->next; }
6986 0cdee26605f3 Cleaned up r->headers_out.headers allocation error handling. Sergey Kandaurov <pluknet@nginx.com> parents: 6966 diff changeset	5479
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5480 *ph = ho;
8024 ef6a3a99a81a Reworked multi headers to use linked lists. Maxim Dounin <mdounin@mdounin.ru> parents: 8023 diff changeset	5481 ho->next = NULL;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5482
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5483 return NGX_OK;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5484 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5485
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5486
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5487 static ngx_int_t
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5488 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	5489 ngx_uint_t offset)
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5490 {
657 400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	5491 u_char p, last;
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	5492
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	5493 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	5494 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	5495 r->headers_out.content_type_lowcase = NULL;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5496
657 400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	5497 for (p = h->value.data; *p; p++) {
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	5498
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	5499 if (*p != ';') {
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	5500 continue;
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	5501 }
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	5502
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	5503 last = p;
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	5504
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	5505 while (++p == ' ') { / void */ }
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	5506
1968 3c540ad3021f fix segfault Igor Sysoev <igor@sysoev.ru> parents: 1959 diff changeset	5507 if (*p == '\0') {
3c540ad3021f fix segfault Igor Sysoev <igor@sysoev.ru> parents: 1959 diff changeset	5508 return NGX_OK;
3c540ad3021f fix segfault Igor Sysoev <igor@sysoev.ru> parents: 1959 diff changeset	5509 }
3c540ad3021f fix segfault Igor Sysoev <igor@sysoev.ru> parents: 1959 diff changeset	5510
1107 db7c468c447d ngx_strcasecmp()/ngx_strncasecmp() Igor Sysoev <igor@sysoev.ru> parents: 1098 diff changeset	5511 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	5512 continue;
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	5513 }
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	5514
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	5515 p += 8;
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	5516
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	5517 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	5518
2244 f5a9f35e8344 strip charset name quotes Igor Sysoev <igor@sysoev.ru> parents: 2184 diff changeset	5519 if (*p == '"') {
f5a9f35e8344 strip charset name quotes Igor Sysoev <igor@sysoev.ru> parents: 2184 diff changeset	5520 p++;
f5a9f35e8344 strip charset name quotes Igor Sysoev <igor@sysoev.ru> parents: 2184 diff changeset	5521 }
f5a9f35e8344 strip charset name quotes Igor Sysoev <igor@sysoev.ru> parents: 2184 diff changeset	5522
f5a9f35e8344 strip charset name quotes Igor Sysoev <igor@sysoev.ru> parents: 2184 diff changeset	5523 last = h->value.data + h->value.len;
f5a9f35e8344 strip charset name quotes Igor Sysoev <igor@sysoev.ru> parents: 2184 diff changeset	5524
f5a9f35e8344 strip charset name quotes Igor Sysoev <igor@sysoev.ru> parents: 2184 diff changeset	5525 if (*(last - 1) == '"') {
f5a9f35e8344 strip charset name quotes Igor Sysoev <igor@sysoev.ru> parents: 2184 diff changeset	5526 last--;
f5a9f35e8344 strip charset name quotes Igor Sysoev <igor@sysoev.ru> parents: 2184 diff changeset	5527 }
f5a9f35e8344 strip charset name quotes Igor Sysoev <igor@sysoev.ru> parents: 2184 diff changeset	5528
f5a9f35e8344 strip charset name quotes Igor Sysoev <igor@sysoev.ru> parents: 2184 diff changeset	5529 r->headers_out.charset.len = last - p;
657 400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	5530 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	5531
c6c42497106c fix segfault if upstream sends trailing ";" in "charset=" Igor Sysoev <igor@sysoev.ru> parents: 1109 diff changeset	5532 return NGX_OK;
657 400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	5533 }
400711951595 nginx-0.3.50-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 653 diff changeset	5534
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5535 return NGX_OK;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5536 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5537
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5538
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5539 static ngx_int_t
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	5540 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	5541 ngx_uint_t offset)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	5542 {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	5543 ngx_table_elt_t *ho;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	5544
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	5545 ho = ngx_list_push(&r->headers_out.headers);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	5546 if (ho == NULL) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	5547 return NGX_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	5548 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	5549
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	5550 ho = h;
8031 d26db4f82d7d All known output headers can be linked lists now. Maxim Dounin <mdounin@mdounin.ru> parents: 8030 diff changeset	5551 ho->next = NULL;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	5552
3004 4121acaf7a04 fix handling "Last-Modified" and "Accept-Ranges" for upstream responses Igor Sysoev <igor@sysoev.ru> parents: 3003 diff changeset	5553 r->headers_out.last_modified = ho;
7093 acc2cddc7b45 Upstream: unconditional parsing of last_modified_time. Maxim Dounin <mdounin@mdounin.ru> parents: 7077 diff changeset	5554 r->headers_out.last_modified_time =
5732 d0ce06cb9be1 Upstream: fixed cache revalidation with SSI. Maxim Dounin <mdounin@mdounin.ru> parents: 5731 diff changeset	5555 r->upstream->headers_in.last_modified_time;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	5556
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	5557 return NGX_OK;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	5558 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	5559
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	5560
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	5561 static ngx_int_t
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5562 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	5563 ngx_uint_t offset)
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5564 {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5565 ngx_int_t rc;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5566 ngx_table_elt_t *ho;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5567
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5568 ho = ngx_list_push(&r->headers_out.headers);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5569 if (ho == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5570 return NGX_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5571 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5572
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5573 ho = h;
8031 d26db4f82d7d All known output headers can be linked lists now. Maxim Dounin <mdounin@mdounin.ru> parents: 8030 diff changeset	5574 ho->next = NULL;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5575
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5576 if (r->upstream->rewrite_redirect) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5577 rc = r->upstream->rewrite_redirect(r, ho, 0);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5578
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	5579 if (rc == NGX_DECLINED) {
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	5580 return NGX_OK;
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	5581 }
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	5582
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5583 if (rc == NGX_OK) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5584 r->headers_out.location = ho;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5585
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5586 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	5587 "rewritten location: \"%V\"", &ho->value);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5588 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5589
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5590 return rc;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5591 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5592
1653 ea681a6a0c61 set r->headers_out.location for non-local redirects Igor Sysoev <igor@sysoev.ru> parents: 1640 diff changeset	5593 if (ho->value.data[0] != '/') {
ea681a6a0c61 set r->headers_out.location for non-local redirects Igor Sysoev <igor@sysoev.ru> parents: 1640 diff changeset	5594 r->headers_out.location = ho;
ea681a6a0c61 set r->headers_out.location for non-local redirects Igor Sysoev <igor@sysoev.ru> parents: 1640 diff changeset	5595 }
ea681a6a0c61 set r->headers_out.location for non-local redirects Igor Sysoev <igor@sysoev.ru> parents: 1640 diff changeset	5596
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5597 /*
6853 c85dfd99a2dd Fixed missing "Location" field with some relative redirects. Ruslan Ermilov <ru@nginx.com> parents: 6799 diff changeset	5598 * we do not set r->headers_out.location here to avoid handling
c85dfd99a2dd Fixed missing "Location" field with some relative redirects. Ruslan Ermilov <ru@nginx.com> parents: 6799 diff changeset	5599 * relative redirects in ngx_http_header_filter()
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5600 */
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5601
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5602 return NGX_OK;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5603 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5604
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5605
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5606 static ngx_int_t
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5607 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	5608 ngx_uint_t offset)
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5609 {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5610 u_char *p;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5611 ngx_int_t rc;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5612 ngx_table_elt_t *ho;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5613
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5614 ho = ngx_list_push(&r->headers_out.headers);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5615 if (ho == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5616 return NGX_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5617 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5618
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5619 ho = h;
8031 d26db4f82d7d All known output headers can be linked lists now. Maxim Dounin <mdounin@mdounin.ru> parents: 8030 diff changeset	5620 ho->next = NULL;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5621
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5622 if (r->upstream->rewrite_redirect) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5623
1549 099d8470e6c3 pass length clearly Igor Sysoev <igor@sysoev.ru> parents: 1543 diff changeset	5624 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	5625
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5626 if (p) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5627 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	5628
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5629 } else {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5630 return NGX_OK;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5631 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5632
529 e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	5633 if (rc == NGX_DECLINED) {
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	5634 return NGX_OK;
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	5635 }
e5d7d0334fdb nginx-0.1.39-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	5636
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5637 if (rc == NGX_OK) {
1654 e5c547a225bd r->headers_out.refresh Igor Sysoev <igor@sysoev.ru> parents: 1653 diff changeset	5638 r->headers_out.refresh = ho;
e5c547a225bd r->headers_out.refresh Igor Sysoev <igor@sysoev.ru> parents: 1653 diff changeset	5639
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5640 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	5641 "rewritten refresh: \"%V\"", &ho->value);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5642 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5643
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5644 return rc;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5645 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5646
1654 e5c547a225bd r->headers_out.refresh Igor Sysoev <igor@sysoev.ru> parents: 1653 diff changeset	5647 r->headers_out.refresh = ho;
e5c547a225bd r->headers_out.refresh Igor Sysoev <igor@sysoev.ru> parents: 1653 diff changeset	5648
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5649 return NGX_OK;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5650 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5651
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5652
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	5653 static ngx_int_t
4464 7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	5654 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	5655 ngx_uint_t offset)
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	5656 {
4650 b38fea6f9a15 Fixed returned value handling from the cookie rewrite handler. Valentin Bartenev <vbart@nginx.com> parents: 4572 diff changeset	5657 ngx_int_t rc;
4464 7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	5658 ngx_table_elt_t *ho;
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	5659
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	5660 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	5661 if (ho == NULL) {
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	5662 return NGX_ERROR;
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	5663 }
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	5664
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	5665 ho = h;
8031 d26db4f82d7d All known output headers can be linked lists now. Maxim Dounin <mdounin@mdounin.ru> parents: 8030 diff changeset	5666 ho->next = NULL;
4464 7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	5667
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	5668 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	5669 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	5670
b38fea6f9a15 Fixed returned value handling from the cookie rewrite handler. Valentin Bartenev <vbart@nginx.com> parents: 4572 diff changeset	5671 if (rc == NGX_DECLINED) {
b38fea6f9a15 Fixed returned value handling from the cookie rewrite handler. Valentin Bartenev <vbart@nginx.com> parents: 4572 diff changeset	5672 return NGX_OK;
b38fea6f9a15 Fixed returned value handling from the cookie rewrite handler. Valentin Bartenev <vbart@nginx.com> parents: 4572 diff changeset	5673 }
b38fea6f9a15 Fixed returned value handling from the cookie rewrite handler. Valentin Bartenev <vbart@nginx.com> parents: 4572 diff changeset	5674
b38fea6f9a15 Fixed returned value handling from the cookie rewrite handler. Valentin Bartenev <vbart@nginx.com> parents: 4572 diff changeset	5675 #if (NGX_DEBUG)
b38fea6f9a15 Fixed returned value handling from the cookie rewrite handler. Valentin Bartenev <vbart@nginx.com> parents: 4572 diff changeset	5676 if (rc == NGX_OK) {
b38fea6f9a15 Fixed returned value handling from the cookie rewrite handler. Valentin Bartenev <vbart@nginx.com> parents: 4572 diff changeset	5677 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	5678 "rewritten cookie: \"%V\"", &ho->value);
b38fea6f9a15 Fixed returned value handling from the cookie rewrite handler. Valentin Bartenev <vbart@nginx.com> parents: 4572 diff changeset	5679 }
b38fea6f9a15 Fixed returned value handling from the cookie rewrite handler. Valentin Bartenev <vbart@nginx.com> parents: 4572 diff changeset	5680 #endif
b38fea6f9a15 Fixed returned value handling from the cookie rewrite handler. Valentin Bartenev <vbart@nginx.com> parents: 4572 diff changeset	5681
b38fea6f9a15 Fixed returned value handling from the cookie rewrite handler. Valentin Bartenev <vbart@nginx.com> parents: 4572 diff changeset	5682 return rc;
4464 7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	5683 }
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	5684
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	5685 return NGX_OK;
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	5686 }
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	5687
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	5688
7bf3b68239a3 Upstream: added callback hook for the "Set-Cookie" header. Valentin Bartenev <vbart@nginx.com> parents: 4460 diff changeset	5689 static ngx_int_t
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	5690 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	5691 ngx_table_elt_t *h, ngx_uint_t offset)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	5692 {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	5693 ngx_table_elt_t *ho;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	5694
5874 2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5869 diff changeset	5695 if (r->upstream->conf->force_ranges) {
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5869 diff changeset	5696 return NGX_OK;
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5869 diff changeset	5697 }
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5869 diff changeset	5698
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	5699 #if (NGX_HTTP_CACHE)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	5700
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	5701 if (r->cached) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	5702 r->allow_ranges = 1;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	5703 return NGX_OK;
5621 345e4fd4bb64 Range filter: single_range flag in request. Maxim Dounin <mdounin@mdounin.ru> parents: 5581 diff changeset	5704 }
345e4fd4bb64 Range filter: single_range flag in request. Maxim Dounin <mdounin@mdounin.ru> parents: 5581 diff changeset	5705
345e4fd4bb64 Range filter: single_range flag in request. Maxim Dounin <mdounin@mdounin.ru> parents: 5581 diff changeset	5706 if (r->upstream->cacheable) {
345e4fd4bb64 Range filter: single_range flag in request. Maxim Dounin <mdounin@mdounin.ru> parents: 5581 diff changeset	5707 r->allow_ranges = 1;
345e4fd4bb64 Range filter: single_range flag in request. Maxim Dounin <mdounin@mdounin.ru> parents: 5581 diff changeset	5708 r->single_range = 1;
345e4fd4bb64 Range filter: single_range flag in request. Maxim Dounin <mdounin@mdounin.ru> parents: 5581 diff changeset	5709 return NGX_OK;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	5710 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	5711
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	5712 #endif
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	5713
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	5714 ho = ngx_list_push(&r->headers_out.headers);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	5715 if (ho == NULL) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	5716 return NGX_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	5717 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	5718
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	5719 ho = h;
8031 d26db4f82d7d All known output headers can be linked lists now. Maxim Dounin <mdounin@mdounin.ru> parents: 8030 diff changeset	5720 ho->next = NULL;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	5721
3004 4121acaf7a04 fix handling "Last-Modified" and "Accept-Ranges" for upstream responses Igor Sysoev <igor@sysoev.ru> parents: 3003 diff changeset	5722 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	5723
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	5724 return NGX_OK;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	5725 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	5726
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	5727
487 31ff3e943e16 nginx-0.1.18-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 485 diff changeset	5728 static ngx_int_t
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5729 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	5730 {
880 3b763d36e055 axe old % log format Igor Sysoev <igor@sysoev.ru> parents: 850 diff changeset	5731 ngx_http_variable_t var, v;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	5732
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5733 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	5734 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	5735 if (var == NULL) {
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5736 return NGX_ERROR;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5737 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5738
637 e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 629 diff changeset	5739 var->get_handler = v->get_handler;
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5740 var->data = v->data;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5741 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5742
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	5743 return NGX_OK;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	5744 }
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5745
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	5746
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5747 static ngx_int_t
1181 ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5748 ngx_http_upstream_addr_variable(ngx_http_request_t *r,
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5749 ngx_http_variable_value_t *v, uintptr_t data)
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5750 {
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5751 u_char *p;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5752 size_t len;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5753 ngx_uint_t i;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5754 ngx_http_upstream_state_t *state;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5755
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5756 v->valid = 1;
1565 4c43e25d11ea fix English grammar Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	5757 v->no_cacheable = 0;
1181 ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5758 v->not_found = 0;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5759
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5760 if (r->upstream_states == NULL \|\| r->upstream_states->nelts == 0) {
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5761 v->not_found = 1;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5762 return NGX_OK;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5763 }
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5764
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5765 len = 0;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5766 state = r->upstream_states->elts;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5767
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5768 for (i = 0; i < r->upstream_states->nelts; i++) {
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5769 if (state[i].peer) {
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5770 len += state[i].peer->len + 2;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5771
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5772 } else {
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5773 len += 3;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5774 }
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5775 }
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5776
2049 2a92804f4109 ) back out r2040 Igor Sysoev <igor@sysoev.ru>* parents: 1973 diff changeset	5777 p = ngx_pnalloc(r->pool, len);
1181 ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5778 if (p == NULL) {
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5779 return NGX_ERROR;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5780 }
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5781
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5782 v->data = p;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5783
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5784 i = 0;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5785
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5786 for ( ;; ) {
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5787 if (state[i].peer) {
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5788 p = ngx_cpymem(p, state[i].peer->data, state[i].peer->len);
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5789 }
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5790
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5791 if (++i == r->upstream_states->nelts) {
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5792 break;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5793 }
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5794
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5795 if (state[i].peer) {
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5796 *p++ = ',';
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5797 *p++ = ' ';
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5798
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5799 } else {
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5800 *p++ = ' ';
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5801 *p++ = ':';
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5802 *p++ = ' ';
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5803
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5804 if (++i == r->upstream_states->nelts) {
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5805 break;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5806 }
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5807
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5808 continue;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5809 }
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5810 }
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5811
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5812 v->len = p - v->data;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5813
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5814 return NGX_OK;
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5815 }
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5816
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5817
ea5ecb1aae88 $upstream_addr Igor Sysoev <igor@sysoev.ru> parents: 1168 diff changeset	5818 static ngx_int_t
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5819 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	5820 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	5821 {
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5822 u_char *p;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5823 size_t len;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5824 ngx_uint_t i;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5825 ngx_http_upstream_state_t *state;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5826
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5827 v->valid = 1;
1565 4c43e25d11ea fix English grammar Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	5828 v->no_cacheable = 0;
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5829 v->not_found = 0;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5830
1168 4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	5831 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	5832 v->not_found = 1;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5833 return NGX_OK;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5834 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5835
1168 4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	5836 len = r->upstream_states->nelts * (3 + 2);
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5837
2049 2a92804f4109 ) back out r2040 Igor Sysoev <igor@sysoev.ru>* parents: 1973 diff changeset	5838 p = ngx_pnalloc(r->pool, len);
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5839 if (p == NULL) {
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5840 return NGX_ERROR;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5841 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5842
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5843 v->data = p;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5844
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5845 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	5846 state = r->upstream_states->elts;
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5847
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5848 for ( ;; ) {
1168 4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	5849 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	5850 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	5851
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5852 } else {
1168 4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	5853 *p++ = '-';
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5854 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5855
1168 4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	5856 if (++i == r->upstream_states->nelts) {
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5857 break;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5858 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5859
1168 4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	5860 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	5861 *p++ = ',';
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	5862 *p++ = ' ';
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	5863
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	5864 } else {
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	5865 *p++ = ' ';
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	5866 *p++ = ':';
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	5867 *p++ = ' ';
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	5868
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	5869 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	5870 break;
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	5871 }
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	5872
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	5873 continue;
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	5874 }
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5875 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5876
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5877 v->len = p - v->data;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5878
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5879 return NGX_OK;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5880 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5881
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5882
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5883 static ngx_int_t
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5884 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	5885 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	5886 {
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5887 u_char *p;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5888 size_t len;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5889 ngx_uint_t i;
889 a9a7e4b1a72b the previous fix does not actually fix overflow Igor Sysoev <igor@sysoev.ru> parents: 888 diff changeset	5890 ngx_msec_int_t ms;
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5891 ngx_http_upstream_state_t *state;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5892
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5893 v->valid = 1;
1565 4c43e25d11ea fix English grammar Igor Sysoev <igor@sysoev.ru> parents: 1559 diff changeset	5894 v->no_cacheable = 0;
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5895 v->not_found = 0;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5896
1168 4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	5897 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	5898 v->not_found = 1;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5899 return NGX_OK;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5900 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5901
1168 4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	5902 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	5903
2049 2a92804f4109 ) back out r2040 Igor Sysoev <igor@sysoev.ru>* parents: 1973 diff changeset	5904 p = ngx_pnalloc(r->pool, len);
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5905 if (p == NULL) {
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5906 return NGX_ERROR;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5907 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5908
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5909 v->data = p;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5910
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5911 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	5912 state = r->upstream_states->elts;
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5913
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5914 for ( ;; ) {
7397 860d3907da1c Upstream: revised upstream response time variables. Vladimir Homutov <vl@nginx.com> parents: 7371 diff changeset	5915
860d3907da1c Upstream: revised upstream response time variables. Vladimir Homutov <vl@nginx.com> parents: 7371 diff changeset	5916 if (data == 1) {
860d3907da1c Upstream: revised upstream response time variables. Vladimir Homutov <vl@nginx.com> parents: 7371 diff changeset	5917 ms = state[i].header_time;
860d3907da1c Upstream: revised upstream response time variables. Vladimir Homutov <vl@nginx.com> parents: 7371 diff changeset	5918
860d3907da1c Upstream: revised upstream response time variables. Vladimir Homutov <vl@nginx.com> parents: 7371 diff changeset	5919 } else if (data == 2) {
860d3907da1c Upstream: revised upstream response time variables. Vladimir Homutov <vl@nginx.com> parents: 7371 diff changeset	5920 ms = state[i].connect_time;
860d3907da1c Upstream: revised upstream response time variables. Vladimir Homutov <vl@nginx.com> parents: 7371 diff changeset	5921
860d3907da1c Upstream: revised upstream response time variables. Vladimir Homutov <vl@nginx.com> parents: 7371 diff changeset	5922 } else {
860d3907da1c Upstream: revised upstream response time variables. Vladimir Homutov <vl@nginx.com> parents: 7371 diff changeset	5923 ms = state[i].response_time;
860d3907da1c Upstream: revised upstream response time variables. Vladimir Homutov <vl@nginx.com> parents: 7371 diff changeset	5924 }
860d3907da1c Upstream: revised upstream response time variables. Vladimir Homutov <vl@nginx.com> parents: 7371 diff changeset	5925
860d3907da1c Upstream: revised upstream response time variables. Vladimir Homutov <vl@nginx.com> parents: 7371 diff changeset	5926 if (ms != -1) {
3515 76d252724db5 use ngx_min() and ngx_max() Igor Sysoev <igor@sysoev.ru> parents: 3514 diff changeset	5927 ms = ngx_max(ms, 0);
5368 cd46297325bd Upstream: fixed $upstream_response_time format specifiers. Maxim Dounin <mdounin@mdounin.ru> parents: 5353 diff changeset	5928 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	5929
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	5930 } else {
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	5931 *p++ = '-';
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5932 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5933
1168 4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	5934 if (++i == r->upstream_states->nelts) {
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5935 break;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5936 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5937
1168 4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	5938 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	5939 *p++ = ',';
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	5940 *p++ = ' ';
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	5941
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	5942 } else {
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	5943 *p++ = ' ';
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	5944 *p++ = ':';
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	5945 *p++ = ' ';
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	5946
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	5947 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	5948 break;
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	5949 }
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	5950
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	5951 continue;
4d0d12446c3b store the upstream states before X-Accel-Redirect to a next upstream Igor Sysoev <igor@sysoev.ru> parents: 1166 diff changeset	5952 }
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5953 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5954
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5955 v->len = p - v->data;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5956
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5957 return NGX_OK;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5958 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5959
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	5960
2402 cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5961 static ngx_int_t
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5962 ngx_http_upstream_response_length_variable(ngx_http_request_t *r,
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5963 ngx_http_variable_value_t *v, uintptr_t data)
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5964 {
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5965 u_char *p;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5966 size_t len;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5967 ngx_uint_t i;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5968 ngx_http_upstream_state_t *state;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5969
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5970 v->valid = 1;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5971 v->no_cacheable = 0;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5972 v->not_found = 0;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5973
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5974 if (r->upstream_states == NULL \|\| r->upstream_states->nelts == 0) {
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5975 v->not_found = 1;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5976 return NGX_OK;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5977 }
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5978
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5979 len = r->upstream_states->nelts * (NGX_OFF_T_LEN + 2);
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5980
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5981 p = ngx_pnalloc(r->pool, len);
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5982 if (p == NULL) {
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5983 return NGX_ERROR;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5984 }
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5985
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5986 v->data = p;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5987
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5988 i = 0;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5989 state = r->upstream_states->elts;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5990
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	5991 for ( ;; ) {
6654 c131f20c9562 Upstream: the $upstream_bytes_received variable. Vladimir Homutov <vl@nginx.com> parents: 6594 diff changeset	5992
c131f20c9562 Upstream: the $upstream_bytes_received variable. Vladimir Homutov <vl@nginx.com> parents: 6594 diff changeset	5993 if (data == 1) {
c131f20c9562 Upstream: the $upstream_bytes_received variable. Vladimir Homutov <vl@nginx.com> parents: 6594 diff changeset	5994 p = ngx_sprintf(p, "%O", state[i].bytes_received);
c131f20c9562 Upstream: the $upstream_bytes_received variable. Vladimir Homutov <vl@nginx.com> parents: 6594 diff changeset	5995
7429 e573d74299a0 Upstream: implemented $upstream_bytes_sent. Ruslan Ermilov <ru@nginx.com> parents: 7397 diff changeset	5996 } else if (data == 2) {
e573d74299a0 Upstream: implemented $upstream_bytes_sent. Ruslan Ermilov <ru@nginx.com> parents: 7397 diff changeset	5997 p = ngx_sprintf(p, "%O", state[i].bytes_sent);
e573d74299a0 Upstream: implemented $upstream_bytes_sent. Ruslan Ermilov <ru@nginx.com> parents: 7397 diff changeset	5998
6654 c131f20c9562 Upstream: the $upstream_bytes_received variable. Vladimir Homutov <vl@nginx.com> parents: 6594 diff changeset	5999 } else {
c131f20c9562 Upstream: the $upstream_bytes_received variable. Vladimir Homutov <vl@nginx.com> parents: 6594 diff changeset	6000 p = ngx_sprintf(p, "%O", state[i].response_length);
c131f20c9562 Upstream: the $upstream_bytes_received variable. Vladimir Homutov <vl@nginx.com> parents: 6594 diff changeset	6001 }
2402 cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	6002
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	6003 if (++i == r->upstream_states->nelts) {
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	6004 break;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	6005 }
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	6006
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	6007 if (state[i].peer) {
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	6008 *p++ = ',';
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	6009 *p++ = ' ';
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	6010
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	6011 } else {
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	6012 *p++ = ' ';
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	6013 *p++ = ':';
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	6014 *p++ = ' ';
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	6015
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	6016 if (++i == r->upstream_states->nelts) {
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	6017 break;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	6018 }
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	6019
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	6020 continue;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	6021 }
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	6022 }
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	6023
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	6024 v->len = p - v->data;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	6025
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	6026 return NGX_OK;
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	6027 }
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	6028
cd6a1abe11a7 $upstream_response_length Igor Sysoev <igor@sysoev.ru> parents: 2394 diff changeset	6029
6899 d2b2ff157da5 Variables: generic prefix variables. Dmitry Volyntsev <xeioex@nginx.com> parents: 6876 diff changeset	6030 static ngx_int_t
1162 f59d15404269 $upstream_http_... variables Igor Sysoev <igor@sysoev.ru> parents: 1153 diff changeset	6031 ngx_http_upstream_header_variable(ngx_http_request_t *r,
f59d15404269 $upstream_http_... variables Igor Sysoev <igor@sysoev.ru> parents: 1153 diff changeset	6032 ngx_http_variable_value_t *v, uintptr_t data)
f59d15404269 $upstream_http_... variables Igor Sysoev <igor@sysoev.ru> parents: 1153 diff changeset	6033 {
f59d15404269 $upstream_http_... variables Igor Sysoev <igor@sysoev.ru> parents: 1153 diff changeset	6034 if (r->upstream == NULL) {
f59d15404269 $upstream_http_... variables Igor Sysoev <igor@sysoev.ru> parents: 1153 diff changeset	6035 v->not_found = 1;
f59d15404269 $upstream_http_... variables Igor Sysoev <igor@sysoev.ru> parents: 1153 diff changeset	6036 return NGX_OK;
f59d15404269 $upstream_http_... variables Igor Sysoev <igor@sysoev.ru> parents: 1153 diff changeset	6037 }
f59d15404269 $upstream_http_... variables Igor Sysoev <igor@sysoev.ru> parents: 1153 diff changeset	6038
8023 08b3ea81ff5f Combining unknown headers during variables lookup (ticket #1316). Maxim Dounin <mdounin@mdounin.ru> parents: 7975 diff changeset	6039 return ngx_http_variable_unknown_header(r, v, (ngx_str_t *) data,
1162 f59d15404269 $upstream_http_... variables Igor Sysoev <igor@sysoev.ru> parents: 1153 diff changeset	6040 &r->upstream->headers_in.headers.part,
f59d15404269 $upstream_http_... variables Igor Sysoev <igor@sysoev.ru> parents: 1153 diff changeset	6041 sizeof("upstream_http_") - 1);
f59d15404269 $upstream_http_... variables Igor Sysoev <igor@sysoev.ru> parents: 1153 diff changeset	6042 }
f59d15404269 $upstream_http_... variables Igor Sysoev <igor@sysoev.ru> parents: 1153 diff changeset	6043
f59d15404269 $upstream_http_... variables Igor Sysoev <igor@sysoev.ru> parents: 1153 diff changeset	6044
6899 d2b2ff157da5 Variables: generic prefix variables. Dmitry Volyntsev <xeioex@nginx.com> parents: 6876 diff changeset	6045 static ngx_int_t
7230 098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	6046 ngx_http_upstream_trailer_variable(ngx_http_request_t *r,
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	6047 ngx_http_variable_value_t *v, uintptr_t data)
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	6048 {
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	6049 if (r->upstream == NULL) {
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	6050 v->not_found = 1;
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	6051 return NGX_OK;
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	6052 }
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	6053
8023 08b3ea81ff5f Combining unknown headers during variables lookup (ticket #1316). Maxim Dounin <mdounin@mdounin.ru> parents: 7975 diff changeset	6054 return ngx_http_variable_unknown_header(r, v, (ngx_str_t *) data,
7230 098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	6055 &r->upstream->headers_in.trailers.part,
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	6056 sizeof("upstream_trailer_") - 1);
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	6057 }
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	6058
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	6059
098bbd076a2d Upstream: trailers support, u->conf->pass_trailers flag. Maxim Dounin <mdounin@mdounin.ru> parents: 7220 diff changeset	6060 static ngx_int_t
5677 3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	6061 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	6062 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	6063 {
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	6064 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	6065
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	6066 ngx_str_t cookie, s;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	6067
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	6068 if (r->upstream == NULL) {
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	6069 v->not_found = 1;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	6070 return NGX_OK;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	6071 }
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	6072
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	6073 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	6074 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	6075
8024 ef6a3a99a81a Reworked multi headers to use linked lists. Maxim Dounin <mdounin@mdounin.ru> parents: 8023 diff changeset	6076 if (ngx_http_parse_set_cookie_lines(r, r->upstream->headers_in.set_cookie,
5677 3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	6077 &s, &cookie)
8024 ef6a3a99a81a Reworked multi headers to use linked lists. Maxim Dounin <mdounin@mdounin.ru> parents: 8023 diff changeset	6078 == NULL)
5677 3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	6079 {
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	6080 v->not_found = 1;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	6081 return NGX_OK;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	6082 }
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	6083
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	6084 v->len = cookie.len;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	6085 v->valid = 1;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	6086 v->no_cacheable = 0;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	6087 v->not_found = 0;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	6088 v->data = cookie.data;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	6089
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	6090 return NGX_OK;
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	6091 }
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	6092
3a48775f1535 Upstream: added the "$upstream_cookie_<name>" variables. Vladimir Homutov <vl@nginx.com> parents: 5667 diff changeset	6093
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	6094 #if (NGX_HTTP_CACHE)
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	6095
6923 fbdaad9b0e7b Added missing "static" specifiers found by gcc -Wtraditional. Ruslan Ermilov <ru@nginx.com> parents: 6922 diff changeset	6096 static ngx_int_t
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	6097 ngx_http_upstream_cache_status(ngx_http_request_t *r,
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	6098 ngx_http_variable_value_t *v, uintptr_t data)
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	6099 {
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	6100 ngx_uint_t n;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	6101
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	6102 if (r->upstream == NULL \|\| r->upstream->cache_status == 0) {
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	6103 v->not_found = 1;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	6104 return NGX_OK;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	6105 }
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	6106
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	6107 n = r->upstream->cache_status - 1;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	6108
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	6109 v->valid = 1;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	6110 v->no_cacheable = 0;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	6111 v->not_found = 0;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	6112 v->len = ngx_http_cache_status[n].len;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	6113 v->data = ngx_http_cache_status[n].data;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	6114
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	6115 return NGX_OK;
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	6116 }
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	6117
5441 43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	6118
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	6119 static ngx_int_t
9276 5e7588d2d9cc Upstream: $upstream_cache_key variable. Kirill A. Korinsky <kirill@korins.ky> parents: 9255 diff changeset	6120 ngx_http_upstream_cache_key(ngx_http_request_t *r,
5e7588d2d9cc Upstream: $upstream_cache_key variable. Kirill A. Korinsky <kirill@korins.ky> parents: 9255 diff changeset	6121 ngx_http_variable_value_t *v, uintptr_t data)
5e7588d2d9cc Upstream: $upstream_cache_key variable. Kirill A. Korinsky <kirill@korins.ky> parents: 9255 diff changeset	6122 {
5e7588d2d9cc Upstream: $upstream_cache_key variable. Kirill A. Korinsky <kirill@korins.ky> parents: 9255 diff changeset	6123 u_char *p;
5e7588d2d9cc Upstream: $upstream_cache_key variable. Kirill A. Korinsky <kirill@korins.ky> parents: 9255 diff changeset	6124 size_t len;
5e7588d2d9cc Upstream: $upstream_cache_key variable. Kirill A. Korinsky <kirill@korins.ky> parents: 9255 diff changeset	6125 ngx_str_t *key;
5e7588d2d9cc Upstream: $upstream_cache_key variable. Kirill A. Korinsky <kirill@korins.ky> parents: 9255 diff changeset	6126 ngx_uint_t i;
5e7588d2d9cc Upstream: $upstream_cache_key variable. Kirill A. Korinsky <kirill@korins.ky> parents: 9255 diff changeset	6127 ngx_http_cache_t *c;
5e7588d2d9cc Upstream: $upstream_cache_key variable. Kirill A. Korinsky <kirill@korins.ky> parents: 9255 diff changeset	6128
5e7588d2d9cc Upstream: $upstream_cache_key variable. Kirill A. Korinsky <kirill@korins.ky> parents: 9255 diff changeset	6129 if (r->cache == NULL \|\| r->cache->keys.nelts == 0) {
5e7588d2d9cc Upstream: $upstream_cache_key variable. Kirill A. Korinsky <kirill@korins.ky> parents: 9255 diff changeset	6130 v->not_found = 1;
5e7588d2d9cc Upstream: $upstream_cache_key variable. Kirill A. Korinsky <kirill@korins.ky> parents: 9255 diff changeset	6131 return NGX_OK;
5e7588d2d9cc Upstream: $upstream_cache_key variable. Kirill A. Korinsky <kirill@korins.ky> parents: 9255 diff changeset	6132 }
5e7588d2d9cc Upstream: $upstream_cache_key variable. Kirill A. Korinsky <kirill@korins.ky> parents: 9255 diff changeset	6133
5e7588d2d9cc Upstream: $upstream_cache_key variable. Kirill A. Korinsky <kirill@korins.ky> parents: 9255 diff changeset	6134 c = r->cache;
5e7588d2d9cc Upstream: $upstream_cache_key variable. Kirill A. Korinsky <kirill@korins.ky> parents: 9255 diff changeset	6135
5e7588d2d9cc Upstream: $upstream_cache_key variable. Kirill A. Korinsky <kirill@korins.ky> parents: 9255 diff changeset	6136 len = 0;
5e7588d2d9cc Upstream: $upstream_cache_key variable. Kirill A. Korinsky <kirill@korins.ky> parents: 9255 diff changeset	6137 key = c->keys.elts;
5e7588d2d9cc Upstream: $upstream_cache_key variable. Kirill A. Korinsky <kirill@korins.ky> parents: 9255 diff changeset	6138
5e7588d2d9cc Upstream: $upstream_cache_key variable. Kirill A. Korinsky <kirill@korins.ky> parents: 9255 diff changeset	6139 for (i = 0; i < c->keys.nelts; i++) {
5e7588d2d9cc Upstream: $upstream_cache_key variable. Kirill A. Korinsky <kirill@korins.ky> parents: 9255 diff changeset	6140 len += key[i].len;
5e7588d2d9cc Upstream: $upstream_cache_key variable. Kirill A. Korinsky <kirill@korins.ky> parents: 9255 diff changeset	6141 }
5e7588d2d9cc Upstream: $upstream_cache_key variable. Kirill A. Korinsky <kirill@korins.ky> parents: 9255 diff changeset	6142
5e7588d2d9cc Upstream: $upstream_cache_key variable. Kirill A. Korinsky <kirill@korins.ky> parents: 9255 diff changeset	6143 p = ngx_pnalloc(r->pool, len);
5e7588d2d9cc Upstream: $upstream_cache_key variable. Kirill A. Korinsky <kirill@korins.ky> parents: 9255 diff changeset	6144 if (p == NULL) {
5e7588d2d9cc Upstream: $upstream_cache_key variable. Kirill A. Korinsky <kirill@korins.ky> parents: 9255 diff changeset	6145 return NGX_ERROR;
5e7588d2d9cc Upstream: $upstream_cache_key variable. Kirill A. Korinsky <kirill@korins.ky> parents: 9255 diff changeset	6146 }
5e7588d2d9cc Upstream: $upstream_cache_key variable. Kirill A. Korinsky <kirill@korins.ky> parents: 9255 diff changeset	6147
5e7588d2d9cc Upstream: $upstream_cache_key variable. Kirill A. Korinsky <kirill@korins.ky> parents: 9255 diff changeset	6148 v->len = len;
5e7588d2d9cc Upstream: $upstream_cache_key variable. Kirill A. Korinsky <kirill@korins.ky> parents: 9255 diff changeset	6149 v->valid = 1;
5e7588d2d9cc Upstream: $upstream_cache_key variable. Kirill A. Korinsky <kirill@korins.ky> parents: 9255 diff changeset	6150 v->no_cacheable = 0;
5e7588d2d9cc Upstream: $upstream_cache_key variable. Kirill A. Korinsky <kirill@korins.ky> parents: 9255 diff changeset	6151 v->not_found = 0;
5e7588d2d9cc Upstream: $upstream_cache_key variable. Kirill A. Korinsky <kirill@korins.ky> parents: 9255 diff changeset	6152 v->data = p;
5e7588d2d9cc Upstream: $upstream_cache_key variable. Kirill A. Korinsky <kirill@korins.ky> parents: 9255 diff changeset	6153
5e7588d2d9cc Upstream: $upstream_cache_key variable. Kirill A. Korinsky <kirill@korins.ky> parents: 9255 diff changeset	6154 for (i = 0; i < c->keys.nelts; i++) {
5e7588d2d9cc Upstream: $upstream_cache_key variable. Kirill A. Korinsky <kirill@korins.ky> parents: 9255 diff changeset	6155 p = ngx_cpymem(p, key[i].data, key[i].len);
5e7588d2d9cc Upstream: $upstream_cache_key variable. Kirill A. Korinsky <kirill@korins.ky> parents: 9255 diff changeset	6156 }
5e7588d2d9cc Upstream: $upstream_cache_key variable. Kirill A. Korinsky <kirill@korins.ky> parents: 9255 diff changeset	6157
5e7588d2d9cc Upstream: $upstream_cache_key variable. Kirill A. Korinsky <kirill@korins.ky> parents: 9255 diff changeset	6158 return NGX_OK;
5e7588d2d9cc Upstream: $upstream_cache_key variable. Kirill A. Korinsky <kirill@korins.ky> parents: 9255 diff changeset	6159 }
5e7588d2d9cc Upstream: $upstream_cache_key variable. Kirill A. Korinsky <kirill@korins.ky> parents: 9255 diff changeset	6160
5e7588d2d9cc Upstream: $upstream_cache_key variable. Kirill A. Korinsky <kirill@korins.ky> parents: 9255 diff changeset	6161
5e7588d2d9cc Upstream: $upstream_cache_key variable. Kirill A. Korinsky <kirill@korins.ky> parents: 9255 diff changeset	6162 static ngx_int_t
5441 43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	6163 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	6164 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	6165 {
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	6166 u_char *p;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	6167
5453 b7b8e2fa7ebd Fixed null pointer dereference with $upstream_cache_last_modified. Ruslan Ermilov <ru@nginx.com> parents: 5441 diff changeset	6168 if (r->upstream == NULL
b7b8e2fa7ebd Fixed null pointer dereference with $upstream_cache_last_modified. Ruslan Ermilov <ru@nginx.com> parents: 5441 diff changeset	6169 \|\| !r->upstream->conf->cache_revalidate
5441 43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	6170 \|\| r->upstream->cache_status != NGX_HTTP_CACHE_EXPIRED
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	6171 \|\| r->cache->last_modified == -1)
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	6172 {
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	6173 v->not_found = 1;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	6174 return NGX_OK;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	6175 }
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	6176
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	6177 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	6178 if (p == NULL) {
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	6179 return NGX_ERROR;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	6180 }
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	6181
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	6182 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	6183 v->valid = 1;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	6184 v->no_cacheable = 0;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	6185 v->not_found = 0;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	6186 v->data = p;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	6187
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	6188 return NGX_OK;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	6189 }
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5410 diff changeset	6190
5738 c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	6191
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	6192 static ngx_int_t
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	6193 ngx_http_upstream_cache_etag(ngx_http_request_t *r,
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	6194 ngx_http_variable_value_t *v, uintptr_t data)
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	6195 {
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	6196 if (r->upstream == NULL
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	6197 \|\| !r->upstream->conf->cache_revalidate
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	6198 \|\| r->upstream->cache_status != NGX_HTTP_CACHE_EXPIRED
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	6199 \|\| r->cache->etag.len == 0)
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	6200 {
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	6201 v->not_found = 1;
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	6202 return NGX_OK;
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	6203 }
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	6204
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	6205 v->valid = 1;
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	6206 v->no_cacheable = 0;
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	6207 v->not_found = 0;
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	6208 v->len = r->cache->etag.len;
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	6209 v->data = r->cache->etag.data;
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	6210
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	6211 return NGX_OK;
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	6212 }
c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5737 diff changeset	6213
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	6214 #endif
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	6215
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2949 diff changeset	6216
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6217 static char *
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6218 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	6219 {
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6220 char *rv;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6221 void *mconf;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6222 ngx_str_t *value;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6223 ngx_url_t u;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6224 ngx_uint_t m;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6225 ngx_conf_t pcf;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6226 ngx_http_module_t *module;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6227 ngx_http_conf_ctx_t ctx, http_ctx;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6228 ngx_http_upstream_srv_conf_t *uscf;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6229
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6230 ngx_memzero(&u, sizeof(ngx_url_t));
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6231
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6232 value = cf->args->elts;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6233 u.host = value[1];
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6234 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	6235 u.no_port = 1;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6236
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6237 uscf = ngx_http_upstream_add(cf, &u, NGX_HTTP_UPSTREAM_CREATE
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6238 \|NGX_HTTP_UPSTREAM_WEIGHT
6705 29bf0dbc0a77 Upstream: max_conns. Ruslan Ermilov <ru@nginx.com> parents: 6703 diff changeset	6239 \|NGX_HTTP_UPSTREAM_MAX_CONNS
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6240 \|NGX_HTTP_UPSTREAM_MAX_FAILS
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6241 \|NGX_HTTP_UPSTREAM_FAIL_TIMEOUT
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6242 \|NGX_HTTP_UPSTREAM_DOWN
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6243 \|NGX_HTTP_UPSTREAM_BACKUP);
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6244 if (uscf == NULL) {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6245 return NGX_CONF_ERROR;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6246 }
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6247
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6248
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6249 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	6250 if (ctx == NULL) {
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6251 return NGX_CONF_ERROR;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6252 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6253
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6254 http_ctx = cf->ctx;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6255 ctx->main_conf = http_ctx->main_conf;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6256
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6257 /* the upstream{}'s srv_conf */
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6258
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6259 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	6260 if (ctx->srv_conf == NULL) {
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6261 return NGX_CONF_ERROR;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6262 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6263
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6264 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	6265
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6266 uscf->srv_conf = ctx->srv_conf;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6267
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6268
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6269 /* the upstream{}'s loc_conf */
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6270
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6271 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	6272 if (ctx->loc_conf == NULL) {
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6273 return NGX_CONF_ERROR;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6274 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6275
6379 cf5e822cf470 Dynamic modules: changed ngx_modules to cycle->modules. Maxim Dounin <mdounin@mdounin.ru> parents: 6334 diff changeset	6276 for (m = 0; cf->cycle->modules[m]; m++) {
cf5e822cf470 Dynamic modules: changed ngx_modules to cycle->modules. Maxim Dounin <mdounin@mdounin.ru> parents: 6334 diff changeset	6277 if (cf->cycle->modules[m]->type != NGX_HTTP_MODULE) {
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6278 continue;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6279 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6280
6379 cf5e822cf470 Dynamic modules: changed ngx_modules to cycle->modules. Maxim Dounin <mdounin@mdounin.ru> parents: 6334 diff changeset	6281 module = cf->cycle->modules[m]->ctx;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6282
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6283 if (module->create_srv_conf) {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6284 mconf = module->create_srv_conf(cf);
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6285 if (mconf == NULL) {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6286 return NGX_CONF_ERROR;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6287 }
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6288
6379 cf5e822cf470 Dynamic modules: changed ngx_modules to cycle->modules. Maxim Dounin <mdounin@mdounin.ru> parents: 6334 diff changeset	6289 ctx->srv_conf[cf->cycle->modules[m]->ctx_index] = mconf;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6290 }
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6291
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6292 if (module->create_loc_conf) {
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6293 mconf = module->create_loc_conf(cf);
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6294 if (mconf == NULL) {
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6295 return NGX_CONF_ERROR;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6296 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6297
6379 cf5e822cf470 Dynamic modules: changed ngx_modules to cycle->modules. Maxim Dounin <mdounin@mdounin.ru> parents: 6334 diff changeset	6298 ctx->loc_conf[cf->cycle->modules[m]->ctx_index] = mconf;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6299 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6300 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6301
5728 63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	6302 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	6303 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	6304 if (uscf->servers == NULL) {
63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	6305 return NGX_CONF_ERROR;
63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	6306 }
63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	6307
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6308
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6309 /* parse inside upstream{} */
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6310
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6311 pcf = *cf;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6312 cf->ctx = ctx;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6313 cf->cmd_type = NGX_HTTP_UPS_CONF;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6314
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6315 rv = ngx_conf_parse(cf, NULL);
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6316
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6317 *cf = pcf;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6318
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6319 if (rv != NGX_CONF_OK) {
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6320 return rv;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6321 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6322
5728 63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	6323 if (uscf->servers->nelts == 0) {
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6324 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	6325 "no servers are inside upstream");
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6326 return NGX_CONF_ERROR;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6327 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6328
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6329 return rv;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6330 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6331
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6332
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6333 static char *
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6334 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	6335 {
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6336 ngx_http_upstream_srv_conf_t *uscf = conf;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6337
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6338 time_t fail_timeout;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6339 ngx_str_t *value, s;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6340 ngx_url_t u;
6705 29bf0dbc0a77 Upstream: max_conns. Ruslan Ermilov <ru@nginx.com> parents: 6703 diff changeset	6341 ngx_int_t weight, max_conns, max_fails;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6342 ngx_uint_t i;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6343 ngx_http_upstream_server_t *us;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6344
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6345 us = ngx_array_push(uscf->servers);
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6346 if (us == NULL) {
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6347 return NGX_CONF_ERROR;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6348 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6349
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6350 ngx_memzero(us, sizeof(ngx_http_upstream_server_t));
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6351
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6352 value = cf->args->elts;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6353
663 6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 659 diff changeset	6354 weight = 1;
6705 29bf0dbc0a77 Upstream: max_conns. Ruslan Ermilov <ru@nginx.com> parents: 6703 diff changeset	6355 max_conns = 0;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6356 max_fails = 1;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6357 fail_timeout = 10;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6358
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6359 for (i = 2; i < cf->args->nelts; i++) {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6360
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6361 if (ngx_strncmp(value[i].data, "weight=", 7) == 0) {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6362
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6363 if (!(uscf->flags & NGX_HTTP_UPSTREAM_WEIGHT)) {
5818 fe8bafab5b49 Upstream: improved configuration parser diagnostics. Ruslan Ermilov <ru@nginx.com> parents: 5774 diff changeset	6364 goto not_supported;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6365 }
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6366
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6367 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	6368
6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 659 diff changeset	6369 if (weight == NGX_ERROR \|\| weight == 0) {
6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 659 diff changeset	6370 goto invalid;
6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 659 diff changeset	6371 }
6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 659 diff changeset	6372
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6373 continue;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6374 }
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6375
6705 29bf0dbc0a77 Upstream: max_conns. Ruslan Ermilov <ru@nginx.com> parents: 6703 diff changeset	6376 if (ngx_strncmp(value[i].data, "max_conns=", 10) == 0) {
29bf0dbc0a77 Upstream: max_conns. Ruslan Ermilov <ru@nginx.com> parents: 6703 diff changeset	6377
29bf0dbc0a77 Upstream: max_conns. Ruslan Ermilov <ru@nginx.com> parents: 6703 diff changeset	6378 if (!(uscf->flags & NGX_HTTP_UPSTREAM_MAX_CONNS)) {
29bf0dbc0a77 Upstream: max_conns. Ruslan Ermilov <ru@nginx.com> parents: 6703 diff changeset	6379 goto not_supported;
29bf0dbc0a77 Upstream: max_conns. Ruslan Ermilov <ru@nginx.com> parents: 6703 diff changeset	6380 }
29bf0dbc0a77 Upstream: max_conns. Ruslan Ermilov <ru@nginx.com> parents: 6703 diff changeset	6381
29bf0dbc0a77 Upstream: max_conns. Ruslan Ermilov <ru@nginx.com> parents: 6703 diff changeset	6382 max_conns = ngx_atoi(&value[i].data[10], value[i].len - 10);
29bf0dbc0a77 Upstream: max_conns. Ruslan Ermilov <ru@nginx.com> parents: 6703 diff changeset	6383
29bf0dbc0a77 Upstream: max_conns. Ruslan Ermilov <ru@nginx.com> parents: 6703 diff changeset	6384 if (max_conns == NGX_ERROR) {
29bf0dbc0a77 Upstream: max_conns. Ruslan Ermilov <ru@nginx.com> parents: 6703 diff changeset	6385 goto invalid;
29bf0dbc0a77 Upstream: max_conns. Ruslan Ermilov <ru@nginx.com> parents: 6703 diff changeset	6386 }
29bf0dbc0a77 Upstream: max_conns. Ruslan Ermilov <ru@nginx.com> parents: 6703 diff changeset	6387
29bf0dbc0a77 Upstream: max_conns. Ruslan Ermilov <ru@nginx.com> parents: 6703 diff changeset	6388 continue;
29bf0dbc0a77 Upstream: max_conns. Ruslan Ermilov <ru@nginx.com> parents: 6703 diff changeset	6389 }
29bf0dbc0a77 Upstream: max_conns. Ruslan Ermilov <ru@nginx.com> parents: 6703 diff changeset	6390
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6391 if (ngx_strncmp(value[i].data, "max_fails=", 10) == 0) {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6392
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6393 if (!(uscf->flags & NGX_HTTP_UPSTREAM_MAX_FAILS)) {
5818 fe8bafab5b49 Upstream: improved configuration parser diagnostics. Ruslan Ermilov <ru@nginx.com> parents: 5774 diff changeset	6394 goto not_supported;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6395 }
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6396
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6397 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	6398
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6399 if (max_fails == NGX_ERROR) {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6400 goto invalid;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6401 }
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6402
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6403 continue;
663 6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 659 diff changeset	6404 }
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6405
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6406 if (ngx_strncmp(value[i].data, "fail_timeout=", 13) == 0) {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6407
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6408 if (!(uscf->flags & NGX_HTTP_UPSTREAM_FAIL_TIMEOUT)) {
5818 fe8bafab5b49 Upstream: improved configuration parser diagnostics. Ruslan Ermilov <ru@nginx.com> parents: 5774 diff changeset	6409 goto not_supported;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6410 }
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6411
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6412 s.len = value[i].len - 13;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6413 s.data = &value[i].data[13];
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6414
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6415 fail_timeout = ngx_parse_time(&s, 1);
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6416
4474 41f640a693de Time parsing cleanup. Maxim Dounin <mdounin@mdounin.ru> parents: 4469 diff changeset	6417 if (fail_timeout == (time_t) NGX_ERROR) {
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6418 goto invalid;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6419 }
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6420
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6421 continue;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6422 }
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6423
5410 16b68c724438 Upstream: fixed "down" and "backup" parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 5392 diff changeset	6424 if (ngx_strcmp(value[i].data, "backup") == 0) {
1378 0be898896d1a backup upstream servers Igor Sysoev <igor@sysoev.ru> parents: 1340 diff changeset	6425
0be898896d1a backup upstream servers Igor Sysoev <igor@sysoev.ru> parents: 1340 diff changeset	6426 if (!(uscf->flags & NGX_HTTP_UPSTREAM_BACKUP)) {
5818 fe8bafab5b49 Upstream: improved configuration parser diagnostics. Ruslan Ermilov <ru@nginx.com> parents: 5774 diff changeset	6427 goto not_supported;
1378 0be898896d1a backup upstream servers Igor Sysoev <igor@sysoev.ru> parents: 1340 diff changeset	6428 }
0be898896d1a backup upstream servers Igor Sysoev <igor@sysoev.ru> parents: 1340 diff changeset	6429
0be898896d1a backup upstream servers Igor Sysoev <igor@sysoev.ru> parents: 1340 diff changeset	6430 us->backup = 1;
0be898896d1a backup upstream servers Igor Sysoev <igor@sysoev.ru> parents: 1340 diff changeset	6431
0be898896d1a backup upstream servers Igor Sysoev <igor@sysoev.ru> parents: 1340 diff changeset	6432 continue;
0be898896d1a backup upstream servers Igor Sysoev <igor@sysoev.ru> parents: 1340 diff changeset	6433 }
0be898896d1a backup upstream servers Igor Sysoev <igor@sysoev.ru> parents: 1340 diff changeset	6434
5410 16b68c724438 Upstream: fixed "down" and "backup" parsing. Maxim Dounin <mdounin@mdounin.ru> parents: 5392 diff changeset	6435 if (ngx_strcmp(value[i].data, "down") == 0) {
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6436
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6437 if (!(uscf->flags & NGX_HTTP_UPSTREAM_DOWN)) {
5818 fe8bafab5b49 Upstream: improved configuration parser diagnostics. Ruslan Ermilov <ru@nginx.com> parents: 5774 diff changeset	6438 goto not_supported;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6439 }
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6440
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6441 us->down = 1;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6442
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6443 continue;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6444 }
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6445
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6446 goto invalid;
663 6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 659 diff changeset	6447 }
6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 659 diff changeset	6448
5728 63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	6449 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	6450
63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	6451 u.url = value[1];
63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	6452 u.default_port = 80;
63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	6453
63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	6454 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	6455 if (u.err) {
63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	6456 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	6457 "%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	6458 }
63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	6459
63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	6460 return NGX_CONF_ERROR;
63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	6461 }
63d7d69d0fe4 Upstream: reduced diffs to the plus version of nginx. Ruslan Ermilov <ru@nginx.com> parents: 5717 diff changeset	6462
5717 efc84a5723b3 Upstream: generic hash module. Roman Arutyunyan <arut@nginx.com> parents: 5682 diff changeset	6463 us->name = u.url;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6464 us->addrs = u.addrs;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6465 us->naddrs = u.naddrs;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6466 us->weight = weight;
6705 29bf0dbc0a77 Upstream: max_conns. Ruslan Ermilov <ru@nginx.com> parents: 6703 diff changeset	6467 us->max_conns = max_conns;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6468 us->max_fails = max_fails;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6469 us->fail_timeout = fail_timeout;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6470
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6471 return NGX_CONF_OK;
663 6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 659 diff changeset	6472
6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 659 diff changeset	6473 invalid:
6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 659 diff changeset	6474
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6475 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6476 "invalid parameter \"%V\"", &value[i]);
663 6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 659 diff changeset	6477
6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 659 diff changeset	6478 return NGX_CONF_ERROR;
5818 fe8bafab5b49 Upstream: improved configuration parser diagnostics. Ruslan Ermilov <ru@nginx.com> parents: 5774 diff changeset	6479
fe8bafab5b49 Upstream: improved configuration parser diagnostics. Ruslan Ermilov <ru@nginx.com> parents: 5774 diff changeset	6480 not_supported:
fe8bafab5b49 Upstream: improved configuration parser diagnostics. Ruslan Ermilov <ru@nginx.com> parents: 5774 diff changeset	6481
fe8bafab5b49 Upstream: improved configuration parser diagnostics. Ruslan Ermilov <ru@nginx.com> parents: 5774 diff changeset	6482 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
fe8bafab5b49 Upstream: improved configuration parser diagnostics. Ruslan Ermilov <ru@nginx.com> parents: 5774 diff changeset	6483 "balancing method does not support parameter \"%V\"",
fe8bafab5b49 Upstream: improved configuration parser diagnostics. Ruslan Ermilov <ru@nginx.com> parents: 5774 diff changeset	6484 &value[i]);
fe8bafab5b49 Upstream: improved configuration parser diagnostics. Ruslan Ermilov <ru@nginx.com> parents: 5774 diff changeset	6485
fe8bafab5b49 Upstream: improved configuration parser diagnostics. Ruslan Ermilov <ru@nginx.com> parents: 5774 diff changeset	6486 return NGX_CONF_ERROR;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6487 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6488
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6489
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6490 ngx_http_upstream_srv_conf_t *
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6491 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	6492 {
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6493 ngx_uint_t i;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6494 ngx_http_upstream_server_t *us;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6495 ngx_http_upstream_srv_conf_t uscf, *uscfp;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6496 ngx_http_upstream_main_conf_t *umcf;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6497
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6498 if (!(flags & NGX_HTTP_UPSTREAM_CREATE)) {
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6499
1559 fe11e2a3946d use pool instead of ngx_conf_t Igor Sysoev <igor@sysoev.ru> parents: 1558 diff changeset	6500 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	6501 if (u->err) {
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6502 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	6503 "%s in upstream \"%V\"", u->err, &u->url);
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6504 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6505
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6506 return NULL;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6507 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6508 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6509
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6510 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	6511
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6512 uscfp = umcf->upstreams.elts;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6513
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6514 for (i = 0; i < umcf->upstreams.nelts; i++) {
906 a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	6515
a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	6516 if (uscfp[i]->host.len != u->host.len
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6517 \|\| 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	6518 != 0)
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6519 {
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6520 continue;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6521 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6522
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6523 if ((flags & NGX_HTTP_UPSTREAM_CREATE)
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6524 && (uscfp[i]->flags & NGX_HTTP_UPSTREAM_CREATE))
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6525 {
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6526 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6527 "duplicate upstream \"%V\"", &u->host);
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6528 return NULL;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6529 }
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6530
5005 c9059bd5445b Fixed "proxy_pass" with IP address and no port (ticket #276). Ruslan Ermilov <ru@nginx.com> parents: 4990 diff changeset	6531 if ((uscfp[i]->flags & NGX_HTTP_UPSTREAM_CREATE) && !u->no_port) {
6699 9cf2dce316e5 Fixed log levels of configuration parsing errors. Valentin Bartenev <vbart@nginx.com> parents: 6654 diff changeset	6532 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
906 a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	6533 "upstream \"%V\" may not have port %d",
a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	6534 &u->host, u->port);
a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	6535 return NULL;
a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	6536 }
a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	6537
5005 c9059bd5445b Fixed "proxy_pass" with IP address and no port (ticket #276). Ruslan Ermilov <ru@nginx.com> parents: 4990 diff changeset	6538 if ((flags & NGX_HTTP_UPSTREAM_CREATE) && !uscfp[i]->no_port) {
6699 9cf2dce316e5 Fixed log levels of configuration parsing errors. Valentin Bartenev <vbart@nginx.com> parents: 6654 diff changeset	6539 ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
906 a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	6540 "upstream \"%V\" may not have port %d in %s:%ui",
a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	6541 &u->host, uscfp[i]->port,
1489 56f1ea5baabb u_char* is enough to keep file name Igor Sysoev <igor@sysoev.ru> parents: 1469 diff changeset	6542 uscfp[i]->file_name, uscfp[i]->line);
906 a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	6543 return NULL;
a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	6544 }
a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	6545
5005 c9059bd5445b Fixed "proxy_pass" with IP address and no port (ticket #276). Ruslan Ermilov <ru@nginx.com> parents: 4990 diff changeset	6546 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	6547 && 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	6548 {
906 a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	6549 continue;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6550 }
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6551
4152 65c1c241d70e Better handling of late upstream creation. Maxim Dounin <mdounin@mdounin.ru> parents: 4151 diff changeset	6552 if (flags & NGX_HTTP_UPSTREAM_CREATE) {
65c1c241d70e Better handling of late upstream creation. Maxim Dounin <mdounin@mdounin.ru> parents: 4151 diff changeset	6553 uscfp[i]->flags = flags;
6787 640e1e778de6 Upstream: consistently initialize explicit upstreams. Ruslan Ermilov <ru@nginx.com> parents: 6786 diff changeset	6554 uscfp[i]->port = 0;
4152 65c1c241d70e Better handling of late upstream creation. Maxim Dounin <mdounin@mdounin.ru> parents: 4151 diff changeset	6555 }
65c1c241d70e Better handling of late upstream creation. Maxim Dounin <mdounin@mdounin.ru> parents: 4151 diff changeset	6556
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6557 return uscfp[i];
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6558 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6559
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6560 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	6561 if (uscf == NULL) {
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6562 return NULL;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6563 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6564
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6565 uscf->flags = flags;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6566 uscf->host = u->host;
1489 56f1ea5baabb u_char* is enough to keep file name Igor Sysoev <igor@sysoev.ru> parents: 1469 diff changeset	6567 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	6568 uscf->line = cf->conf_file->line;
906 a0310ac2814f rewritten upstream Igor Sysoev <igor@sysoev.ru> parents: 901 diff changeset	6569 uscf->port = u->port;
5005 c9059bd5445b Fixed "proxy_pass" with IP address and no port (ticket #276). Ruslan Ermilov <ru@nginx.com> parents: 4990 diff changeset	6570 uscf->no_port = u->no_port;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6571
5977 26c127bab5ef Upstream: detect port absence in fastcgi_pass with IP literal. Ruslan Ermilov <ru@nginx.com> parents: 5968 diff changeset	6572 if (u->naddrs == 1 && (u->port \|\| u->family == AF_UNIX)) {
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6573 uscf->servers = ngx_array_create(cf->pool, 1,
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6574 sizeof(ngx_http_upstream_server_t));
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6575 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	6576 return NULL;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6577 }
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6578
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6579 us = ngx_array_push(uscf->servers);
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6580 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	6581 return NULL;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6582 }
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6583
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6584 ngx_memzero(us, sizeof(ngx_http_upstream_server_t));
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6585
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6586 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	6587 us->naddrs = 1;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6588 }
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6589
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6590 uscfp = ngx_array_push(&umcf->upstreams);
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6591 if (uscfp == NULL) {
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6592 return NULL;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6593 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6594
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6595 *uscfp = uscf;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6596
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6597 return uscf;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6598 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6599
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6600
3271 fcd98af88df3 proxy_bind, fastcgi_bind, and memcached_bind Igor Sysoev <igor@sysoev.ru> parents: 3198 diff changeset	6601 char *
3399 ac9c0380337d fix typo Igor Sysoev <igor@sysoev.ru> parents: 3369 diff changeset	6602 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	6603 void *conf)
fcd98af88df3 proxy_bind, fastcgi_bind, and memcached_bind Igor Sysoev <igor@sysoev.ru> parents: 3198 diff changeset	6604 {
fcd98af88df3 proxy_bind, fastcgi_bind, and memcached_bind Igor Sysoev <igor@sysoev.ru> parents: 3198 diff changeset	6605 char *p = conf;
fcd98af88df3 proxy_bind, fastcgi_bind, and memcached_bind Igor Sysoev <igor@sysoev.ru> parents: 3198 diff changeset	6606
5008 fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	6607 ngx_int_t rc;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	6608 ngx_str_t *value;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	6609 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	6610 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	6611 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	6612
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	6613 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	6614
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	6615 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	6616 return "is duplicate";
3271 fcd98af88df3 proxy_bind, fastcgi_bind, and memcached_bind Igor Sysoev <igor@sysoev.ru> parents: 3198 diff changeset	6617 }
fcd98af88df3 proxy_bind, fastcgi_bind, and memcached_bind Igor Sysoev <igor@sysoev.ru> parents: 3198 diff changeset	6618
3272 98f49b2bcae8 change ngx_parse_addr() interface Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	6619 value = cf->args->elts;
98f49b2bcae8 change ngx_parse_addr() interface Igor Sysoev <igor@sysoev.ru> parents: 3271 diff changeset	6620
6530 1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6528 diff changeset	6621 if (cf->args->nelts == 2 && ngx_strcmp(value[1].data, "off") == 0) {
5008 fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	6622 *plocal = NULL;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	6623 return NGX_CONF_OK;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	6624 }
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	6625
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	6626 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	6627
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	6628 ccv.cf = cf;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	6629 ccv.value = &value[1];
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	6630 ccv.complex_value = &cv;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	6631
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	6632 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	6633 return NGX_CONF_ERROR;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	6634 }
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	6635
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	6636 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	6637 if (local == NULL) {
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	6638 return NGX_CONF_ERROR;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	6639 }
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	6640
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	6641 *plocal = local;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	6642
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	6643 if (cv.lengths) {
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	6644 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	6645 if (local->value == NULL) {
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	6646 return NGX_CONF_ERROR;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	6647 }
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	6648
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	6649 *local->value = cv;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	6650
6528 88f012eee7d8 Upstream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6474 diff changeset	6651 } else {
88f012eee7d8 Upstream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6474 diff changeset	6652 local->addr = ngx_palloc(cf->pool, sizeof(ngx_addr_t));
88f012eee7d8 Upstream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6474 diff changeset	6653 if (local->addr == NULL) {
88f012eee7d8 Upstream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6474 diff changeset	6654 return NGX_CONF_ERROR;
88f012eee7d8 Upstream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6474 diff changeset	6655 }
88f012eee7d8 Upstream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6474 diff changeset	6656
6594 3c87b82b17d4 Upstream: support for port in proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6536 diff changeset	6657 rc = ngx_parse_addr_port(cf->pool, local->addr, value[1].data,
3c87b82b17d4 Upstream: support for port in proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6536 diff changeset	6658 value[1].len);
6528 88f012eee7d8 Upstream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6474 diff changeset	6659
88f012eee7d8 Upstream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6474 diff changeset	6660 switch (rc) {
88f012eee7d8 Upstream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6474 diff changeset	6661 case NGX_OK:
88f012eee7d8 Upstream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6474 diff changeset	6662 local->addr->name = value[1];
88f012eee7d8 Upstream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6474 diff changeset	6663 break;
88f012eee7d8 Upstream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6474 diff changeset	6664
88f012eee7d8 Upstream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6474 diff changeset	6665 case NGX_DECLINED:
88f012eee7d8 Upstream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6474 diff changeset	6666 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
88f012eee7d8 Upstream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6474 diff changeset	6667 "invalid address \"%V\"", &value[1]);
88f012eee7d8 Upstream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6474 diff changeset	6668 /* fall through */
88f012eee7d8 Upstream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6474 diff changeset	6669
88f012eee7d8 Upstream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6474 diff changeset	6670 default:
88f012eee7d8 Upstream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6474 diff changeset	6671 return NGX_CONF_ERROR;
88f012eee7d8 Upstream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6474 diff changeset	6672 }
88f012eee7d8 Upstream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6474 diff changeset	6673 }
88f012eee7d8 Upstream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6474 diff changeset	6674
6530 1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6528 diff changeset	6675 if (cf->args->nelts > 2) {
1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6528 diff changeset	6676 if (ngx_strcmp(value[2].data, "transparent") == 0) {
1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6528 diff changeset	6677 #if (NGX_HAVE_TRANSPARENT_PROXY)
7174 84e53e4735a4 Retain CAP_NET_RAW capability for transparent proxying. Roman Arutyunyan <arut@nginx.com> parents: 7166 diff changeset	6678 ngx_core_conf_t *ccf;
84e53e4735a4 Retain CAP_NET_RAW capability for transparent proxying. Roman Arutyunyan <arut@nginx.com> parents: 7166 diff changeset	6679
84e53e4735a4 Retain CAP_NET_RAW capability for transparent proxying. Roman Arutyunyan <arut@nginx.com> parents: 7166 diff changeset	6680 ccf = (ngx_core_conf_t *) ngx_get_conf(cf->cycle->conf_ctx,
84e53e4735a4 Retain CAP_NET_RAW capability for transparent proxying. Roman Arutyunyan <arut@nginx.com> parents: 7166 diff changeset	6681 ngx_core_module);
84e53e4735a4 Retain CAP_NET_RAW capability for transparent proxying. Roman Arutyunyan <arut@nginx.com> parents: 7166 diff changeset	6682
84e53e4735a4 Retain CAP_NET_RAW capability for transparent proxying. Roman Arutyunyan <arut@nginx.com> parents: 7166 diff changeset	6683 ccf->transparent = 1;
6530 1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6528 diff changeset	6684 local->transparent = 1;
1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6528 diff changeset	6685 #else
1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6528 diff changeset	6686 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6528 diff changeset	6687 "transparent proxying is not supported "
1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6528 diff changeset	6688 "on this platform, ignored");
1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6528 diff changeset	6689 #endif
1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6528 diff changeset	6690 } else {
1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6528 diff changeset	6691 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6528 diff changeset	6692 "invalid parameter \"%V\"", &value[2]);
1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6528 diff changeset	6693 return NGX_CONF_ERROR;
1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6528 diff changeset	6694 }
1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6528 diff changeset	6695 }
1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6528 diff changeset	6696
6528 88f012eee7d8 Upstream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6474 diff changeset	6697 return NGX_CONF_OK;
3271 fcd98af88df3 proxy_bind, fastcgi_bind, and memcached_bind Igor Sysoev <igor@sysoev.ru> parents: 3198 diff changeset	6698 }
fcd98af88df3 proxy_bind, fastcgi_bind, and memcached_bind Igor Sysoev <igor@sysoev.ru> parents: 3198 diff changeset	6699
fcd98af88df3 proxy_bind, fastcgi_bind, and memcached_bind Igor Sysoev <igor@sysoev.ru> parents: 3198 diff changeset	6700
6528 88f012eee7d8 Upstream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6474 diff changeset	6701 static ngx_int_t
88f012eee7d8 Upstream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6474 diff changeset	6702 ngx_http_upstream_set_local(ngx_http_request_t r, ngx_http_upstream_t u,
5008 fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	6703 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	6704 {
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	6705 ngx_int_t rc;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	6706 ngx_str_t val;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	6707 ngx_addr_t *addr;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	6708
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	6709 if (local == NULL) {
6528 88f012eee7d8 Upstream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6474 diff changeset	6710 u->peer.local = NULL;
88f012eee7d8 Upstream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6474 diff changeset	6711 return NGX_OK;
5008 fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	6712 }
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	6713
6530 1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6528 diff changeset	6714 #if (NGX_HAVE_TRANSPARENT_PROXY)
1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6528 diff changeset	6715 u->peer.transparent = local->transparent;
1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6528 diff changeset	6716 #endif
1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6528 diff changeset	6717
5008 fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	6718 if (local->value == NULL) {
6528 88f012eee7d8 Upstream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6474 diff changeset	6719 u->peer.local = local->addr;
88f012eee7d8 Upstream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6474 diff changeset	6720 return NGX_OK;
5008 fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	6721 }
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	6722
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	6723 if (ngx_http_complex_value(r, local->value, &val) != NGX_OK) {
6528 88f012eee7d8 Upstream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6474 diff changeset	6724 return NGX_ERROR;
5008 fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	6725 }
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	6726
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	6727 if (val.len == 0) {
6528 88f012eee7d8 Upstream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6474 diff changeset	6728 return NGX_OK;
5008 fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	6729 }
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	6730
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	6731 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	6732 if (addr == NULL) {
6528 88f012eee7d8 Upstream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6474 diff changeset	6733 return NGX_ERROR;
5008 fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	6734 }
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	6735
6594 3c87b82b17d4 Upstream: support for port in proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6536 diff changeset	6736 rc = ngx_parse_addr_port(r->pool, addr, val.data, val.len);
6528 88f012eee7d8 Upstream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6474 diff changeset	6737 if (rc == NGX_ERROR) {
88f012eee7d8 Upstream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6474 diff changeset	6738 return NGX_ERROR;
88f012eee7d8 Upstream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6474 diff changeset	6739 }
88f012eee7d8 Upstream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6474 diff changeset	6740
88f012eee7d8 Upstream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6474 diff changeset	6741 if (rc != NGX_OK) {
5008 fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	6742 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	6743 "invalid local address \"%V\"", &val);
6528 88f012eee7d8 Upstream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6474 diff changeset	6744 return NGX_OK;
88f012eee7d8 Upstream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6474 diff changeset	6745 }
88f012eee7d8 Upstream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6474 diff changeset	6746
88f012eee7d8 Upstream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6474 diff changeset	6747 addr->name = val;
88f012eee7d8 Upstream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6474 diff changeset	6748 u->peer.local = addr;
88f012eee7d8 Upstream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6474 diff changeset	6749
88f012eee7d8 Upstream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6474 diff changeset	6750 return NGX_OK;
5008 fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	6751 }
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	6752
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 5005 diff changeset	6753
4328 d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	6754 char *
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	6755 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	6756 void *conf)
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	6757 {
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	6758 char *p = conf;
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	6759
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	6760 ngx_str_t *value;
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	6761 ngx_array_t **a;
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	6762 ngx_http_upstream_param_t *param;
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	6763
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	6764 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	6765
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	6766 if (*a == NULL) {
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	6767 *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	6768 if (*a == NULL) {
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	6769 return NGX_CONF_ERROR;
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	6770 }
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	6771 }
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	6772
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	6773 param = ngx_array_push(*a);
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	6774 if (param == NULL) {
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	6775 return NGX_CONF_ERROR;
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	6776 }
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	6777
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	6778 value = cf->args->elts;
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	6779
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	6780 param->key = value[1];
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	6781 param->value = value[2];
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	6782 param->skip_empty = 0;
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	6783
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	6784 if (cf->args->nelts == 4) {
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	6785 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	6786 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	6787 "invalid parameter \"%V\"", &value[3]);
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	6788 return NGX_CONF_ERROR;
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	6789 }
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	6790
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	6791 param->skip_empty = 1;
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	6792 }
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	6793
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	6794 return NGX_CONF_OK;
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	6795 }
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	6796
d15a00e6d9e6 Added the ngx_http_upstream_param_set_slot(). Valentin Bartenev <vbart@nginx.com> parents: 4298 diff changeset	6797
1701 40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	6798 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	6799 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	6800 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	6801 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	6802 {
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	6803 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	6804 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	6805 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	6806 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	6807
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	6808 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	6809 && 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	6810 {
4769 f88555d76886 Upstream: hide_headers/pass_headers inheritance fix. Maxim Dounin <mdounin@mdounin.ru> parents: 4766 diff changeset	6811 conf->hide_headers = prev->hide_headers;
f88555d76886 Upstream: hide_headers/pass_headers inheritance fix. Maxim Dounin <mdounin@mdounin.ru> parents: 4766 diff changeset	6812 conf->pass_headers = prev->pass_headers;
f88555d76886 Upstream: hide_headers/pass_headers inheritance fix. Maxim Dounin <mdounin@mdounin.ru> parents: 4766 diff changeset	6813
1701 40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	6814 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	6815
6744 7e5199f172fb Upstream: hide_headers_hash inherited regardless of cache settings. Maxim Dounin <mdounin@mdounin.ru> parents: 6705 diff changeset	6816 if (conf->hide_headers_hash.buckets) {
1701 40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	6817 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	6818 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	6819
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	6820 } else {
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	6821 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	6822 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	6823 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	6824
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	6825 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	6826 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	6827 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	6828 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	6829
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	6830 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	6831 != NGX_OK)
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	6832 {
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	6833 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	6834 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	6835
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	6836 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	6837 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	6838 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	6839 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	6840 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	6841
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	6842 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	6843 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	6844 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	6845 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	6846
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	6847 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	6848
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	6849 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	6850
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	6851 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	6852
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	6853 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	6854
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	6855 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	6856 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	6857 goto exist;
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	6858 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	6859 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	6860
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	6861 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	6862 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	6863 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	6864 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	6865
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	6866 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	6867 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	6868 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	6869
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	6870 exist:
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	6871
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	6872 continue;
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	6873 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	6874 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	6875
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	6876 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	6877
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	6878 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	6879 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	6880
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	6881 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	6882 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	6883
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	6884 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	6885 continue;
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	6886 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	6887
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	6888 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	6889 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	6890 break;
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	6891 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	6892 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	6893 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	6894 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	6895
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	6896 hash->hash = &conf->hide_headers_hash;
1706 9242e21d2f8d style fix: remove trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 1705 diff changeset	6897 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	6898 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	6899 hash->temp_pool = NULL;
1706 9242e21d2f8d style fix: remove trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 1705 diff changeset	6900
6745 93121485c39b Upstream: hide_headers_hash handling at http level. Maxim Dounin <mdounin@mdounin.ru> parents: 6744 diff changeset	6901 if (ngx_hash_init(hash, hide_headers.elts, hide_headers.nelts) != NGX_OK) {
93121485c39b Upstream: hide_headers_hash handling at http level. Maxim Dounin <mdounin@mdounin.ru> parents: 6744 diff changeset	6902 return NGX_ERROR;
93121485c39b Upstream: hide_headers_hash handling at http level. Maxim Dounin <mdounin@mdounin.ru> parents: 6744 diff changeset	6903 }
93121485c39b Upstream: hide_headers_hash handling at http level. Maxim Dounin <mdounin@mdounin.ru> parents: 6744 diff changeset	6904
93121485c39b Upstream: hide_headers_hash handling at http level. Maxim Dounin <mdounin@mdounin.ru> parents: 6744 diff changeset	6905 /*
93121485c39b Upstream: hide_headers_hash handling at http level. Maxim Dounin <mdounin@mdounin.ru> parents: 6744 diff changeset	6906 * special handling to preserve conf->hide_headers_hash
93121485c39b Upstream: hide_headers_hash handling at http level. Maxim Dounin <mdounin@mdounin.ru> parents: 6744 diff changeset	6907 * in the "http" section to inherit it to all servers
93121485c39b Upstream: hide_headers_hash handling at http level. Maxim Dounin <mdounin@mdounin.ru> parents: 6744 diff changeset	6908 */
93121485c39b Upstream: hide_headers_hash handling at http level. Maxim Dounin <mdounin@mdounin.ru> parents: 6744 diff changeset	6909
93121485c39b Upstream: hide_headers_hash handling at http level. Maxim Dounin <mdounin@mdounin.ru> parents: 6744 diff changeset	6910 if (prev->hide_headers_hash.buckets == NULL
93121485c39b Upstream: hide_headers_hash handling at http level. Maxim Dounin <mdounin@mdounin.ru> parents: 6744 diff changeset	6911 && conf->hide_headers == prev->hide_headers
93121485c39b Upstream: hide_headers_hash handling at http level. Maxim Dounin <mdounin@mdounin.ru> parents: 6744 diff changeset	6912 && conf->pass_headers == prev->pass_headers)
93121485c39b Upstream: hide_headers_hash handling at http level. Maxim Dounin <mdounin@mdounin.ru> parents: 6744 diff changeset	6913 {
93121485c39b Upstream: hide_headers_hash handling at http level. Maxim Dounin <mdounin@mdounin.ru> parents: 6744 diff changeset	6914 prev->hide_headers_hash = conf->hide_headers_hash;
93121485c39b Upstream: hide_headers_hash handling at http level. Maxim Dounin <mdounin@mdounin.ru> parents: 6744 diff changeset	6915 }
93121485c39b Upstream: hide_headers_hash handling at http level. Maxim Dounin <mdounin@mdounin.ru> parents: 6744 diff changeset	6916
93121485c39b Upstream: hide_headers_hash handling at http level. Maxim Dounin <mdounin@mdounin.ru> parents: 6744 diff changeset	6917 return NGX_OK;
1701 40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	6918 }
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	6919
40d004d95d88 ) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR Igor Sysoev <igor@sysoev.ru>* parents: 1699 diff changeset	6920
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	6921 static void *
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	6922 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	6923 {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	6924 ngx_http_upstream_main_conf_t *umcf;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	6925
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	6926 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	6927 if (umcf == NULL) {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	6928 return NULL;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	6929 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	6930
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6931 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	6932 sizeof(ngx_http_upstream_srv_conf_t *))
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6933 != NGX_OK)
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6934 {
2912 c7d57b539248 return NULL instead of NGX_CONF_ERROR on a create conf failure Igor Sysoev <igor@sysoev.ru> parents: 2882 diff changeset	6935 return NULL;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6936 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6937
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	6938 return umcf;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	6939 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	6940
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	6941
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	6942 static char *
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6943 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	6944 {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	6945 ngx_http_upstream_main_conf_t *umcf = conf;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	6946
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6947 ngx_uint_t i;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6948 ngx_array_t headers_in;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6949 ngx_hash_key_t *hk;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6950 ngx_hash_init_t hash;
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6951 ngx_http_upstream_init_pt init;
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6952 ngx_http_upstream_header_t *header;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6953 ngx_http_upstream_srv_conf_t **uscfp;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6954
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6955 uscfp = umcf->upstreams.elts;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6956
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6957 for (i = 0; i < umcf->upstreams.nelts; i++) {
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6958
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6959 init = uscfp[i]->peer.init_upstream ? uscfp[i]->peer.init_upstream:
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6960 ngx_http_upstream_init_round_robin;
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6961
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6962 if (init(cf, uscfp[i]) != NGX_OK) {
651 39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6963 return NGX_CONF_ERROR;
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6964 }
39b7d7b33c91 nginx-0.3.47-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 649 diff changeset	6965 }
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	6966
663 6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 659 diff changeset	6967
884 4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6968 /* upstream_headers_in_hash */
4d68c486fcb0 upstream choice modules Igor Sysoev <igor@sysoev.ru> parents: 880 diff changeset	6969
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	6970 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	6971 != NGX_OK)
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	6972 {
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	6973 return NGX_CONF_ERROR;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	6974 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	6975
649 1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	6976 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	6977 hk = ngx_array_push(&headers_in);
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	6978 if (hk == NULL) {
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	6979 return NGX_CONF_ERROR;
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	6980 }
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	6981
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	6982 hk->key = header->name;
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	6983 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	6984 hk->value = header;
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	6985 }
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	6986
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	6987 hash.hash = &umcf->headers_in_hash;
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	6988 hash.key = ngx_hash_key_lc;
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	6989 hash.max_size = 512;
751 bae59a740c40 align hash bucket size to cache line Igor Sysoev <igor@sysoev.ru> parents: 750 diff changeset	6990 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	6991 hash.name = "upstream_headers_in_hash";
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	6992 hash.pool = cf->pool;
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	6993 hash.temp_pool = NULL;
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	6994
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	6995 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	6996 return NGX_CONF_ERROR;
1e720b0be7ec nginx-0.3.46-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	6997 }
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	6998
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	6999 return NGX_CONF_OK;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 507 diff changeset	7000 }

Mercurial > hg > nginx

annotate src/http/ngx_http_upstream.c @ 9305:8cdab3d89c44