nginx: src/stream/ngx_stream_proxy

annotate src/stream/ngx_stream_proxy_module.c @ 7353:87d2ea860f38

SSL: restore handlers after blocking. It is possible that after SSL_read() will return SSL_ERROR_WANT_WRITE, further calls will return SSL_ERROR_WANT_READ without reading any application data. We have to call ngx_handle_write_event() and switch back to normal write handling much like we do if there are some application data, or the write there will be reported again and again. Similarly, we have to switch back to normal read handling if there is saved read handler and SSL_write() returns SSL_ERROR_WANT_WRITE.

author	Maxim Dounin <mdounin@mdounin.ru>
date	Mon, 10 Sep 2018 18:57:39 +0300
parents	696df3ac27ac
children	8b68d50090e4

rev	line source
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2 /*
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	3 * Copyright (C) Roman Arutyunyan
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	4 * Copyright (C) Nginx, Inc.
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	5 */
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	6
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	7
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	8 #include <ngx_config.h>
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	9 #include <ngx_core.h>
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	10 #include <ngx_stream.h>
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	11
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	12
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	13 typedef struct {
6529 cb8177ca0990 Stream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6461 diff changeset	14 ngx_addr_t *addr;
6610 d5b5866c06c4 Stream: got rid of pseudo variables. Vladimir Homutov <vl@nginx.com> parents: 6606 diff changeset	15 ngx_stream_complex_value_t *value;
6530 1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6529 diff changeset	16 #if (NGX_HAVE_TRANSPARENT_PROXY)
6610 d5b5866c06c4 Stream: got rid of pseudo variables. Vladimir Homutov <vl@nginx.com> parents: 6606 diff changeset	17 ngx_uint_t transparent; /* unsigned transparent:1; */
6530 1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6529 diff changeset	18 #endif
6529 cb8177ca0990 Stream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6461 diff changeset	19 } ngx_stream_upstream_local_t;
cb8177ca0990 Stream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6461 diff changeset	20
cb8177ca0990 Stream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6461 diff changeset	21
cb8177ca0990 Stream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6461 diff changeset	22 typedef struct {
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	23 ngx_msec_t connect_timeout;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	24 ngx_msec_t timeout;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	25 ngx_msec_t next_upstream_timeout;
6215 8ee6a08ea3eb Stream: added proxy_buffer_size to set the size of data buffers. Roman Arutyunyan <arut@nginx.com> parents: 6208 diff changeset	26 size_t buffer_size;
6208 7a14a0d754ad Stream: renamed rate limiting directives. Roman Arutyunyan <arut@nginx.com> parents: 6204 diff changeset	27 size_t upload_rate;
7a14a0d754ad Stream: renamed rate limiting directives. Roman Arutyunyan <arut@nginx.com> parents: 6204 diff changeset	28 size_t download_rate;
6436 8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	29 ngx_uint_t responses;
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	30 ngx_uint_t next_upstream_tries;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	31 ngx_flag_t next_upstream;
6184 fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	32 ngx_flag_t proxy_protocol;
6529 cb8177ca0990 Stream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6461 diff changeset	33 ngx_stream_upstream_local_t *local;
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	34
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	35 #if (NGX_STREAM_SSL)
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	36 ngx_flag_t ssl_enable;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	37 ngx_flag_t ssl_session_reuse;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	38 ngx_uint_t ssl_protocols;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	39 ngx_str_t ssl_ciphers;
6643 9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	40 ngx_stream_complex_value_t *ssl_name;
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	41 ngx_flag_t ssl_server_name;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	42
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	43 ngx_flag_t ssl_verify;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	44 ngx_uint_t ssl_verify_depth;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	45 ngx_str_t ssl_trusted_certificate;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	46 ngx_str_t ssl_crl;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	47 ngx_str_t ssl_certificate;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	48 ngx_str_t ssl_certificate_key;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	49 ngx_array_t *ssl_passwords;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	50
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	51 ngx_ssl_t *ssl;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	52 #endif
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	53
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	54 ngx_stream_upstream_srv_conf_t *upstream;
6643 9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	55 ngx_stream_complex_value_t *upstream_value;
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	56 } ngx_stream_proxy_srv_conf_t;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	57
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	58
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	59 static void ngx_stream_proxy_handler(ngx_stream_session_t *s);
6643 9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	60 static ngx_int_t ngx_stream_proxy_eval(ngx_stream_session_t *s,
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	61 ngx_stream_proxy_srv_conf_t *pscf);
6529 cb8177ca0990 Stream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6461 diff changeset	62 static ngx_int_t ngx_stream_proxy_set_local(ngx_stream_session_t *s,
cb8177ca0990 Stream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6461 diff changeset	63 ngx_stream_upstream_t u, ngx_stream_upstream_local_t local);
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	64 static void ngx_stream_proxy_connect(ngx_stream_session_t *s);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	65 static void ngx_stream_proxy_init_upstream(ngx_stream_session_t *s);
6643 9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	66 static void ngx_stream_proxy_resolve_handler(ngx_resolver_ctx_t *ctx);
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	67 static void ngx_stream_proxy_upstream_handler(ngx_event_t *ev);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	68 static void ngx_stream_proxy_downstream_handler(ngx_event_t *ev);
6200 abee77018d3a Stream: common handler for upstream and downstream. Roman Arutyunyan <arut@nginx.com> parents: 6184 diff changeset	69 static void ngx_stream_proxy_process_connection(ngx_event_t *ev,
abee77018d3a Stream: common handler for upstream and downstream. Roman Arutyunyan <arut@nginx.com> parents: 6184 diff changeset	70 ngx_uint_t from_upstream);
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	71 static void ngx_stream_proxy_connect_handler(ngx_event_t *ev);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	72 static ngx_int_t ngx_stream_proxy_test_connect(ngx_connection_t *c);
6435 d1c791479bbb Stream: post first read events from client and upstream. Roman Arutyunyan <arut@nginx.com> parents: 6393 diff changeset	73 static void ngx_stream_proxy_process(ngx_stream_session_t *s,
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	74 ngx_uint_t from_upstream, ngx_uint_t do_write);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	75 static void ngx_stream_proxy_next_upstream(ngx_stream_session_t *s);
6674 38143d1abdec Stream: the $status variable. Roman Arutyunyan <arut@nginx.com> parents: 6648 diff changeset	76 static void ngx_stream_proxy_finalize(ngx_stream_session_t *s, ngx_uint_t rc);
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	77 static u_char ngx_stream_proxy_log_error(ngx_log_t log, u_char *buf,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	78 size_t len);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	79
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	80 static void ngx_stream_proxy_create_srv_conf(ngx_conf_t cf);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	81 static char ngx_stream_proxy_merge_srv_conf(ngx_conf_t cf, void *parent,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	82 void *child);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	83 static char ngx_stream_proxy_pass(ngx_conf_t cf, ngx_command_t *cmd,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	84 void *conf);
6183 4dcffe43a7ea Stream: the "proxy_bind" directive. Vladimir Homutov <vl@nginx.com> parents: 6174 diff changeset	85 static char ngx_stream_proxy_bind(ngx_conf_t cf, ngx_command_t *cmd,
4dcffe43a7ea Stream: the "proxy_bind" directive. Vladimir Homutov <vl@nginx.com> parents: 6174 diff changeset	86 void *conf);
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	87
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	88 #if (NGX_STREAM_SSL)
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	89
6692 56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	90 static ngx_int_t ngx_stream_proxy_send_proxy_protocol(ngx_stream_session_t *s);
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	91 static char ngx_stream_proxy_ssl_password_file(ngx_conf_t cf,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	92 ngx_command_t cmd, void conf);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	93 static void ngx_stream_proxy_ssl_init_connection(ngx_stream_session_t *s);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	94 static void ngx_stream_proxy_ssl_handshake(ngx_connection_t *pc);
7320 696df3ac27ac SSL: save sessions for upstream peers using a callback function. Sergey Kandaurov <pluknet@nginx.com> parents: 7286 diff changeset	95 static void ngx_stream_proxy_ssl_save_session(ngx_connection_t *c);
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	96 static ngx_int_t ngx_stream_proxy_ssl_name(ngx_stream_session_t *s);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	97 static ngx_int_t ngx_stream_proxy_set_ssl(ngx_conf_t *cf,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	98 ngx_stream_proxy_srv_conf_t *pscf);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	99
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	100
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	101 static ngx_conf_bitmask_t ngx_stream_proxy_ssl_protocols[] = {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	102 { ngx_string("SSLv2"), NGX_SSL_SSLv2 },
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	103 { ngx_string("SSLv3"), NGX_SSL_SSLv3 },
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	104 { ngx_string("TLSv1"), NGX_SSL_TLSv1 },
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	105 { ngx_string("TLSv1.1"), NGX_SSL_TLSv1_1 },
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	106 { ngx_string("TLSv1.2"), NGX_SSL_TLSv1_2 },
6981 08dc60979133 SSL: added support for TLSv1.3 in ssl_protocols directive. Sergey Kandaurov <pluknet@nginx.com> parents: 6868 diff changeset	107 { ngx_string("TLSv1.3"), NGX_SSL_TLSv1_3 },
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	108 { ngx_null_string, 0 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	109 };
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	110
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	111 #endif
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	112
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	113
6217 b544f8e0d921 Stream: deprecated proxy_downstream_buffer, proxy_upstream_buffer. Roman Arutyunyan <arut@nginx.com> parents: 6216 diff changeset	114 static ngx_conf_deprecated_t ngx_conf_deprecated_proxy_downstream_buffer = {
b544f8e0d921 Stream: deprecated proxy_downstream_buffer, proxy_upstream_buffer. Roman Arutyunyan <arut@nginx.com> parents: 6216 diff changeset	115 ngx_conf_deprecated, "proxy_downstream_buffer", "proxy_buffer_size"
b544f8e0d921 Stream: deprecated proxy_downstream_buffer, proxy_upstream_buffer. Roman Arutyunyan <arut@nginx.com> parents: 6216 diff changeset	116 };
b544f8e0d921 Stream: deprecated proxy_downstream_buffer, proxy_upstream_buffer. Roman Arutyunyan <arut@nginx.com> parents: 6216 diff changeset	117
b544f8e0d921 Stream: deprecated proxy_downstream_buffer, proxy_upstream_buffer. Roman Arutyunyan <arut@nginx.com> parents: 6216 diff changeset	118 static ngx_conf_deprecated_t ngx_conf_deprecated_proxy_upstream_buffer = {
b544f8e0d921 Stream: deprecated proxy_downstream_buffer, proxy_upstream_buffer. Roman Arutyunyan <arut@nginx.com> parents: 6216 diff changeset	119 ngx_conf_deprecated, "proxy_upstream_buffer", "proxy_buffer_size"
b544f8e0d921 Stream: deprecated proxy_downstream_buffer, proxy_upstream_buffer. Roman Arutyunyan <arut@nginx.com> parents: 6216 diff changeset	120 };
b544f8e0d921 Stream: deprecated proxy_downstream_buffer, proxy_upstream_buffer. Roman Arutyunyan <arut@nginx.com> parents: 6216 diff changeset	121
b544f8e0d921 Stream: deprecated proxy_downstream_buffer, proxy_upstream_buffer. Roman Arutyunyan <arut@nginx.com> parents: 6216 diff changeset	122
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	123 static ngx_command_t ngx_stream_proxy_commands[] = {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	124
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	125 { ngx_string("proxy_pass"),
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	126 NGX_STREAM_SRV_CONF\|NGX_CONF_TAKE1,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	127 ngx_stream_proxy_pass,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	128 NGX_STREAM_SRV_CONF_OFFSET,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	129 0,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	130 NULL },
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	131
6183 4dcffe43a7ea Stream: the "proxy_bind" directive. Vladimir Homutov <vl@nginx.com> parents: 6174 diff changeset	132 { ngx_string("proxy_bind"),
6530 1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6529 diff changeset	133 NGX_STREAM_MAIN_CONF\|NGX_STREAM_SRV_CONF\|NGX_CONF_TAKE12,
6183 4dcffe43a7ea Stream: the "proxy_bind" directive. Vladimir Homutov <vl@nginx.com> parents: 6174 diff changeset	134 ngx_stream_proxy_bind,
4dcffe43a7ea Stream: the "proxy_bind" directive. Vladimir Homutov <vl@nginx.com> parents: 6174 diff changeset	135 NGX_STREAM_SRV_CONF_OFFSET,
4dcffe43a7ea Stream: the "proxy_bind" directive. Vladimir Homutov <vl@nginx.com> parents: 6174 diff changeset	136 0,
4dcffe43a7ea Stream: the "proxy_bind" directive. Vladimir Homutov <vl@nginx.com> parents: 6174 diff changeset	137 NULL },
4dcffe43a7ea Stream: the "proxy_bind" directive. Vladimir Homutov <vl@nginx.com> parents: 6174 diff changeset	138
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	139 { ngx_string("proxy_connect_timeout"),
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	140 NGX_STREAM_MAIN_CONF\|NGX_STREAM_SRV_CONF\|NGX_CONF_TAKE1,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	141 ngx_conf_set_msec_slot,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	142 NGX_STREAM_SRV_CONF_OFFSET,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	143 offsetof(ngx_stream_proxy_srv_conf_t, connect_timeout),
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	144 NULL },
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	145
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	146 { ngx_string("proxy_timeout"),
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	147 NGX_STREAM_MAIN_CONF\|NGX_STREAM_SRV_CONF\|NGX_CONF_TAKE1,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	148 ngx_conf_set_msec_slot,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	149 NGX_STREAM_SRV_CONF_OFFSET,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	150 offsetof(ngx_stream_proxy_srv_conf_t, timeout),
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	151 NULL },
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	152
6215 8ee6a08ea3eb Stream: added proxy_buffer_size to set the size of data buffers. Roman Arutyunyan <arut@nginx.com> parents: 6208 diff changeset	153 { ngx_string("proxy_buffer_size"),
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	154 NGX_STREAM_MAIN_CONF\|NGX_STREAM_SRV_CONF\|NGX_CONF_TAKE1,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	155 ngx_conf_set_size_slot,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	156 NGX_STREAM_SRV_CONF_OFFSET,
6215 8ee6a08ea3eb Stream: added proxy_buffer_size to set the size of data buffers. Roman Arutyunyan <arut@nginx.com> parents: 6208 diff changeset	157 offsetof(ngx_stream_proxy_srv_conf_t, buffer_size),
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	158 NULL },
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	159
6217 b544f8e0d921 Stream: deprecated proxy_downstream_buffer, proxy_upstream_buffer. Roman Arutyunyan <arut@nginx.com> parents: 6216 diff changeset	160 { ngx_string("proxy_downstream_buffer"),
b544f8e0d921 Stream: deprecated proxy_downstream_buffer, proxy_upstream_buffer. Roman Arutyunyan <arut@nginx.com> parents: 6216 diff changeset	161 NGX_STREAM_MAIN_CONF\|NGX_STREAM_SRV_CONF\|NGX_CONF_TAKE1,
b544f8e0d921 Stream: deprecated proxy_downstream_buffer, proxy_upstream_buffer. Roman Arutyunyan <arut@nginx.com> parents: 6216 diff changeset	162 ngx_conf_set_size_slot,
b544f8e0d921 Stream: deprecated proxy_downstream_buffer, proxy_upstream_buffer. Roman Arutyunyan <arut@nginx.com> parents: 6216 diff changeset	163 NGX_STREAM_SRV_CONF_OFFSET,
b544f8e0d921 Stream: deprecated proxy_downstream_buffer, proxy_upstream_buffer. Roman Arutyunyan <arut@nginx.com> parents: 6216 diff changeset	164 offsetof(ngx_stream_proxy_srv_conf_t, buffer_size),
b544f8e0d921 Stream: deprecated proxy_downstream_buffer, proxy_upstream_buffer. Roman Arutyunyan <arut@nginx.com> parents: 6216 diff changeset	165 &ngx_conf_deprecated_proxy_downstream_buffer },
b544f8e0d921 Stream: deprecated proxy_downstream_buffer, proxy_upstream_buffer. Roman Arutyunyan <arut@nginx.com> parents: 6216 diff changeset	166
b544f8e0d921 Stream: deprecated proxy_downstream_buffer, proxy_upstream_buffer. Roman Arutyunyan <arut@nginx.com> parents: 6216 diff changeset	167 { ngx_string("proxy_upstream_buffer"),
b544f8e0d921 Stream: deprecated proxy_downstream_buffer, proxy_upstream_buffer. Roman Arutyunyan <arut@nginx.com> parents: 6216 diff changeset	168 NGX_STREAM_MAIN_CONF\|NGX_STREAM_SRV_CONF\|NGX_CONF_TAKE1,
b544f8e0d921 Stream: deprecated proxy_downstream_buffer, proxy_upstream_buffer. Roman Arutyunyan <arut@nginx.com> parents: 6216 diff changeset	169 ngx_conf_set_size_slot,
b544f8e0d921 Stream: deprecated proxy_downstream_buffer, proxy_upstream_buffer. Roman Arutyunyan <arut@nginx.com> parents: 6216 diff changeset	170 NGX_STREAM_SRV_CONF_OFFSET,
b544f8e0d921 Stream: deprecated proxy_downstream_buffer, proxy_upstream_buffer. Roman Arutyunyan <arut@nginx.com> parents: 6216 diff changeset	171 offsetof(ngx_stream_proxy_srv_conf_t, buffer_size),
b544f8e0d921 Stream: deprecated proxy_downstream_buffer, proxy_upstream_buffer. Roman Arutyunyan <arut@nginx.com> parents: 6216 diff changeset	172 &ngx_conf_deprecated_proxy_upstream_buffer },
b544f8e0d921 Stream: deprecated proxy_downstream_buffer, proxy_upstream_buffer. Roman Arutyunyan <arut@nginx.com> parents: 6216 diff changeset	173
6208 7a14a0d754ad Stream: renamed rate limiting directives. Roman Arutyunyan <arut@nginx.com> parents: 6204 diff changeset	174 { ngx_string("proxy_upload_rate"),
6201 24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	175 NGX_STREAM_MAIN_CONF\|NGX_STREAM_SRV_CONF\|NGX_CONF_TAKE1,
24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	176 ngx_conf_set_size_slot,
24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	177 NGX_STREAM_SRV_CONF_OFFSET,
6208 7a14a0d754ad Stream: renamed rate limiting directives. Roman Arutyunyan <arut@nginx.com> parents: 6204 diff changeset	178 offsetof(ngx_stream_proxy_srv_conf_t, upload_rate),
6201 24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	179 NULL },
24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	180
6208 7a14a0d754ad Stream: renamed rate limiting directives. Roman Arutyunyan <arut@nginx.com> parents: 6204 diff changeset	181 { ngx_string("proxy_download_rate"),
6201 24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	182 NGX_STREAM_MAIN_CONF\|NGX_STREAM_SRV_CONF\|NGX_CONF_TAKE1,
24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	183 ngx_conf_set_size_slot,
24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	184 NGX_STREAM_SRV_CONF_OFFSET,
6208 7a14a0d754ad Stream: renamed rate limiting directives. Roman Arutyunyan <arut@nginx.com> parents: 6204 diff changeset	185 offsetof(ngx_stream_proxy_srv_conf_t, download_rate),
6201 24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	186 NULL },
24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	187
6436 8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	188 { ngx_string("proxy_responses"),
8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	189 NGX_STREAM_MAIN_CONF\|NGX_STREAM_SRV_CONF\|NGX_CONF_TAKE1,
8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	190 ngx_conf_set_num_slot,
8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	191 NGX_STREAM_SRV_CONF_OFFSET,
8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	192 offsetof(ngx_stream_proxy_srv_conf_t, responses),
8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	193 NULL },
8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	194
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	195 { ngx_string("proxy_next_upstream"),
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	196 NGX_STREAM_MAIN_CONF\|NGX_STREAM_SRV_CONF\|NGX_CONF_FLAG,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	197 ngx_conf_set_flag_slot,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	198 NGX_STREAM_SRV_CONF_OFFSET,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	199 offsetof(ngx_stream_proxy_srv_conf_t, next_upstream),
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	200 NULL },
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	201
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	202 { ngx_string("proxy_next_upstream_tries"),
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	203 NGX_STREAM_MAIN_CONF\|NGX_STREAM_SRV_CONF\|NGX_CONF_TAKE1,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	204 ngx_conf_set_num_slot,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	205 NGX_STREAM_SRV_CONF_OFFSET,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	206 offsetof(ngx_stream_proxy_srv_conf_t, next_upstream_tries),
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	207 NULL },
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	208
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	209 { ngx_string("proxy_next_upstream_timeout"),
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	210 NGX_STREAM_MAIN_CONF\|NGX_STREAM_SRV_CONF\|NGX_CONF_TAKE1,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	211 ngx_conf_set_msec_slot,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	212 NGX_STREAM_SRV_CONF_OFFSET,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	213 offsetof(ngx_stream_proxy_srv_conf_t, next_upstream_timeout),
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	214 NULL },
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	215
6184 fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	216 { ngx_string("proxy_protocol"),
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	217 NGX_STREAM_MAIN_CONF\|NGX_STREAM_SRV_CONF\|NGX_CONF_FLAG,
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	218 ngx_conf_set_flag_slot,
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	219 NGX_STREAM_SRV_CONF_OFFSET,
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	220 offsetof(ngx_stream_proxy_srv_conf_t, proxy_protocol),
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	221 NULL },
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	222
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	223 #if (NGX_STREAM_SSL)
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	224
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	225 { ngx_string("proxy_ssl"),
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	226 NGX_STREAM_MAIN_CONF\|NGX_STREAM_SRV_CONF\|NGX_CONF_FLAG,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	227 ngx_conf_set_flag_slot,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	228 NGX_STREAM_SRV_CONF_OFFSET,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	229 offsetof(ngx_stream_proxy_srv_conf_t, ssl_enable),
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	230 NULL },
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	231
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	232 { ngx_string("proxy_ssl_session_reuse"),
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	233 NGX_STREAM_MAIN_CONF\|NGX_STREAM_SRV_CONF\|NGX_CONF_FLAG,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	234 ngx_conf_set_flag_slot,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	235 NGX_STREAM_SRV_CONF_OFFSET,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	236 offsetof(ngx_stream_proxy_srv_conf_t, ssl_session_reuse),
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	237 NULL },
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	238
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	239 { ngx_string("proxy_ssl_protocols"),
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	240 NGX_STREAM_MAIN_CONF\|NGX_STREAM_SRV_CONF\|NGX_CONF_1MORE,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	241 ngx_conf_set_bitmask_slot,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	242 NGX_STREAM_SRV_CONF_OFFSET,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	243 offsetof(ngx_stream_proxy_srv_conf_t, ssl_protocols),
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	244 &ngx_stream_proxy_ssl_protocols },
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	245
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	246 { ngx_string("proxy_ssl_ciphers"),
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	247 NGX_STREAM_MAIN_CONF\|NGX_STREAM_SRV_CONF\|NGX_CONF_TAKE1,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	248 ngx_conf_set_str_slot,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	249 NGX_STREAM_SRV_CONF_OFFSET,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	250 offsetof(ngx_stream_proxy_srv_conf_t, ssl_ciphers),
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	251 NULL },
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	252
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	253 { ngx_string("proxy_ssl_name"),
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	254 NGX_STREAM_MAIN_CONF\|NGX_STREAM_SRV_CONF\|NGX_CONF_TAKE1,
6643 9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	255 ngx_stream_set_complex_value_slot,
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	256 NGX_STREAM_SRV_CONF_OFFSET,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	257 offsetof(ngx_stream_proxy_srv_conf_t, ssl_name),
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	258 NULL },
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	259
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	260 { ngx_string("proxy_ssl_server_name"),
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	261 NGX_STREAM_MAIN_CONF\|NGX_STREAM_SRV_CONF\|NGX_CONF_FLAG,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	262 ngx_conf_set_flag_slot,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	263 NGX_STREAM_SRV_CONF_OFFSET,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	264 offsetof(ngx_stream_proxy_srv_conf_t, ssl_server_name),
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	265 NULL },
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	266
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	267 { ngx_string("proxy_ssl_verify"),
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	268 NGX_STREAM_MAIN_CONF\|NGX_STREAM_SRV_CONF\|NGX_CONF_FLAG,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	269 ngx_conf_set_flag_slot,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	270 NGX_STREAM_SRV_CONF_OFFSET,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	271 offsetof(ngx_stream_proxy_srv_conf_t, ssl_verify),
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	272 NULL },
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	273
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	274 { ngx_string("proxy_ssl_verify_depth"),
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	275 NGX_STREAM_MAIN_CONF\|NGX_STREAM_SRV_CONF\|NGX_CONF_TAKE1,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	276 ngx_conf_set_num_slot,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	277 NGX_STREAM_SRV_CONF_OFFSET,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	278 offsetof(ngx_stream_proxy_srv_conf_t, ssl_verify_depth),
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	279 NULL },
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	280
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	281 { ngx_string("proxy_ssl_trusted_certificate"),
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	282 NGX_STREAM_MAIN_CONF\|NGX_STREAM_SRV_CONF\|NGX_CONF_TAKE1,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	283 ngx_conf_set_str_slot,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	284 NGX_STREAM_SRV_CONF_OFFSET,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	285 offsetof(ngx_stream_proxy_srv_conf_t, ssl_trusted_certificate),
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	286 NULL },
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	287
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	288 { ngx_string("proxy_ssl_crl"),
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	289 NGX_STREAM_MAIN_CONF\|NGX_STREAM_SRV_CONF\|NGX_CONF_TAKE1,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	290 ngx_conf_set_str_slot,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	291 NGX_STREAM_SRV_CONF_OFFSET,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	292 offsetof(ngx_stream_proxy_srv_conf_t, ssl_crl),
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	293 NULL },
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	294
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	295 { ngx_string("proxy_ssl_certificate"),
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	296 NGX_STREAM_MAIN_CONF\|NGX_STREAM_SRV_CONF\|NGX_CONF_TAKE1,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	297 ngx_conf_set_str_slot,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	298 NGX_STREAM_SRV_CONF_OFFSET,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	299 offsetof(ngx_stream_proxy_srv_conf_t, ssl_certificate),
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	300 NULL },
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	301
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	302 { ngx_string("proxy_ssl_certificate_key"),
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	303 NGX_STREAM_MAIN_CONF\|NGX_STREAM_SRV_CONF\|NGX_CONF_TAKE1,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	304 ngx_conf_set_str_slot,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	305 NGX_STREAM_SRV_CONF_OFFSET,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	306 offsetof(ngx_stream_proxy_srv_conf_t, ssl_certificate_key),
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	307 NULL },
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	308
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	309 { ngx_string("proxy_ssl_password_file"),
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	310 NGX_STREAM_MAIN_CONF\|NGX_STREAM_SRV_CONF\|NGX_CONF_TAKE1,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	311 ngx_stream_proxy_ssl_password_file,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	312 NGX_STREAM_SRV_CONF_OFFSET,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	313 0,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	314 NULL },
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	315
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	316 #endif
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	317
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	318 ngx_null_command
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	319 };
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	320
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	321
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	322 static ngx_stream_module_t ngx_stream_proxy_module_ctx = {
6606 2f41d383c9c7 Stream: added preconfiguration step. Vladimir Homutov <vl@nginx.com> parents: 6599 diff changeset	323 NULL, /* preconfiguration */
6174 68c106e6fa0a Stream: added postconfiguration method to stream modules. Vladimir Homutov <vl@nginx.com> parents: 6157 diff changeset	324 NULL, /* postconfiguration */
68c106e6fa0a Stream: added postconfiguration method to stream modules. Vladimir Homutov <vl@nginx.com> parents: 6157 diff changeset	325
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	326 NULL, /* create main configuration */
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	327 NULL, /* init main configuration */
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	328
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	329 ngx_stream_proxy_create_srv_conf, /* create server configuration */
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	330 ngx_stream_proxy_merge_srv_conf /* merge server configuration */
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	331 };
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	332
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	333
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	334 ngx_module_t ngx_stream_proxy_module = {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	335 NGX_MODULE_V1,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	336 &ngx_stream_proxy_module_ctx, /* module context */
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	337 ngx_stream_proxy_commands, /* module directives */
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	338 NGX_STREAM_MODULE, /* module type */
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	339 NULL, /* init master */
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	340 NULL, /* init module */
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	341 NULL, /* init process */
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	342 NULL, /* init thread */
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	343 NULL, /* exit thread */
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	344 NULL, /* exit process */
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	345 NULL, /* exit master */
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	346 NGX_MODULE_V1_PADDING
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	347 };
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	348
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	349
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	350 static void
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	351 ngx_stream_proxy_handler(ngx_stream_session_t *s)
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	352 {
6643 9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	353 u_char *p;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	354 ngx_str_t *host;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	355 ngx_uint_t i;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	356 ngx_connection_t *c;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	357 ngx_resolver_ctx_t *ctx, temp;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	358 ngx_stream_upstream_t *u;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	359 ngx_stream_core_srv_conf_t *cscf;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	360 ngx_stream_proxy_srv_conf_t *pscf;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	361 ngx_stream_upstream_srv_conf_t uscf, *uscfp;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	362 ngx_stream_upstream_main_conf_t *umcf;
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	363
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	364 c = s->connection;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	365
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	366 pscf = ngx_stream_get_module_srv_conf(s, ngx_stream_proxy_module);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	367
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	368 ngx_log_debug0(NGX_LOG_DEBUG_STREAM, c->log, 0,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	369 "proxy connection handler");
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	370
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	371 u = ngx_pcalloc(c->pool, sizeof(ngx_stream_upstream_t));
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	372 if (u == NULL) {
6674 38143d1abdec Stream: the $status variable. Roman Arutyunyan <arut@nginx.com> parents: 6648 diff changeset	373 ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	374 return;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	375 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	376
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	377 s->upstream = u;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	378
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	379 s->log_handler = ngx_stream_proxy_log_error;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	380
7286 d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	381 u->requests = 1;
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	382
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	383 u->peer.log = c->log;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	384 u->peer.log_error = NGX_ERROR_ERR;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	385
6529 cb8177ca0990 Stream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6461 diff changeset	386 if (ngx_stream_proxy_set_local(s, u, pscf->local) != NGX_OK) {
6674 38143d1abdec Stream: the $status variable. Roman Arutyunyan <arut@nginx.com> parents: 6648 diff changeset	387 ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
6529 cb8177ca0990 Stream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6461 diff changeset	388 return;
cb8177ca0990 Stream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6461 diff changeset	389 }
cb8177ca0990 Stream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6461 diff changeset	390
6436 8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	391 u->peer.type = c->type;
6643 9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	392 u->start_sec = ngx_time();
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	393
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	394 c->write->handler = ngx_stream_proxy_downstream_handler;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	395 c->read->handler = ngx_stream_proxy_downstream_handler;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	396
6675 ab9b4fd8c5b7 Stream: the $upstream_addr variable. Vladimir Homutov <vl@nginx.com> parents: 6674 diff changeset	397 s->upstream_states = ngx_array_create(c->pool, 1,
ab9b4fd8c5b7 Stream: the $upstream_addr variable. Vladimir Homutov <vl@nginx.com> parents: 6674 diff changeset	398 sizeof(ngx_stream_upstream_state_t));
ab9b4fd8c5b7 Stream: the $upstream_addr variable. Vladimir Homutov <vl@nginx.com> parents: 6674 diff changeset	399 if (s->upstream_states == NULL) {
ab9b4fd8c5b7 Stream: the $upstream_addr variable. Vladimir Homutov <vl@nginx.com> parents: 6674 diff changeset	400 ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
ab9b4fd8c5b7 Stream: the $upstream_addr variable. Vladimir Homutov <vl@nginx.com> parents: 6674 diff changeset	401 return;
ab9b4fd8c5b7 Stream: the $upstream_addr variable. Vladimir Homutov <vl@nginx.com> parents: 6674 diff changeset	402 }
ab9b4fd8c5b7 Stream: the $upstream_addr variable. Vladimir Homutov <vl@nginx.com> parents: 6674 diff changeset	403
7286 d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	404 p = ngx_pnalloc(c->pool, pscf->buffer_size);
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	405 if (p == NULL) {
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	406 ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	407 return;
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	408 }
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	409
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	410 u->downstream_buf.start = p;
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	411 u->downstream_buf.end = p + pscf->buffer_size;
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	412 u->downstream_buf.pos = p;
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	413 u->downstream_buf.last = p;
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	414
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	415 if (c->read->ready) {
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	416 ngx_post_event(c->read, &ngx_posted_events);
6643 9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	417 }
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	418
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	419 if (pscf->upstream_value) {
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	420 if (ngx_stream_proxy_eval(s, pscf) != NGX_OK) {
6674 38143d1abdec Stream: the $status variable. Roman Arutyunyan <arut@nginx.com> parents: 6648 diff changeset	421 ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
6643 9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	422 return;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	423 }
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	424 }
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	425
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	426 if (u->resolved == NULL) {
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	427
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	428 uscf = pscf->upstream;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	429
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	430 } else {
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	431
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	432 #if (NGX_STREAM_SSL)
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	433 u->ssl_name = u->resolved->host;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	434 #endif
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	435
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	436 host = &u->resolved->host;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	437
6786 906ac20234ed Upstream: do not unnecessarily create per-request upstreams. Ruslan Ermilov <ru@nginx.com> parents: 6785 diff changeset	438 umcf = ngx_stream_get_module_main_conf(s, ngx_stream_upstream_module);
906ac20234ed Upstream: do not unnecessarily create per-request upstreams. Ruslan Ermilov <ru@nginx.com> parents: 6785 diff changeset	439
906ac20234ed Upstream: do not unnecessarily create per-request upstreams. Ruslan Ermilov <ru@nginx.com> parents: 6785 diff changeset	440 uscfp = umcf->upstreams.elts;
906ac20234ed Upstream: do not unnecessarily create per-request upstreams. Ruslan Ermilov <ru@nginx.com> parents: 6785 diff changeset	441
906ac20234ed Upstream: do not unnecessarily create per-request upstreams. Ruslan Ermilov <ru@nginx.com> parents: 6785 diff changeset	442 for (i = 0; i < umcf->upstreams.nelts; i++) {
906ac20234ed Upstream: do not unnecessarily create per-request upstreams. Ruslan Ermilov <ru@nginx.com> parents: 6785 diff changeset	443
906ac20234ed Upstream: do not unnecessarily create per-request upstreams. Ruslan Ermilov <ru@nginx.com> parents: 6785 diff changeset	444 uscf = uscfp[i];
906ac20234ed Upstream: do not unnecessarily create per-request upstreams. Ruslan Ermilov <ru@nginx.com> parents: 6785 diff changeset	445
906ac20234ed Upstream: do not unnecessarily create per-request upstreams. Ruslan Ermilov <ru@nginx.com> parents: 6785 diff changeset	446 if (uscf->host.len == host->len
906ac20234ed Upstream: do not unnecessarily create per-request upstreams. Ruslan Ermilov <ru@nginx.com> parents: 6785 diff changeset	447 && ((uscf->port == 0 && u->resolved->no_port)
906ac20234ed Upstream: do not unnecessarily create per-request upstreams. Ruslan Ermilov <ru@nginx.com> parents: 6785 diff changeset	448 \|\| uscf->port == u->resolved->port)
906ac20234ed Upstream: do not unnecessarily create per-request upstreams. Ruslan Ermilov <ru@nginx.com> parents: 6785 diff changeset	449 && 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: 6785 diff changeset	450 {
906ac20234ed Upstream: do not unnecessarily create per-request upstreams. Ruslan Ermilov <ru@nginx.com> parents: 6785 diff changeset	451 goto found;
906ac20234ed Upstream: do not unnecessarily create per-request upstreams. Ruslan Ermilov <ru@nginx.com> parents: 6785 diff changeset	452 }
906ac20234ed Upstream: do not unnecessarily create per-request upstreams. Ruslan Ermilov <ru@nginx.com> parents: 6785 diff changeset	453 }
906ac20234ed Upstream: do not unnecessarily create per-request upstreams. Ruslan Ermilov <ru@nginx.com> parents: 6785 diff changeset	454
6643 9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	455 if (u->resolved->sockaddr) {
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	456
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	457 if (u->resolved->port == 0
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	458 && u->resolved->sockaddr->sa_family != AF_UNIX)
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	459 {
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	460 ngx_log_error(NGX_LOG_ERR, c->log, 0,
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	461 "no port in upstream \"%V\"", host);
6674 38143d1abdec Stream: the $status variable. Roman Arutyunyan <arut@nginx.com> parents: 6648 diff changeset	462 ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
6643 9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	463 return;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	464 }
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	465
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	466 if (ngx_stream_upstream_create_round_robin_peer(s, u->resolved)
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	467 != NGX_OK)
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	468 {
6674 38143d1abdec Stream: the $status variable. Roman Arutyunyan <arut@nginx.com> parents: 6648 diff changeset	469 ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
6643 9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	470 return;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	471 }
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	472
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	473 ngx_stream_proxy_connect(s);
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	474
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	475 return;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	476 }
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	477
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	478 if (u->resolved->port == 0) {
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	479 ngx_log_error(NGX_LOG_ERR, c->log, 0,
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	480 "no port in upstream \"%V\"", host);
6674 38143d1abdec Stream: the $status variable. Roman Arutyunyan <arut@nginx.com> parents: 6648 diff changeset	481 ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
6643 9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	482 return;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	483 }
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	484
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	485 temp.name = *host;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	486
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	487 cscf = ngx_stream_get_module_srv_conf(s, ngx_stream_core_module);
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	488
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	489 ctx = ngx_resolve_start(cscf->resolver, &temp);
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	490 if (ctx == NULL) {
6674 38143d1abdec Stream: the $status variable. Roman Arutyunyan <arut@nginx.com> parents: 6648 diff changeset	491 ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
6643 9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	492 return;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	493 }
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	494
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	495 if (ctx == NGX_NO_RESOLVER) {
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	496 ngx_log_error(NGX_LOG_ERR, c->log, 0,
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	497 "no resolver defined to resolve %V", host);
6674 38143d1abdec Stream: the $status variable. Roman Arutyunyan <arut@nginx.com> parents: 6648 diff changeset	498 ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
6643 9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	499 return;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	500 }
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	501
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	502 ctx->name = *host;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	503 ctx->handler = ngx_stream_proxy_resolve_handler;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	504 ctx->data = s;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	505 ctx->timeout = cscf->resolver_timeout;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	506
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	507 u->resolved->ctx = ctx;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	508
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	509 if (ngx_resolve_name(ctx) != NGX_OK) {
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	510 u->resolved->ctx = NULL;
6674 38143d1abdec Stream: the $status variable. Roman Arutyunyan <arut@nginx.com> parents: 6648 diff changeset	511 ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
6643 9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	512 return;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	513 }
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	514
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	515 return;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	516 }
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	517
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	518 found:
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	519
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	520 if (uscf == NULL) {
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	521 ngx_log_error(NGX_LOG_ALERT, c->log, 0, "no upstream configuration");
6674 38143d1abdec Stream: the $status variable. Roman Arutyunyan <arut@nginx.com> parents: 6648 diff changeset	522 ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
6643 9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	523 return;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	524 }
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	525
6703 edcd9303a4d3 Upstream: introduced u->upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 6692 diff changeset	526 u->upstream = uscf;
edcd9303a4d3 Upstream: introduced u->upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 6692 diff changeset	527
6648 d43ee392e825 Stream: fixed build without stream_ssl_module (ticket #1032). Vladimir Homutov <vl@nginx.com> parents: 6643 diff changeset	528 #if (NGX_STREAM_SSL)
6643 9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	529 u->ssl_name = uscf->host;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	530 #endif
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	531
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	532 if (uscf->peer.init(s, uscf) != NGX_OK) {
6674 38143d1abdec Stream: the $status variable. Roman Arutyunyan <arut@nginx.com> parents: 6648 diff changeset	533 ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	534 return;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	535 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	536
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	537 u->peer.start_time = ngx_current_msec;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	538
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	539 if (pscf->next_upstream_tries
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	540 && u->peer.tries > pscf->next_upstream_tries)
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	541 {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	542 u->peer.tries = pscf->next_upstream_tries;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	543 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	544
6643 9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	545 ngx_stream_proxy_connect(s);
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	546 }
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	547
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	548
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	549 static ngx_int_t
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	550 ngx_stream_proxy_eval(ngx_stream_session_t *s,
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	551 ngx_stream_proxy_srv_conf_t *pscf)
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	552 {
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	553 ngx_str_t host;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	554 ngx_url_t url;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	555 ngx_stream_upstream_t *u;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	556
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	557 if (ngx_stream_complex_value(s, pscf->upstream_value, &host) != NGX_OK) {
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	558 return NGX_ERROR;
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	559 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	560
6643 9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	561 ngx_memzero(&url, sizeof(ngx_url_t));
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	562
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	563 url.url = host;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	564 url.no_resolve = 1;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	565
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	566 if (ngx_parse_url(s->connection->pool, &url) != NGX_OK) {
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	567 if (url.err) {
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	568 ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	569 "%s in upstream \"%V\"", url.err, &url.url);
6184 fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	570 }
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	571
6643 9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	572 return NGX_ERROR;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	573 }
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	574
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	575 u = s->upstream;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	576
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	577 u->resolved = ngx_pcalloc(s->connection->pool,
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	578 sizeof(ngx_stream_upstream_resolved_t));
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	579 if (u->resolved == NULL) {
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	580 return NGX_ERROR;
6184 fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	581 }
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	582
6784 1af120241cde Upstream: removed unnecessary condition in proxy_eval() and friends. Ruslan Ermilov <ru@nginx.com> parents: 6777 diff changeset	583 if (url.addrs) {
6643 9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	584 u->resolved->sockaddr = url.addrs[0].sockaddr;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	585 u->resolved->socklen = url.addrs[0].socklen;
6785 d1d0dd69a419 Upstream: added the ngx_http_upstream_resolved_t.name field. Ruslan Ermilov <ru@nginx.com> parents: 6784 diff changeset	586 u->resolved->name = url.addrs[0].name;
6643 9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	587 u->resolved->naddrs = 1;
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	588 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	589
6785 d1d0dd69a419 Upstream: added the ngx_http_upstream_resolved_t.name field. Ruslan Ermilov <ru@nginx.com> parents: 6784 diff changeset	590 u->resolved->host = url.host;
6643 9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	591 u->resolved->port = url.port;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	592 u->resolved->no_port = url.no_port;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	593
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	594 return NGX_OK;
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	595 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	596
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	597
6529 cb8177ca0990 Stream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6461 diff changeset	598 static ngx_int_t
cb8177ca0990 Stream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6461 diff changeset	599 ngx_stream_proxy_set_local(ngx_stream_session_t s, ngx_stream_upstream_t u,
cb8177ca0990 Stream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6461 diff changeset	600 ngx_stream_upstream_local_t *local)
cb8177ca0990 Stream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6461 diff changeset	601 {
6610 d5b5866c06c4 Stream: got rid of pseudo variables. Vladimir Homutov <vl@nginx.com> parents: 6606 diff changeset	602 ngx_int_t rc;
d5b5866c06c4 Stream: got rid of pseudo variables. Vladimir Homutov <vl@nginx.com> parents: 6606 diff changeset	603 ngx_str_t val;
d5b5866c06c4 Stream: got rid of pseudo variables. Vladimir Homutov <vl@nginx.com> parents: 6606 diff changeset	604 ngx_addr_t *addr;
6530 1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6529 diff changeset	605
6529 cb8177ca0990 Stream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6461 diff changeset	606 if (local == NULL) {
cb8177ca0990 Stream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6461 diff changeset	607 u->peer.local = NULL;
cb8177ca0990 Stream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6461 diff changeset	608 return NGX_OK;
cb8177ca0990 Stream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6461 diff changeset	609 }
cb8177ca0990 Stream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6461 diff changeset	610
6530 1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6529 diff changeset	611 #if (NGX_HAVE_TRANSPARENT_PROXY)
1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6529 diff changeset	612 u->peer.transparent = local->transparent;
1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6529 diff changeset	613 #endif
1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6529 diff changeset	614
6610 d5b5866c06c4 Stream: got rid of pseudo variables. Vladimir Homutov <vl@nginx.com> parents: 6606 diff changeset	615 if (local->value == NULL) {
6529 cb8177ca0990 Stream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6461 diff changeset	616 u->peer.local = local->addr;
cb8177ca0990 Stream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6461 diff changeset	617 return NGX_OK;
cb8177ca0990 Stream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6461 diff changeset	618 }
cb8177ca0990 Stream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6461 diff changeset	619
6610 d5b5866c06c4 Stream: got rid of pseudo variables. Vladimir Homutov <vl@nginx.com> parents: 6606 diff changeset	620 if (ngx_stream_complex_value(s, local->value, &val) != NGX_OK) {
d5b5866c06c4 Stream: got rid of pseudo variables. Vladimir Homutov <vl@nginx.com> parents: 6606 diff changeset	621 return NGX_ERROR;
d5b5866c06c4 Stream: got rid of pseudo variables. Vladimir Homutov <vl@nginx.com> parents: 6606 diff changeset	622 }
6530 1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6529 diff changeset	623
6610 d5b5866c06c4 Stream: got rid of pseudo variables. Vladimir Homutov <vl@nginx.com> parents: 6606 diff changeset	624 if (val.len == 0) {
d5b5866c06c4 Stream: got rid of pseudo variables. Vladimir Homutov <vl@nginx.com> parents: 6606 diff changeset	625 return NGX_OK;
d5b5866c06c4 Stream: got rid of pseudo variables. Vladimir Homutov <vl@nginx.com> parents: 6606 diff changeset	626 }
6530 1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6529 diff changeset	627
6610 d5b5866c06c4 Stream: got rid of pseudo variables. Vladimir Homutov <vl@nginx.com> parents: 6606 diff changeset	628 addr = ngx_palloc(s->connection->pool, sizeof(ngx_addr_t));
6530 1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6529 diff changeset	629 if (addr == NULL) {
1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6529 diff changeset	630 return NGX_ERROR;
1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6529 diff changeset	631 }
1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6529 diff changeset	632
6610 d5b5866c06c4 Stream: got rid of pseudo variables. Vladimir Homutov <vl@nginx.com> parents: 6606 diff changeset	633 rc = ngx_parse_addr_port(s->connection->pool, addr, val.data, val.len);
d5b5866c06c4 Stream: got rid of pseudo variables. Vladimir Homutov <vl@nginx.com> parents: 6606 diff changeset	634 if (rc == NGX_ERROR) {
d5b5866c06c4 Stream: got rid of pseudo variables. Vladimir Homutov <vl@nginx.com> parents: 6606 diff changeset	635 return NGX_ERROR;
6530 1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6529 diff changeset	636 }
1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6529 diff changeset	637
6610 d5b5866c06c4 Stream: got rid of pseudo variables. Vladimir Homutov <vl@nginx.com> parents: 6606 diff changeset	638 if (rc != NGX_OK) {
d5b5866c06c4 Stream: got rid of pseudo variables. Vladimir Homutov <vl@nginx.com> parents: 6606 diff changeset	639 ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
d5b5866c06c4 Stream: got rid of pseudo variables. Vladimir Homutov <vl@nginx.com> parents: 6606 diff changeset	640 "invalid local address \"%V\"", &val);
d5b5866c06c4 Stream: got rid of pseudo variables. Vladimir Homutov <vl@nginx.com> parents: 6606 diff changeset	641 return NGX_OK;
d5b5866c06c4 Stream: got rid of pseudo variables. Vladimir Homutov <vl@nginx.com> parents: 6606 diff changeset	642 }
d5b5866c06c4 Stream: got rid of pseudo variables. Vladimir Homutov <vl@nginx.com> parents: 6606 diff changeset	643
d5b5866c06c4 Stream: got rid of pseudo variables. Vladimir Homutov <vl@nginx.com> parents: 6606 diff changeset	644 addr->name = val;
6530 1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6529 diff changeset	645 u->peer.local = addr;
1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6529 diff changeset	646
6529 cb8177ca0990 Stream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6461 diff changeset	647 return NGX_OK;
cb8177ca0990 Stream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6461 diff changeset	648 }
cb8177ca0990 Stream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6461 diff changeset	649
cb8177ca0990 Stream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6461 diff changeset	650
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	651 static void
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	652 ngx_stream_proxy_connect(ngx_stream_session_t *s)
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	653 {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	654 ngx_int_t rc;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	655 ngx_connection_t c, pc;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	656 ngx_stream_upstream_t *u;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	657 ngx_stream_proxy_srv_conf_t *pscf;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	658
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	659 c = s->connection;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	660
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	661 c->log->action = "connecting to upstream";
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	662
6692 56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	663 pscf = ngx_stream_get_module_srv_conf(s, ngx_stream_proxy_module);
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	664
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	665 u = s->upstream;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	666
6692 56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	667 u->connected = 0;
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	668 u->proxy_protocol = pscf->proxy_protocol;
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	669
6677 c02290241cbe Stream: upstream response time variables. Vladimir Homutov <vl@nginx.com> parents: 6676 diff changeset	670 if (u->state) {
c02290241cbe Stream: upstream response time variables. Vladimir Homutov <vl@nginx.com> parents: 6676 diff changeset	671 u->state->response_time = ngx_current_msec - u->state->response_time;
c02290241cbe Stream: upstream response time variables. Vladimir Homutov <vl@nginx.com> parents: 6676 diff changeset	672 }
c02290241cbe Stream: upstream response time variables. Vladimir Homutov <vl@nginx.com> parents: 6676 diff changeset	673
6675 ab9b4fd8c5b7 Stream: the $upstream_addr variable. Vladimir Homutov <vl@nginx.com> parents: 6674 diff changeset	674 u->state = ngx_array_push(s->upstream_states);
ab9b4fd8c5b7 Stream: the $upstream_addr variable. Vladimir Homutov <vl@nginx.com> parents: 6674 diff changeset	675 if (u->state == NULL) {
ab9b4fd8c5b7 Stream: the $upstream_addr variable. Vladimir Homutov <vl@nginx.com> parents: 6674 diff changeset	676 ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
ab9b4fd8c5b7 Stream: the $upstream_addr variable. Vladimir Homutov <vl@nginx.com> parents: 6674 diff changeset	677 return;
ab9b4fd8c5b7 Stream: the $upstream_addr variable. Vladimir Homutov <vl@nginx.com> parents: 6674 diff changeset	678 }
ab9b4fd8c5b7 Stream: the $upstream_addr variable. Vladimir Homutov <vl@nginx.com> parents: 6674 diff changeset	679
ab9b4fd8c5b7 Stream: the $upstream_addr variable. Vladimir Homutov <vl@nginx.com> parents: 6674 diff changeset	680 ngx_memzero(u->state, sizeof(ngx_stream_upstream_state_t));
ab9b4fd8c5b7 Stream: the $upstream_addr variable. Vladimir Homutov <vl@nginx.com> parents: 6674 diff changeset	681
6677 c02290241cbe Stream: upstream response time variables. Vladimir Homutov <vl@nginx.com> parents: 6676 diff changeset	682 u->state->connect_time = (ngx_msec_t) -1;
c02290241cbe Stream: upstream response time variables. Vladimir Homutov <vl@nginx.com> parents: 6676 diff changeset	683 u->state->first_byte_time = (ngx_msec_t) -1;
c02290241cbe Stream: upstream response time variables. Vladimir Homutov <vl@nginx.com> parents: 6676 diff changeset	684 u->state->response_time = ngx_current_msec;
c02290241cbe Stream: upstream response time variables. Vladimir Homutov <vl@nginx.com> parents: 6676 diff changeset	685
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	686 rc = ngx_event_connect_peer(&u->peer);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	687
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	688 ngx_log_debug1(NGX_LOG_DEBUG_STREAM, c->log, 0, "proxy connect: %i", rc);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	689
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	690 if (rc == NGX_ERROR) {
6674 38143d1abdec Stream: the $status variable. Roman Arutyunyan <arut@nginx.com> parents: 6648 diff changeset	691 ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	692 return;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	693 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	694
6675 ab9b4fd8c5b7 Stream: the $upstream_addr variable. Vladimir Homutov <vl@nginx.com> parents: 6674 diff changeset	695 u->state->peer = u->peer.name;
ab9b4fd8c5b7 Stream: the $upstream_addr variable. Vladimir Homutov <vl@nginx.com> parents: 6674 diff changeset	696
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	697 if (rc == NGX_BUSY) {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	698 ngx_log_error(NGX_LOG_ERR, c->log, 0, "no live upstreams");
6674 38143d1abdec Stream: the $status variable. Roman Arutyunyan <arut@nginx.com> parents: 6648 diff changeset	699 ngx_stream_proxy_finalize(s, NGX_STREAM_BAD_GATEWAY);
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	700 return;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	701 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	702
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	703 if (rc == NGX_DECLINED) {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	704 ngx_stream_proxy_next_upstream(s);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	705 return;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	706 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	707
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	708 /* rc == NGX_OK \|\| rc == NGX_AGAIN \|\| rc == NGX_DONE */
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	709
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	710 pc = u->peer.connection;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	711
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	712 pc->data = s;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	713 pc->log = c->log;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	714 pc->pool = c->pool;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	715 pc->read->log = c->log;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	716 pc->write->log = c->log;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	717
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	718 if (rc != NGX_AGAIN) {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	719 ngx_stream_proxy_init_upstream(s);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	720 return;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	721 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	722
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	723 pc->read->handler = ngx_stream_proxy_connect_handler;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	724 pc->write->handler = ngx_stream_proxy_connect_handler;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	725
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	726 ngx_add_timer(pc->write, pscf->connect_timeout);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	727 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	728
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	729
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	730 static void
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	731 ngx_stream_proxy_init_upstream(ngx_stream_session_t *s)
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	732 {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	733 u_char *p;
6692 56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	734 ngx_chain_t *cl;
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	735 ngx_connection_t c, pc;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	736 ngx_log_handler_pt handler;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	737 ngx_stream_upstream_t *u;
6221 7565e056fad6 Stream: the "tcp_nodelay" directive. Vladimir Homutov <vl@nginx.com> parents: 6217 diff changeset	738 ngx_stream_core_srv_conf_t *cscf;
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	739 ngx_stream_proxy_srv_conf_t *pscf;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	740
6184 fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	741 u = s->upstream;
6221 7565e056fad6 Stream: the "tcp_nodelay" directive. Vladimir Homutov <vl@nginx.com> parents: 6217 diff changeset	742 pc = u->peer.connection;
7565e056fad6 Stream: the "tcp_nodelay" directive. Vladimir Homutov <vl@nginx.com> parents: 6217 diff changeset	743
7565e056fad6 Stream: the "tcp_nodelay" directive. Vladimir Homutov <vl@nginx.com> parents: 6217 diff changeset	744 cscf = ngx_stream_get_module_srv_conf(s, ngx_stream_core_module);
7565e056fad6 Stream: the "tcp_nodelay" directive. Vladimir Homutov <vl@nginx.com> parents: 6217 diff changeset	745
6436 8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	746 if (pc->type == SOCK_STREAM
8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	747 && cscf->tcp_nodelay
7007 ed1101bbf19f Introduced ngx_tcp_nodelay(). Ruslan Ermilov <ru@nginx.com> parents: 6981 diff changeset	748 && ngx_tcp_nodelay(pc) != NGX_OK)
6436 8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	749 {
7007 ed1101bbf19f Introduced ngx_tcp_nodelay(). Ruslan Ermilov <ru@nginx.com> parents: 6981 diff changeset	750 ngx_stream_proxy_next_upstream(s);
ed1101bbf19f Introduced ngx_tcp_nodelay(). Ruslan Ermilov <ru@nginx.com> parents: 6981 diff changeset	751 return;
6221 7565e056fad6 Stream: the "tcp_nodelay" directive. Vladimir Homutov <vl@nginx.com> parents: 6217 diff changeset	752 }
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	753
6184 fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	754 pscf = ngx_stream_get_module_srv_conf(s, ngx_stream_proxy_module);
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	755
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	756 #if (NGX_STREAM_SSL)
6692 56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	757
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	758 if (pc->type == SOCK_STREAM && pscf->ssl) {
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	759
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	760 if (u->proxy_protocol) {
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	761 if (ngx_stream_proxy_send_proxy_protocol(s) != NGX_OK) {
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	762 return;
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	763 }
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	764
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	765 u->proxy_protocol = 0;
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	766 }
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	767
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	768 if (pc->ssl == NULL) {
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	769 ngx_stream_proxy_ssl_init_connection(s);
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	770 return;
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	771 }
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	772 }
6692 56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	773
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	774 #endif
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	775
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	776 c = s->connection;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	777
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	778 if (c->log->log_level >= NGX_LOG_INFO) {
6230 2a621245f4cf Win32: MSVC 2015 compatibility. Maxim Dounin <mdounin@mdounin.ru> parents: 6222 diff changeset	779 ngx_str_t str;
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	780 u_char addr[NGX_SOCKADDR_STRLEN];
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	781
6230 2a621245f4cf Win32: MSVC 2015 compatibility. Maxim Dounin <mdounin@mdounin.ru> parents: 6222 diff changeset	782 str.len = NGX_SOCKADDR_STRLEN;
2a621245f4cf Win32: MSVC 2015 compatibility. Maxim Dounin <mdounin@mdounin.ru> parents: 6222 diff changeset	783 str.data = addr;
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	784
6230 2a621245f4cf Win32: MSVC 2015 compatibility. Maxim Dounin <mdounin@mdounin.ru> parents: 6222 diff changeset	785 if (ngx_connection_local_sockaddr(pc, &str, 1) == NGX_OK) {
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	786 handler = c->log->handler;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	787 c->log->handler = NULL;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	788
6461 a01e315b3a78 Stream: additional logging for UDP. Vladimir Homutov <vl@nginx.com> parents: 6436 diff changeset	789 ngx_log_error(NGX_LOG_INFO, c->log, 0,
a01e315b3a78 Stream: additional logging for UDP. Vladimir Homutov <vl@nginx.com> parents: 6436 diff changeset	790 "%sproxy %V connected to %V",
a01e315b3a78 Stream: additional logging for UDP. Vladimir Homutov <vl@nginx.com> parents: 6436 diff changeset	791 pc->type == SOCK_DGRAM ? "udp " : "",
6230 2a621245f4cf Win32: MSVC 2015 compatibility. Maxim Dounin <mdounin@mdounin.ru> parents: 6222 diff changeset	792 &str, u->peer.name);
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	793
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	794 c->log->handler = handler;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	795 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	796 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	797
6677 c02290241cbe Stream: upstream response time variables. Vladimir Homutov <vl@nginx.com> parents: 6676 diff changeset	798 u->state->connect_time = ngx_current_msec - u->state->response_time;
c02290241cbe Stream: upstream response time variables. Vladimir Homutov <vl@nginx.com> parents: 6676 diff changeset	799
6863 54cf51c4f07a Stream: speed up TCP peer recovery. Roman Arutyunyan <arut@nginx.com> parents: 6786 diff changeset	800 if (u->peer.notify) {
54cf51c4f07a Stream: speed up TCP peer recovery. Roman Arutyunyan <arut@nginx.com> parents: 6786 diff changeset	801 u->peer.notify(&u->peer, u->peer.data,
54cf51c4f07a Stream: speed up TCP peer recovery. Roman Arutyunyan <arut@nginx.com> parents: 6786 diff changeset	802 NGX_STREAM_UPSTREAM_NOTIFY_CONNECT);
54cf51c4f07a Stream: speed up TCP peer recovery. Roman Arutyunyan <arut@nginx.com> parents: 6786 diff changeset	803 }
54cf51c4f07a Stream: speed up TCP peer recovery. Roman Arutyunyan <arut@nginx.com> parents: 6786 diff changeset	804
6436 8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	805 if (u->upstream_buf.start == NULL) {
8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	806 p = ngx_pnalloc(c->pool, pscf->buffer_size);
8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	807 if (p == NULL) {
6674 38143d1abdec Stream: the $status variable. Roman Arutyunyan <arut@nginx.com> parents: 6648 diff changeset	808 ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
6436 8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	809 return;
8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	810 }
8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	811
8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	812 u->upstream_buf.start = p;
8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	813 u->upstream_buf.end = p + pscf->buffer_size;
8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	814 u->upstream_buf.pos = p;
8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	815 u->upstream_buf.last = p;
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	816 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	817
6692 56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	818 if (c->buffer && c->buffer->pos < c->buffer->last) {
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	819 ngx_log_debug1(NGX_LOG_DEBUG_STREAM, c->log, 0,
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	820 "stream proxy add preread buffer: %uz",
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	821 c->buffer->last - c->buffer->pos);
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	822
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	823 cl = ngx_chain_get_free_buf(c->pool, &u->free);
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	824 if (cl == NULL) {
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	825 ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	826 return;
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	827 }
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	828
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	829 cl->buf = c->buffer;
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	830
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	831 cl->buf->tag = (ngx_buf_tag_t) &ngx_stream_proxy_module;
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	832 cl->buf->flush = 1;
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	833
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	834 cl->next = u->upstream_out;
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	835 u->upstream_out = cl;
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	836 }
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	837
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	838 if (u->proxy_protocol) {
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	839 ngx_log_debug0(NGX_LOG_DEBUG_STREAM, c->log, 0,
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	840 "stream proxy add PROXY protocol header");
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	841
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	842 cl = ngx_chain_get_free_buf(c->pool, &u->free);
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	843 if (cl == NULL) {
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	844 ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	845 return;
6436 8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	846 }
6692 56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	847
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	848 p = ngx_pnalloc(c->pool, NGX_PROXY_PROTOCOL_MAX_HEADER);
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	849 if (p == NULL) {
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	850 ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	851 return;
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	852 }
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	853
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	854 cl->buf->pos = p;
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	855
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	856 p = ngx_proxy_protocol_write(c, p, p + NGX_PROXY_PROTOCOL_MAX_HEADER);
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	857 if (p == NULL) {
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	858 ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	859 return;
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	860 }
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	861
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	862 cl->buf->last = p;
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	863 cl->buf->temporary = 1;
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	864 cl->buf->flush = 0;
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	865 cl->buf->last_buf = 0;
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	866 cl->buf->tag = (ngx_buf_tag_t) &ngx_stream_proxy_module;
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	867
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	868 cl->next = u->upstream_out;
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	869 u->upstream_out = cl;
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	870
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	871 u->proxy_protocol = 0;
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	872 }
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	873
6202 6345822f0abb Stream: upstream "connected" flag. Roman Arutyunyan <arut@nginx.com> parents: 6201 diff changeset	874 u->connected = 1;
6345822f0abb Stream: upstream "connected" flag. Roman Arutyunyan <arut@nginx.com> parents: 6201 diff changeset	875
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	876 pc->read->handler = ngx_stream_proxy_upstream_handler;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	877 pc->write->handler = ngx_stream_proxy_upstream_handler;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	878
7286 d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	879 if (pc->read->ready) {
6435 d1c791479bbb Stream: post first read events from client and upstream. Roman Arutyunyan <arut@nginx.com> parents: 6393 diff changeset	880 ngx_post_event(pc->read, &ngx_posted_events);
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	881 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	882
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	883 ngx_stream_proxy_process(s, 0, 1);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	884 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	885
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	886
6692 56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	887 #if (NGX_STREAM_SSL)
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	888
6184 fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	889 static ngx_int_t
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	890 ngx_stream_proxy_send_proxy_protocol(ngx_stream_session_t *s)
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	891 {
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	892 u_char *p;
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	893 ssize_t n, size;
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	894 ngx_connection_t c, pc;
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	895 ngx_stream_upstream_t *u;
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	896 ngx_stream_proxy_srv_conf_t *pscf;
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	897 u_char buf[NGX_PROXY_PROTOCOL_MAX_HEADER];
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	898
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	899 c = s->connection;
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	900
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	901 ngx_log_debug0(NGX_LOG_DEBUG_STREAM, c->log, 0,
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	902 "stream proxy send PROXY protocol header");
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	903
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	904 p = ngx_proxy_protocol_write(c, buf, buf + NGX_PROXY_PROTOCOL_MAX_HEADER);
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	905 if (p == NULL) {
6674 38143d1abdec Stream: the $status variable. Roman Arutyunyan <arut@nginx.com> parents: 6648 diff changeset	906 ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
6184 fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	907 return NGX_ERROR;
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	908 }
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	909
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	910 u = s->upstream;
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	911
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	912 pc = u->peer.connection;
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	913
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	914 size = p - buf;
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	915
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	916 n = pc->send(pc, buf, size);
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	917
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	918 if (n == NGX_AGAIN) {
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	919 if (ngx_handle_write_event(pc->write, 0) != NGX_OK) {
6674 38143d1abdec Stream: the $status variable. Roman Arutyunyan <arut@nginx.com> parents: 6648 diff changeset	920 ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
6184 fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	921 return NGX_ERROR;
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	922 }
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	923
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	924 pscf = ngx_stream_get_module_srv_conf(s, ngx_stream_proxy_module);
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	925
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	926 ngx_add_timer(pc->write, pscf->timeout);
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	927
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	928 pc->write->handler = ngx_stream_proxy_connect_handler;
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	929
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	930 return NGX_AGAIN;
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	931 }
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	932
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	933 if (n == NGX_ERROR) {
6674 38143d1abdec Stream: the $status variable. Roman Arutyunyan <arut@nginx.com> parents: 6648 diff changeset	934 ngx_stream_proxy_finalize(s, NGX_STREAM_OK);
6184 fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	935 return NGX_ERROR;
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	936 }
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	937
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	938 if (n != size) {
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	939
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	940 /*
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	941 * PROXY protocol specification:
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	942 * The sender must always ensure that the header
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	943 * is sent at once, so that the transport layer
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	944 * maintains atomicity along the path to the receiver.
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	945 */
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	946
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	947 ngx_log_error(NGX_LOG_ERR, c->log, 0,
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	948 "could not send PROXY protocol header at once");
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	949
6674 38143d1abdec Stream: the $status variable. Roman Arutyunyan <arut@nginx.com> parents: 6648 diff changeset	950 ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
6184 fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	951
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	952 return NGX_ERROR;
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	953 }
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	954
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	955 return NGX_OK;
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	956 }
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	957
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	958
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	959 static char *
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	960 ngx_stream_proxy_ssl_password_file(ngx_conf_t cf, ngx_command_t cmd,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	961 void *conf)
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	962 {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	963 ngx_stream_proxy_srv_conf_t *pscf = conf;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	964
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	965 ngx_str_t *value;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	966
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	967 if (pscf->ssl_passwords != NGX_CONF_UNSET_PTR) {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	968 return "is duplicate";
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	969 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	970
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	971 value = cf->args->elts;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	972
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	973 pscf->ssl_passwords = ngx_ssl_read_password_file(cf, &value[1]);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	974
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	975 if (pscf->ssl_passwords == NULL) {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	976 return NGX_CONF_ERROR;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	977 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	978
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	979 return NGX_CONF_OK;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	980 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	981
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	982
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	983 static void
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	984 ngx_stream_proxy_ssl_init_connection(ngx_stream_session_t *s)
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	985 {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	986 ngx_int_t rc;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	987 ngx_connection_t *pc;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	988 ngx_stream_upstream_t *u;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	989 ngx_stream_proxy_srv_conf_t *pscf;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	990
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	991 u = s->upstream;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	992
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	993 pc = u->peer.connection;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	994
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	995 pscf = ngx_stream_get_module_srv_conf(s, ngx_stream_proxy_module);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	996
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	997 if (ngx_ssl_create_connection(pscf->ssl, pc, NGX_SSL_BUFFER\|NGX_SSL_CLIENT)
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	998 != NGX_OK)
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	999 {
6674 38143d1abdec Stream: the $status variable. Roman Arutyunyan <arut@nginx.com> parents: 6648 diff changeset	1000 ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1001 return;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1002 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1003
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1004 if (pscf->ssl_server_name \|\| pscf->ssl_verify) {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1005 if (ngx_stream_proxy_ssl_name(s) != NGX_OK) {
6674 38143d1abdec Stream: the $status variable. Roman Arutyunyan <arut@nginx.com> parents: 6648 diff changeset	1006 ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1007 return;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1008 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1009 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1010
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1011 if (pscf->ssl_session_reuse) {
7320 696df3ac27ac SSL: save sessions for upstream peers using a callback function. Sergey Kandaurov <pluknet@nginx.com> parents: 7286 diff changeset	1012 pc->ssl->save_session = ngx_stream_proxy_ssl_save_session;
696df3ac27ac SSL: save sessions for upstream peers using a callback function. Sergey Kandaurov <pluknet@nginx.com> parents: 7286 diff changeset	1013
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1014 if (u->peer.set_session(&u->peer, u->peer.data) != NGX_OK) {
6674 38143d1abdec Stream: the $status variable. Roman Arutyunyan <arut@nginx.com> parents: 6648 diff changeset	1015 ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1016 return;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1017 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1018 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1019
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1020 s->connection->log->action = "SSL handshaking to upstream";
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1021
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1022 rc = ngx_ssl_handshake(pc);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1023
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1024 if (rc == NGX_AGAIN) {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1025
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1026 if (!pc->write->timer_set) {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1027 ngx_add_timer(pc->write, pscf->connect_timeout);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1028 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1029
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1030 pc->ssl->handler = ngx_stream_proxy_ssl_handshake;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1031 return;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1032 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1033
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1034 ngx_stream_proxy_ssl_handshake(pc);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1035 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1036
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1037
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1038 static void
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1039 ngx_stream_proxy_ssl_handshake(ngx_connection_t *pc)
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1040 {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1041 long rc;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1042 ngx_stream_session_t *s;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1043 ngx_stream_upstream_t *u;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1044 ngx_stream_proxy_srv_conf_t *pscf;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1045
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1046 s = pc->data;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1047
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1048 pscf = ngx_stream_get_module_srv_conf(s, ngx_stream_proxy_module);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1049
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1050 if (pc->ssl->handshaked) {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1051
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1052 if (pscf->ssl_verify) {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1053 rc = SSL_get_verify_result(pc->ssl->connection);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1054
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1055 if (rc != X509_V_OK) {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1056 ngx_log_error(NGX_LOG_ERR, pc->log, 0,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1057 "upstream SSL certificate verify error: (%l:%s)",
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1058 rc, X509_verify_cert_error_string(rc));
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1059 goto failed;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1060 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1061
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1062 u = s->upstream;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1063
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1064 if (ngx_ssl_check_host(pc, &u->ssl_name) != NGX_OK) {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1065 ngx_log_error(NGX_LOG_ERR, pc->log, 0,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1066 "upstream SSL certificate does not match \"%V\"",
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1067 &u->ssl_name);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1068 goto failed;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1069 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1070 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1071
6258 4b4aee40c508 Stream: delete proxy connection timer after SSL handshake. Ruslan Ermilov <ru@nginx.com> parents: 6230 diff changeset	1072 if (pc->write->timer_set) {
4b4aee40c508 Stream: delete proxy connection timer after SSL handshake. Ruslan Ermilov <ru@nginx.com> parents: 6230 diff changeset	1073 ngx_del_timer(pc->write);
4b4aee40c508 Stream: delete proxy connection timer after SSL handshake. Ruslan Ermilov <ru@nginx.com> parents: 6230 diff changeset	1074 }
4b4aee40c508 Stream: delete proxy connection timer after SSL handshake. Ruslan Ermilov <ru@nginx.com> parents: 6230 diff changeset	1075
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1076 ngx_stream_proxy_init_upstream(s);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1077
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1078 return;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1079 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1080
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1081 failed:
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1082
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1083 ngx_stream_proxy_next_upstream(s);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1084 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1085
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1086
7320 696df3ac27ac SSL: save sessions for upstream peers using a callback function. Sergey Kandaurov <pluknet@nginx.com> parents: 7286 diff changeset	1087 static void
696df3ac27ac SSL: save sessions for upstream peers using a callback function. Sergey Kandaurov <pluknet@nginx.com> parents: 7286 diff changeset	1088 ngx_stream_proxy_ssl_save_session(ngx_connection_t *c)
696df3ac27ac SSL: save sessions for upstream peers using a callback function. Sergey Kandaurov <pluknet@nginx.com> parents: 7286 diff changeset	1089 {
696df3ac27ac SSL: save sessions for upstream peers using a callback function. Sergey Kandaurov <pluknet@nginx.com> parents: 7286 diff changeset	1090 ngx_stream_session_t *s;
696df3ac27ac SSL: save sessions for upstream peers using a callback function. Sergey Kandaurov <pluknet@nginx.com> parents: 7286 diff changeset	1091 ngx_stream_upstream_t *u;
696df3ac27ac SSL: save sessions for upstream peers using a callback function. Sergey Kandaurov <pluknet@nginx.com> parents: 7286 diff changeset	1092
696df3ac27ac SSL: save sessions for upstream peers using a callback function. Sergey Kandaurov <pluknet@nginx.com> parents: 7286 diff changeset	1093 s = c->data;
696df3ac27ac SSL: save sessions for upstream peers using a callback function. Sergey Kandaurov <pluknet@nginx.com> parents: 7286 diff changeset	1094 u = s->upstream;
696df3ac27ac SSL: save sessions for upstream peers using a callback function. Sergey Kandaurov <pluknet@nginx.com> parents: 7286 diff changeset	1095
696df3ac27ac SSL: save sessions for upstream peers using a callback function. Sergey Kandaurov <pluknet@nginx.com> parents: 7286 diff changeset	1096 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: 7286 diff changeset	1097 }
696df3ac27ac SSL: save sessions for upstream peers using a callback function. Sergey Kandaurov <pluknet@nginx.com> parents: 7286 diff changeset	1098
696df3ac27ac SSL: save sessions for upstream peers using a callback function. Sergey Kandaurov <pluknet@nginx.com> parents: 7286 diff changeset	1099
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1100 static ngx_int_t
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1101 ngx_stream_proxy_ssl_name(ngx_stream_session_t *s)
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1102 {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1103 u_char p, last;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1104 ngx_str_t name;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1105 ngx_stream_upstream_t *u;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1106 ngx_stream_proxy_srv_conf_t *pscf;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1107
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1108 pscf = ngx_stream_get_module_srv_conf(s, ngx_stream_proxy_module);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1109
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1110 u = s->upstream;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1111
6643 9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1112 if (pscf->ssl_name) {
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1113 if (ngx_stream_complex_value(s, pscf->ssl_name, &name) != NGX_OK) {
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1114 return NGX_ERROR;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1115 }
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1116
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1117 } else {
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1118 name = u->ssl_name;
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1119 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1120
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1121 if (name.len == 0) {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1122 goto done;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1123 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1124
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1125 /*
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1126 * ssl name here may contain port, strip it for compatibility
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1127 * with the http module
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1128 */
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1129
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1130 p = name.data;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1131 last = name.data + name.len;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1132
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1133 if (*p == '[') {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1134 p = ngx_strlchr(p, last, ']');
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1135
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1136 if (p == NULL) {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1137 p = name.data;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1138 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1139 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1140
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1141 p = ngx_strlchr(p, last, ':');
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1142
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1143 if (p != NULL) {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1144 name.len = p - name.data;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1145 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1146
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1147 if (!pscf->ssl_server_name) {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1148 goto done;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1149 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1150
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1151 #ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1152
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1153 /* as per RFC 6066, literal IPv4 and IPv6 addresses are not permitted */
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1154
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1155 if (name.len == 0 \|\| *name.data == '[') {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1156 goto done;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1157 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1158
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1159 if (ngx_inet_addr(name.data, name.len) != INADDR_NONE) {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1160 goto done;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1161 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1162
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1163 /*
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1164 * SSL_set_tlsext_host_name() needs a null-terminated string,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1165 * hence we explicitly null-terminate name here
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1166 */
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1167
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1168 p = ngx_pnalloc(s->connection->pool, name.len + 1);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1169 if (p == NULL) {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1170 return NGX_ERROR;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1171 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1172
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1173 (void) ngx_cpystrn(p, name.data, name.len + 1);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1174
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1175 name.data = p;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1176
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1177 ngx_log_debug1(NGX_LOG_DEBUG_STREAM, s->connection->log, 0,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1178 "upstream SSL server name: \"%s\"", name.data);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1179
6777 563a1ee345a4 SSL: compatibility with BoringSSL. Maxim Dounin <mdounin@mdounin.ru> parents: 6703 diff changeset	1180 if (SSL_set_tlsext_host_name(u->peer.connection->ssl->connection,
563a1ee345a4 SSL: compatibility with BoringSSL. Maxim Dounin <mdounin@mdounin.ru> parents: 6703 diff changeset	1181 (char *) name.data)
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1182 == 0)
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1183 {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1184 ngx_ssl_error(NGX_LOG_ERR, s->connection->log, 0,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1185 "SSL_set_tlsext_host_name(\"%s\") failed", name.data);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1186 return NGX_ERROR;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1187 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1188
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1189 #endif
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1190
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1191 done:
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1192
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1193 u->ssl_name = name;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1194
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1195 return NGX_OK;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1196 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1197
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1198 #endif
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1199
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1200
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1201 static void
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1202 ngx_stream_proxy_downstream_handler(ngx_event_t *ev)
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1203 {
6200 abee77018d3a Stream: common handler for upstream and downstream. Roman Arutyunyan <arut@nginx.com> parents: 6184 diff changeset	1204 ngx_stream_proxy_process_connection(ev, ev->write);
abee77018d3a Stream: common handler for upstream and downstream. Roman Arutyunyan <arut@nginx.com> parents: 6184 diff changeset	1205 }
abee77018d3a Stream: common handler for upstream and downstream. Roman Arutyunyan <arut@nginx.com> parents: 6184 diff changeset	1206
abee77018d3a Stream: common handler for upstream and downstream. Roman Arutyunyan <arut@nginx.com> parents: 6184 diff changeset	1207
abee77018d3a Stream: common handler for upstream and downstream. Roman Arutyunyan <arut@nginx.com> parents: 6184 diff changeset	1208 static void
6643 9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1209 ngx_stream_proxy_resolve_handler(ngx_resolver_ctx_t *ctx)
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1210 {
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1211 ngx_stream_session_t *s;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1212 ngx_stream_upstream_t *u;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1213 ngx_stream_proxy_srv_conf_t *pscf;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1214 ngx_stream_upstream_resolved_t *ur;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1215
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1216 s = ctx->data;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1217
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1218 u = s->upstream;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1219 ur = u->resolved;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1220
6648 d43ee392e825 Stream: fixed build without stream_ssl_module (ticket #1032). Vladimir Homutov <vl@nginx.com> parents: 6643 diff changeset	1221 ngx_log_debug0(NGX_LOG_DEBUG_STREAM, s->connection->log, 0,
6643 9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1222 "stream upstream resolve");
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1223
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1224 if (ctx->state) {
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1225 ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1226 "%V could not be resolved (%i: %s)",
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1227 &ctx->name, ctx->state,
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1228 ngx_resolver_strerror(ctx->state));
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1229
6674 38143d1abdec Stream: the $status variable. Roman Arutyunyan <arut@nginx.com> parents: 6648 diff changeset	1230 ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
6643 9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1231 return;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1232 }
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1233
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1234 ur->naddrs = ctx->naddrs;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1235 ur->addrs = ctx->addrs;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1236
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1237 #if (NGX_DEBUG)
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1238 {
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1239 u_char text[NGX_SOCKADDR_STRLEN];
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1240 ngx_str_t addr;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1241 ngx_uint_t i;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1242
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1243 addr.data = text;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1244
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1245 for (i = 0; i < ctx->naddrs; i++) {
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1246 addr.len = ngx_sock_ntop(ur->addrs[i].sockaddr, ur->addrs[i].socklen,
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1247 text, NGX_SOCKADDR_STRLEN, 0);
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1248
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1249 ngx_log_debug1(NGX_LOG_DEBUG_STREAM, s->connection->log, 0,
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1250 "name was resolved to %V", &addr);
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1251 }
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1252 }
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1253 #endif
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1254
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1255 if (ngx_stream_upstream_create_round_robin_peer(s, ur) != NGX_OK) {
6674 38143d1abdec Stream: the $status variable. Roman Arutyunyan <arut@nginx.com> parents: 6648 diff changeset	1256 ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
6643 9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1257 return;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1258 }
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1259
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1260 ngx_resolve_name_done(ctx);
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1261 ur->ctx = NULL;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1262
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1263 u->peer.start_time = ngx_current_msec;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1264
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1265 pscf = ngx_stream_get_module_srv_conf(s, ngx_stream_proxy_module);
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1266
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1267 if (pscf->next_upstream_tries
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1268 && u->peer.tries > pscf->next_upstream_tries)
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1269 {
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1270 u->peer.tries = pscf->next_upstream_tries;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1271 }
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1272
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1273 ngx_stream_proxy_connect(s);
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1274 }
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1275
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1276
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1277 static void
6200 abee77018d3a Stream: common handler for upstream and downstream. Roman Arutyunyan <arut@nginx.com> parents: 6184 diff changeset	1278 ngx_stream_proxy_upstream_handler(ngx_event_t *ev)
abee77018d3a Stream: common handler for upstream and downstream. Roman Arutyunyan <arut@nginx.com> parents: 6184 diff changeset	1279 {
abee77018d3a Stream: common handler for upstream and downstream. Roman Arutyunyan <arut@nginx.com> parents: 6184 diff changeset	1280 ngx_stream_proxy_process_connection(ev, !ev->write);
abee77018d3a Stream: common handler for upstream and downstream. Roman Arutyunyan <arut@nginx.com> parents: 6184 diff changeset	1281 }
abee77018d3a Stream: common handler for upstream and downstream. Roman Arutyunyan <arut@nginx.com> parents: 6184 diff changeset	1282
abee77018d3a Stream: common handler for upstream and downstream. Roman Arutyunyan <arut@nginx.com> parents: 6184 diff changeset	1283
abee77018d3a Stream: common handler for upstream and downstream. Roman Arutyunyan <arut@nginx.com> parents: 6184 diff changeset	1284 static void
abee77018d3a Stream: common handler for upstream and downstream. Roman Arutyunyan <arut@nginx.com> parents: 6184 diff changeset	1285 ngx_stream_proxy_process_connection(ngx_event_t *ev, ngx_uint_t from_upstream)
abee77018d3a Stream: common handler for upstream and downstream. Roman Arutyunyan <arut@nginx.com> parents: 6184 diff changeset	1286 {
6201 24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1287 ngx_connection_t c, pc;
7286 d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1288 ngx_log_handler_pt handler;
6201 24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1289 ngx_stream_session_t *s;
24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1290 ngx_stream_upstream_t *u;
24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1291 ngx_stream_proxy_srv_conf_t *pscf;
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1292
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1293 c = ev->data;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1294 s = c->data;
6200 abee77018d3a Stream: common handler for upstream and downstream. Roman Arutyunyan <arut@nginx.com> parents: 6184 diff changeset	1295 u = s->upstream;
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1296
7156 9c29644f6d03 Fixed worker_shutdown_timeout in various cases. Maxim Dounin <mdounin@mdounin.ru> parents: 7105 diff changeset	1297 if (c->close) {
9c29644f6d03 Fixed worker_shutdown_timeout in various cases. Maxim Dounin <mdounin@mdounin.ru> parents: 7105 diff changeset	1298 ngx_log_error(NGX_LOG_INFO, c->log, 0, "shutdown timeout");
9c29644f6d03 Fixed worker_shutdown_timeout in various cases. Maxim Dounin <mdounin@mdounin.ru> parents: 7105 diff changeset	1299 ngx_stream_proxy_finalize(s, NGX_STREAM_OK);
9c29644f6d03 Fixed worker_shutdown_timeout in various cases. Maxim Dounin <mdounin@mdounin.ru> parents: 7105 diff changeset	1300 return;
9c29644f6d03 Fixed worker_shutdown_timeout in various cases. Maxim Dounin <mdounin@mdounin.ru> parents: 7105 diff changeset	1301 }
9c29644f6d03 Fixed worker_shutdown_timeout in various cases. Maxim Dounin <mdounin@mdounin.ru> parents: 7105 diff changeset	1302
6436 8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	1303 c = s->connection;
8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	1304 pc = u->peer.connection;
8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	1305
8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	1306 pscf = ngx_stream_get_module_srv_conf(s, ngx_stream_proxy_module);
8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	1307
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1308 if (ev->timedout) {
6436 8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	1309 ev->timedout = 0;
6201 24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1310
24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1311 if (ev->delayed) {
24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1312 ev->delayed = 0;
24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1313
24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1314 if (!ev->ready) {
24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1315 if (ngx_handle_read_event(ev, 0) != NGX_OK) {
6674 38143d1abdec Stream: the $status variable. Roman Arutyunyan <arut@nginx.com> parents: 6648 diff changeset	1316 ngx_stream_proxy_finalize(s,
38143d1abdec Stream: the $status variable. Roman Arutyunyan <arut@nginx.com> parents: 6648 diff changeset	1317 NGX_STREAM_INTERNAL_SERVER_ERROR);
6201 24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1318 return;
24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1319 }
24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1320
6436 8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	1321 if (u->connected && !c->read->delayed && !pc->read->delayed) {
8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	1322 ngx_add_timer(c->write, pscf->timeout);
6201 24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1323 }
24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1324
24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1325 return;
24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1326 }
24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1327
24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1328 } else {
6436 8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	1329 if (s->connection->type == SOCK_DGRAM) {
8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	1330 if (pscf->responses == NGX_MAX_INT32_VALUE) {
8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	1331
8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	1332 /*
8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	1333 * successfully terminate timed out UDP session
8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	1334 * with unspecified number of responses
8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	1335 */
8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	1336
7286 d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1337 handler = c->log->handler;
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1338 c->log->handler = NULL;
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1339
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1340 ngx_log_error(NGX_LOG_INFO, c->log, 0,
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1341 "udp timed out"
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1342 ", packets from/to client:%ui/%ui"
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1343 ", bytes from/to client:%O/%O"
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1344 ", bytes from/to upstream:%O/%O",
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1345 u->requests, u->responses,
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1346 s->received, c->sent, u->received,
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1347 pc ? pc->sent : 0);
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1348
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1349 c->log->handler = handler;
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1350
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1351 ngx_stream_proxy_finalize(s, NGX_STREAM_OK);
6436 8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	1352 return;
8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	1353 }
8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	1354
7105 0846dd76a487 Stream: fixed logging UDP upstream timeout. Roman Arutyunyan <arut@nginx.com> parents: 7098 diff changeset	1355 ngx_connection_error(pc, NGX_ETIMEDOUT, "upstream timed out");
0846dd76a487 Stream: fixed logging UDP upstream timeout. Roman Arutyunyan <arut@nginx.com> parents: 7098 diff changeset	1356
7286 d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1357 pc->read->error = 1;
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1358
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1359 ngx_stream_proxy_finalize(s, NGX_STREAM_BAD_GATEWAY);
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1360
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1361 return;
6436 8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	1362 }
8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	1363
7286 d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1364 ngx_connection_error(c, NGX_ETIMEDOUT, "connection timed out");
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1365
6674 38143d1abdec Stream: the $status variable. Roman Arutyunyan <arut@nginx.com> parents: 6648 diff changeset	1366 ngx_stream_proxy_finalize(s, NGX_STREAM_OK);
7286 d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1367
6201 24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1368 return;
24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1369 }
24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1370
24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1371 } else if (ev->delayed) {
24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1372
24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1373 ngx_log_debug0(NGX_LOG_DEBUG_STREAM, c->log, 0,
24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1374 "stream connection delayed");
24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1375
24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1376 if (ngx_handle_read_event(ev, 0) != NGX_OK) {
6674 38143d1abdec Stream: the $status variable. Roman Arutyunyan <arut@nginx.com> parents: 6648 diff changeset	1377 ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
6201 24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1378 }
24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1379
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1380 return;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1381 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1382
6202 6345822f0abb Stream: upstream "connected" flag. Roman Arutyunyan <arut@nginx.com> parents: 6201 diff changeset	1383 if (from_upstream && !u->connected) {
6200 abee77018d3a Stream: common handler for upstream and downstream. Roman Arutyunyan <arut@nginx.com> parents: 6184 diff changeset	1384 return;
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1385 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1386
6200 abee77018d3a Stream: common handler for upstream and downstream. Roman Arutyunyan <arut@nginx.com> parents: 6184 diff changeset	1387 ngx_stream_proxy_process(s, from_upstream, ev->write);
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1388 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1389
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1390
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1391 static void
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1392 ngx_stream_proxy_connect_handler(ngx_event_t *ev)
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1393 {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1394 ngx_connection_t *c;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1395 ngx_stream_session_t *s;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1396
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1397 c = ev->data;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1398 s = c->data;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1399
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1400 if (ev->timedout) {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1401 ngx_log_error(NGX_LOG_ERR, c->log, NGX_ETIMEDOUT, "upstream timed out");
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1402 ngx_stream_proxy_next_upstream(s);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1403 return;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1404 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1405
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1406 ngx_del_timer(c->write);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1407
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1408 ngx_log_debug0(NGX_LOG_DEBUG_STREAM, c->log, 0,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1409 "stream proxy connect upstream");
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1410
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1411 if (ngx_stream_proxy_test_connect(c) != NGX_OK) {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1412 ngx_stream_proxy_next_upstream(s);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1413 return;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1414 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1415
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1416 ngx_stream_proxy_init_upstream(s);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1417 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1418
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1419
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1420 static ngx_int_t
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1421 ngx_stream_proxy_test_connect(ngx_connection_t *c)
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1422 {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1423 int err;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1424 socklen_t len;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1425
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1426 #if (NGX_HAVE_KQUEUE)
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1427
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1428 if (ngx_event_flags & NGX_USE_KQUEUE_EVENT) {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1429 err = c->write->kq_errno ? c->write->kq_errno : c->read->kq_errno;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1430
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1431 if (err) {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1432 (void) ngx_connection_error(c, err,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1433 "kevent() reported that connect() failed");
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1434 return NGX_ERROR;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1435 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1436
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1437 } else
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1438 #endif
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1439 {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1440 err = 0;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1441 len = sizeof(int);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1442
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1443 /*
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1444 * BSDs and Linux return 0 and set a pending error in err
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1445 * Solaris returns -1 and sets errno
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1446 */
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1447
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1448 if (getsockopt(c->fd, SOL_SOCKET, SO_ERROR, (void *) &err, &len)
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1449 == -1)
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1450 {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1451 err = ngx_socket_errno;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1452 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1453
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1454 if (err) {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1455 (void) ngx_connection_error(c, err, "connect() failed");
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1456 return NGX_ERROR;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1457 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1458 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1459
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1460 return NGX_OK;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1461 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1462
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1463
6435 d1c791479bbb Stream: post first read events from client and upstream. Roman Arutyunyan <arut@nginx.com> parents: 6393 diff changeset	1464 static void
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1465 ngx_stream_proxy_process(ngx_stream_session_t *s, ngx_uint_t from_upstream,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1466 ngx_uint_t do_write)
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1467 {
7250 ec4d95eed062 Stream: set action before each recv/send while proxying. Roman Arutyunyan <arut@nginx.com> parents: 7174 diff changeset	1468 char recv_action, send_action;
6201 24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1469 off_t *received, limit;
24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1470 size_t size, limit_rate;
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1471 ssize_t n;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1472 ngx_buf_t *b;
6692 56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	1473 ngx_int_t rc;
7286 d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1474 ngx_uint_t flags, *packets;
6201 24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1475 ngx_msec_t delay;
6692 56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	1476 ngx_chain_t cl, ll, out, *busy;
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1477 ngx_connection_t c, pc, src, dst;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1478 ngx_log_handler_pt handler;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1479 ngx_stream_upstream_t *u;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1480 ngx_stream_proxy_srv_conf_t *pscf;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1481
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1482 u = s->upstream;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1483
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1484 c = s->connection;
6202 6345822f0abb Stream: upstream "connected" flag. Roman Arutyunyan <arut@nginx.com> parents: 6201 diff changeset	1485 pc = u->connected ? u->peer.connection : NULL;
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1486
6436 8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	1487 if (c->type == SOCK_DGRAM && (ngx_terminate \|\| ngx_exiting)) {
8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	1488
8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	1489 /* socket is already closed on worker shutdown */
8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	1490
8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	1491 handler = c->log->handler;
8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	1492 c->log->handler = NULL;
8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	1493
8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	1494 ngx_log_error(NGX_LOG_INFO, c->log, 0, "disconnected on shutdown");
8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	1495
8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	1496 c->log->handler = handler;
8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	1497
6674 38143d1abdec Stream: the $status variable. Roman Arutyunyan <arut@nginx.com> parents: 6648 diff changeset	1498 ngx_stream_proxy_finalize(s, NGX_STREAM_OK);
6436 8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	1499 return;
8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	1500 }
8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	1501
6201 24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1502 pscf = ngx_stream_get_module_srv_conf(s, ngx_stream_proxy_module);
24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1503
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1504 if (from_upstream) {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1505 src = pc;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1506 dst = c;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1507 b = &u->upstream_buf;
6208 7a14a0d754ad Stream: renamed rate limiting directives. Roman Arutyunyan <arut@nginx.com> parents: 6204 diff changeset	1508 limit_rate = pscf->download_rate;
6201 24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1509 received = &u->received;
7286 d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1510 packets = &u->responses;
6692 56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	1511 out = &u->downstream_out;
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	1512 busy = &u->downstream_busy;
7250 ec4d95eed062 Stream: set action before each recv/send while proxying. Roman Arutyunyan <arut@nginx.com> parents: 7174 diff changeset	1513 recv_action = "proxying and reading from upstream";
ec4d95eed062 Stream: set action before each recv/send while proxying. Roman Arutyunyan <arut@nginx.com> parents: 7174 diff changeset	1514 send_action = "proxying and sending to client";
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1515
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1516 } else {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1517 src = c;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1518 dst = pc;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1519 b = &u->downstream_buf;
6208 7a14a0d754ad Stream: renamed rate limiting directives. Roman Arutyunyan <arut@nginx.com> parents: 6204 diff changeset	1520 limit_rate = pscf->upload_rate;
6201 24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1521 received = &s->received;
7286 d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1522 packets = &u->requests;
6692 56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	1523 out = &u->upstream_out;
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	1524 busy = &u->upstream_busy;
7250 ec4d95eed062 Stream: set action before each recv/send while proxying. Roman Arutyunyan <arut@nginx.com> parents: 7174 diff changeset	1525 recv_action = "proxying and reading from client";
ec4d95eed062 Stream: set action before each recv/send while proxying. Roman Arutyunyan <arut@nginx.com> parents: 7174 diff changeset	1526 send_action = "proxying and sending to upstream";
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1527 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1528
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1529 for ( ;; ) {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1530
6692 56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	1531 if (do_write && dst) {
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	1532
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	1533 if (out \|\| busy \|\| dst->buffered) {
7250 ec4d95eed062 Stream: set action before each recv/send while proxying. Roman Arutyunyan <arut@nginx.com> parents: 7174 diff changeset	1534 c->log->action = send_action;
ec4d95eed062 Stream: set action before each recv/send while proxying. Roman Arutyunyan <arut@nginx.com> parents: 7174 diff changeset	1535
6692 56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	1536 rc = ngx_stream_top_filter(s, *out, from_upstream);
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	1537
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	1538 if (rc == NGX_ERROR) {
6674 38143d1abdec Stream: the $status variable. Roman Arutyunyan <arut@nginx.com> parents: 6648 diff changeset	1539 ngx_stream_proxy_finalize(s, NGX_STREAM_OK);
6435 d1c791479bbb Stream: post first read events from client and upstream. Roman Arutyunyan <arut@nginx.com> parents: 6393 diff changeset	1540 return;
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1541 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1542
6692 56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	1543 ngx_chain_update_chains(c->pool, &u->free, busy, out,
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	1544 (ngx_buf_tag_t) &ngx_stream_proxy_module);
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	1545
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	1546 if (*busy == NULL) {
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	1547 b->pos = b->start;
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	1548 b->last = b->start;
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1549 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1550 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1551 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1552
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1553 size = b->end - b->last;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1554
6868 ee3645078759 Stream: avoid infinite loop in case of socket read error. Vladimir Homutov <vl@nginx.com> parents: 6863 diff changeset	1555 if (size && src->read->ready && !src->read->delayed
ee3645078759 Stream: avoid infinite loop in case of socket read error. Vladimir Homutov <vl@nginx.com> parents: 6863 diff changeset	1556 && !src->read->error)
ee3645078759 Stream: avoid infinite loop in case of socket read error. Vladimir Homutov <vl@nginx.com> parents: 6863 diff changeset	1557 {
6201 24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1558 if (limit_rate) {
24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1559 limit = (off_t) limit_rate * (ngx_time() - u->start_sec + 1)
24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1560 - *received;
24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1561
24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1562 if (limit <= 0) {
24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1563 src->read->delayed = 1;
24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1564 delay = (ngx_msec_t) (- limit * 1000 / limit_rate + 1);
24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1565 ngx_add_timer(src->read, delay);
24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1566 break;
24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1567 }
24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1568
6204 114d1f8cdcab Stream: fixed possible integer overflow in rate limiting. Valentin Bartenev <vbart@nginx.com> parents: 6203 diff changeset	1569 if ((off_t) size > limit) {
6203 fdfdcad62875 Stream: fixed MSVC compilation warning. Roman Arutyunyan <arut@nginx.com> parents: 6202 diff changeset	1570 size = (size_t) limit;
6201 24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1571 }
24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1572 }
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1573
7250 ec4d95eed062 Stream: set action before each recv/send while proxying. Roman Arutyunyan <arut@nginx.com> parents: 7174 diff changeset	1574 c->log->action = recv_action;
ec4d95eed062 Stream: set action before each recv/send while proxying. Roman Arutyunyan <arut@nginx.com> parents: 7174 diff changeset	1575
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1576 n = src->recv(src, b->last, size);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1577
6692 56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	1578 if (n == NGX_AGAIN) {
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1579 break;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1580 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1581
6692 56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	1582 if (n == NGX_ERROR) {
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	1583 src->read->eof = 1;
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	1584 n = 0;
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	1585 }
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	1586
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	1587 if (n >= 0) {
6201 24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1588 if (limit_rate) {
24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1589 delay = (ngx_msec_t) (n * 1000 / limit_rate);
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1590
6201 24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1591 if (delay > 0) {
24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1592 src->read->delayed = 1;
24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1593 ngx_add_timer(src->read, delay);
24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1594 }
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1595 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1596
6677 c02290241cbe Stream: upstream response time variables. Vladimir Homutov <vl@nginx.com> parents: 6676 diff changeset	1597 if (from_upstream) {
c02290241cbe Stream: upstream response time variables. Vladimir Homutov <vl@nginx.com> parents: 6676 diff changeset	1598 if (u->state->first_byte_time == (ngx_msec_t) -1) {
c02290241cbe Stream: upstream response time variables. Vladimir Homutov <vl@nginx.com> parents: 6676 diff changeset	1599 u->state->first_byte_time = ngx_current_msec
c02290241cbe Stream: upstream response time variables. Vladimir Homutov <vl@nginx.com> parents: 6676 diff changeset	1600 - u->state->response_time;
c02290241cbe Stream: upstream response time variables. Vladimir Homutov <vl@nginx.com> parents: 6676 diff changeset	1601 }
c02290241cbe Stream: upstream response time variables. Vladimir Homutov <vl@nginx.com> parents: 6676 diff changeset	1602 }
c02290241cbe Stream: upstream response time variables. Vladimir Homutov <vl@nginx.com> parents: 6676 diff changeset	1603
6692 56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	1604 for (ll = out; ll; ll = &(ll)->next) { /* void */ }
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	1605
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	1606 cl = ngx_chain_get_free_buf(c->pool, &u->free);
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	1607 if (cl == NULL) {
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	1608 ngx_stream_proxy_finalize(s,
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	1609 NGX_STREAM_INTERNAL_SERVER_ERROR);
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	1610 return;
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	1611 }
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	1612
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	1613 *ll = cl;
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	1614
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	1615 cl->buf->pos = b->last;
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	1616 cl->buf->last = b->last + n;
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	1617 cl->buf->tag = (ngx_buf_tag_t) &ngx_stream_proxy_module;
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	1618
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	1619 cl->buf->temporary = (n ? 1 : 0);
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	1620 cl->buf->last_buf = src->read->eof;
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	1621 cl->buf->flush = 1;
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	1622
7286 d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1623 (*packets)++;
6201 24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1624 *received += n;
24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1625 b->last += n;
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1626 do_write = 1;
6201 24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1627
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1628 continue;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1629 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1630 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1631
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1632 break;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1633 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1634
7250 ec4d95eed062 Stream: set action before each recv/send while proxying. Roman Arutyunyan <arut@nginx.com> parents: 7174 diff changeset	1635 c->log->action = "proxying connection";
ec4d95eed062 Stream: set action before each recv/send while proxying. Roman Arutyunyan <arut@nginx.com> parents: 7174 diff changeset	1636
7286 d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1637 if (c->type == SOCK_DGRAM
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1638 && pscf->responses != NGX_MAX_INT32_VALUE
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1639 && u->responses >= pscf->responses * u->requests
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1640 && !src->buffered && dst && !dst->buffered)
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1641 {
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1642 handler = c->log->handler;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1643 c->log->handler = NULL;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1644
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1645 ngx_log_error(NGX_LOG_INFO, c->log, 0,
7286 d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1646 "udp done"
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1647 ", packets from/to client:%ui/%ui"
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1648 ", bytes from/to client:%O/%O"
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1649 ", bytes from/to upstream:%O/%O",
7286 d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1650 u->requests, u->responses,
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1651 s->received, c->sent, u->received, pc ? pc->sent : 0);
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1652
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1653 c->log->handler = handler;
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1654
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1655 ngx_stream_proxy_finalize(s, NGX_STREAM_OK);
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1656 return;
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1657 }
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1658
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1659 if (c->type == SOCK_STREAM
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1660 && src->read->eof && dst && (dst->read->eof \|\| !dst->buffered))
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1661 {
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1662 handler = c->log->handler;
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1663 c->log->handler = NULL;
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1664
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1665 ngx_log_error(NGX_LOG_INFO, c->log, 0,
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1666 "%s disconnected"
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1667 ", bytes from/to client:%O/%O"
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1668 ", bytes from/to upstream:%O/%O",
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1669 from_upstream ? "upstream" : "client",
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1670 s->received, c->sent, u->received, pc ? pc->sent : 0);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1671
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1672 c->log->handler = handler;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1673
6674 38143d1abdec Stream: the $status variable. Roman Arutyunyan <arut@nginx.com> parents: 6648 diff changeset	1674 ngx_stream_proxy_finalize(s, NGX_STREAM_OK);
6435 d1c791479bbb Stream: post first read events from client and upstream. Roman Arutyunyan <arut@nginx.com> parents: 6393 diff changeset	1675 return;
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1676 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1677
6124 f1f222db290b Stream: prevent repeated event notifications after eof. Roman Arutyunyan <arut@nginx.com> parents: 6115 diff changeset	1678 flags = src->read->eof ? NGX_CLOSE_EVENT : 0;
f1f222db290b Stream: prevent repeated event notifications after eof. Roman Arutyunyan <arut@nginx.com> parents: 6115 diff changeset	1679
6436 8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	1680 if (!src->shared && ngx_handle_read_event(src->read, flags) != NGX_OK) {
6674 38143d1abdec Stream: the $status variable. Roman Arutyunyan <arut@nginx.com> parents: 6648 diff changeset	1681 ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
6435 d1c791479bbb Stream: post first read events from client and upstream. Roman Arutyunyan <arut@nginx.com> parents: 6393 diff changeset	1682 return;
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1683 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1684
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1685 if (dst) {
6436 8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	1686 if (!dst->shared && ngx_handle_write_event(dst->write, 0) != NGX_OK) {
6674 38143d1abdec Stream: the $status variable. Roman Arutyunyan <arut@nginx.com> parents: 6648 diff changeset	1687 ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
6435 d1c791479bbb Stream: post first read events from client and upstream. Roman Arutyunyan <arut@nginx.com> parents: 6393 diff changeset	1688 return;
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1689 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1690
6201 24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1691 if (!c->read->delayed && !pc->read->delayed) {
24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1692 ngx_add_timer(c->write, pscf->timeout);
24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1693
24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1694 } else if (c->write->timer_set) {
24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1695 ngx_del_timer(c->write);
24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1696 }
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1697 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1698 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1699
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1700
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1701 static void
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1702 ngx_stream_proxy_next_upstream(ngx_stream_session_t *s)
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1703 {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1704 ngx_msec_t timeout;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1705 ngx_connection_t *pc;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1706 ngx_stream_upstream_t *u;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1707 ngx_stream_proxy_srv_conf_t *pscf;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1708
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1709 ngx_log_debug0(NGX_LOG_DEBUG_STREAM, s->connection->log, 0,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1710 "stream proxy next upstream");
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1711
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1712 u = s->upstream;
6692 56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	1713 pc = u->peer.connection;
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	1714
7098 7bfbf73db920 Stream: relaxed next upstream condition (ticket #1317). Roman Arutyunyan <arut@nginx.com> parents: 7007 diff changeset	1715 if (pc && pc->buffered) {
6692 56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	1716 ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
7098 7bfbf73db920 Stream: relaxed next upstream condition (ticket #1317). Roman Arutyunyan <arut@nginx.com> parents: 7007 diff changeset	1717 "buffered data on next upstream");
6692 56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	1718 ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	1719 return;
56fc55e32f23 Stream: filters. Roman Arutyunyan <arut@nginx.com> parents: 6677 diff changeset	1720 }
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1721
7098 7bfbf73db920 Stream: relaxed next upstream condition (ticket #1317). Roman Arutyunyan <arut@nginx.com> parents: 7007 diff changeset	1722 if (s->connection->type == SOCK_DGRAM) {
7bfbf73db920 Stream: relaxed next upstream condition (ticket #1317). Roman Arutyunyan <arut@nginx.com> parents: 7007 diff changeset	1723 u->upstream_out = NULL;
7bfbf73db920 Stream: relaxed next upstream condition (ticket #1317). Roman Arutyunyan <arut@nginx.com> parents: 7007 diff changeset	1724 }
7bfbf73db920 Stream: relaxed next upstream condition (ticket #1317). Roman Arutyunyan <arut@nginx.com> parents: 7007 diff changeset	1725
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1726 if (u->peer.sockaddr) {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1727 u->peer.free(&u->peer, u->peer.data, NGX_PEER_FAILED);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1728 u->peer.sockaddr = NULL;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1729 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1730
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1731 pscf = ngx_stream_get_module_srv_conf(s, ngx_stream_proxy_module);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1732
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1733 timeout = pscf->next_upstream_timeout;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1734
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1735 if (u->peer.tries == 0
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1736 \|\| !pscf->next_upstream
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1737 \|\| (timeout && ngx_current_msec - u->peer.start_time >= timeout))
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1738 {
6674 38143d1abdec Stream: the $status variable. Roman Arutyunyan <arut@nginx.com> parents: 6648 diff changeset	1739 ngx_stream_proxy_finalize(s, NGX_STREAM_BAD_GATEWAY);
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1740 return;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1741 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1742
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1743 if (pc) {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1744 ngx_log_debug1(NGX_LOG_DEBUG_STREAM, s->connection->log, 0,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1745 "close proxy upstream connection: %d", pc->fd);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1746
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1747 #if (NGX_STREAM_SSL)
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1748 if (pc->ssl) {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1749 pc->ssl->no_wait_shutdown = 1;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1750 pc->ssl->no_send_shutdown = 1;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1751
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1752 (void) ngx_ssl_shutdown(pc);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1753 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1754 #endif
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1755
6676 df3a7c029dec Stream: $upstream_bytes_sent and $upstream_bytes_received. Vladimir Homutov <vl@nginx.com> parents: 6675 diff changeset	1756 u->state->bytes_received = u->received;
df3a7c029dec Stream: $upstream_bytes_sent and $upstream_bytes_received. Vladimir Homutov <vl@nginx.com> parents: 6675 diff changeset	1757 u->state->bytes_sent = pc->sent;
df3a7c029dec Stream: $upstream_bytes_sent and $upstream_bytes_received. Vladimir Homutov <vl@nginx.com> parents: 6675 diff changeset	1758
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1759 ngx_close_connection(pc);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1760 u->peer.connection = NULL;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1761 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1762
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1763 ngx_stream_proxy_connect(s);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1764 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1765
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1766
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1767 static void
6674 38143d1abdec Stream: the $status variable. Roman Arutyunyan <arut@nginx.com> parents: 6648 diff changeset	1768 ngx_stream_proxy_finalize(ngx_stream_session_t *s, ngx_uint_t rc)
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1769 {
7286 d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1770 ngx_uint_t state;
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1771 ngx_connection_t *pc;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1772 ngx_stream_upstream_t *u;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1773
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1774 ngx_log_debug1(NGX_LOG_DEBUG_STREAM, s->connection->log, 0,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1775 "finalize stream proxy: %i", rc);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1776
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1777 u = s->upstream;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1778
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1779 if (u == NULL) {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1780 goto noupstream;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1781 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1782
6643 9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1783 if (u->resolved && u->resolved->ctx) {
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1784 ngx_resolve_name_done(u->resolved->ctx);
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1785 u->resolved->ctx = NULL;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1786 }
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1787
6676 df3a7c029dec Stream: $upstream_bytes_sent and $upstream_bytes_received. Vladimir Homutov <vl@nginx.com> parents: 6675 diff changeset	1788 pc = u->peer.connection;
df3a7c029dec Stream: $upstream_bytes_sent and $upstream_bytes_received. Vladimir Homutov <vl@nginx.com> parents: 6675 diff changeset	1789
df3a7c029dec Stream: $upstream_bytes_sent and $upstream_bytes_received. Vladimir Homutov <vl@nginx.com> parents: 6675 diff changeset	1790 if (u->state) {
6677 c02290241cbe Stream: upstream response time variables. Vladimir Homutov <vl@nginx.com> parents: 6676 diff changeset	1791 u->state->response_time = ngx_current_msec - u->state->response_time;
c02290241cbe Stream: upstream response time variables. Vladimir Homutov <vl@nginx.com> parents: 6676 diff changeset	1792
6676 df3a7c029dec Stream: $upstream_bytes_sent and $upstream_bytes_received. Vladimir Homutov <vl@nginx.com> parents: 6675 diff changeset	1793 if (pc) {
df3a7c029dec Stream: $upstream_bytes_sent and $upstream_bytes_received. Vladimir Homutov <vl@nginx.com> parents: 6675 diff changeset	1794 u->state->bytes_received = u->received;
df3a7c029dec Stream: $upstream_bytes_sent and $upstream_bytes_received. Vladimir Homutov <vl@nginx.com> parents: 6675 diff changeset	1795 u->state->bytes_sent = pc->sent;
df3a7c029dec Stream: $upstream_bytes_sent and $upstream_bytes_received. Vladimir Homutov <vl@nginx.com> parents: 6675 diff changeset	1796 }
df3a7c029dec Stream: $upstream_bytes_sent and $upstream_bytes_received. Vladimir Homutov <vl@nginx.com> parents: 6675 diff changeset	1797 }
df3a7c029dec Stream: $upstream_bytes_sent and $upstream_bytes_received. Vladimir Homutov <vl@nginx.com> parents: 6675 diff changeset	1798
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1799 if (u->peer.free && u->peer.sockaddr) {
7286 d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1800 state = 0;
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1801
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1802 if (pc && pc->type == SOCK_DGRAM
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1803 && (pc->read->error \|\| pc->write->error))
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1804 {
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1805 state = NGX_PEER_FAILED;
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1806 }
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1807
d27aa9060c95 Stream: udp streams. Roman Arutyunyan <arut@nginx.com> parents: 7250 diff changeset	1808 u->peer.free(&u->peer, u->peer.data, state);
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1809 u->peer.sockaddr = NULL;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1810 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1811
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1812 if (pc) {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1813 ngx_log_debug1(NGX_LOG_DEBUG_STREAM, s->connection->log, 0,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1814 "close stream proxy upstream connection: %d", pc->fd);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1815
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1816 #if (NGX_STREAM_SSL)
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1817 if (pc->ssl) {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1818 pc->ssl->no_wait_shutdown = 1;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1819 (void) ngx_ssl_shutdown(pc);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1820 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1821 #endif
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1822
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1823 ngx_close_connection(pc);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1824 u->peer.connection = NULL;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1825 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1826
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1827 noupstream:
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1828
6674 38143d1abdec Stream: the $status variable. Roman Arutyunyan <arut@nginx.com> parents: 6648 diff changeset	1829 ngx_stream_finalize_session(s, rc);
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1830 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1831
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1832
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1833 static u_char *
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1834 ngx_stream_proxy_log_error(ngx_log_t log, u_char buf, size_t len)
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1835 {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1836 u_char *p;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1837 ngx_connection_t *pc;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1838 ngx_stream_session_t *s;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1839 ngx_stream_upstream_t *u;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1840
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1841 s = log->data;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1842
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1843 u = s->upstream;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1844
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1845 p = buf;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1846
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1847 if (u->peer.name) {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1848 p = ngx_snprintf(p, len, ", upstream: \"%V\"", u->peer.name);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1849 len -= p - buf;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1850 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1851
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1852 pc = u->peer.connection;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1853
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1854 p = ngx_snprintf(p, len,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1855 ", bytes from/to client:%O/%O"
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1856 ", bytes from/to upstream:%O/%O",
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1857 s->received, s->connection->sent,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1858 u->received, pc ? pc->sent : 0);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1859
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1860 return p;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1861 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1862
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1863
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1864 static void *
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1865 ngx_stream_proxy_create_srv_conf(ngx_conf_t *cf)
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1866 {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1867 ngx_stream_proxy_srv_conf_t *conf;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1868
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1869 conf = ngx_pcalloc(cf->pool, sizeof(ngx_stream_proxy_srv_conf_t));
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1870 if (conf == NULL) {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1871 return NULL;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1872 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1873
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1874 /*
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1875 * set by ngx_pcalloc():
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1876 *
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1877 * conf->ssl_protocols = 0;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1878 * conf->ssl_ciphers = { 0, NULL };
6643 9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1879 * conf->ssl_name = NULL;
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1880 * conf->ssl_trusted_certificate = { 0, NULL };
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1881 * conf->ssl_crl = { 0, NULL };
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1882 * conf->ssl_certificate = { 0, NULL };
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1883 * conf->ssl_certificate_key = { 0, NULL };
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1884 *
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1885 * conf->ssl = NULL;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1886 * conf->upstream = NULL;
6643 9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1887 * conf->upstream_value = NULL;
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1888 */
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1889
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1890 conf->connect_timeout = NGX_CONF_UNSET_MSEC;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1891 conf->timeout = NGX_CONF_UNSET_MSEC;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1892 conf->next_upstream_timeout = NGX_CONF_UNSET_MSEC;
6215 8ee6a08ea3eb Stream: added proxy_buffer_size to set the size of data buffers. Roman Arutyunyan <arut@nginx.com> parents: 6208 diff changeset	1893 conf->buffer_size = NGX_CONF_UNSET_SIZE;
6208 7a14a0d754ad Stream: renamed rate limiting directives. Roman Arutyunyan <arut@nginx.com> parents: 6204 diff changeset	1894 conf->upload_rate = NGX_CONF_UNSET_SIZE;
7a14a0d754ad Stream: renamed rate limiting directives. Roman Arutyunyan <arut@nginx.com> parents: 6204 diff changeset	1895 conf->download_rate = NGX_CONF_UNSET_SIZE;
6436 8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	1896 conf->responses = NGX_CONF_UNSET_UINT;
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1897 conf->next_upstream_tries = NGX_CONF_UNSET_UINT;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1898 conf->next_upstream = NGX_CONF_UNSET;
6184 fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	1899 conf->proxy_protocol = NGX_CONF_UNSET;
6183 4dcffe43a7ea Stream: the "proxy_bind" directive. Vladimir Homutov <vl@nginx.com> parents: 6174 diff changeset	1900 conf->local = NGX_CONF_UNSET_PTR;
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1901
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1902 #if (NGX_STREAM_SSL)
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1903 conf->ssl_enable = NGX_CONF_UNSET;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1904 conf->ssl_session_reuse = NGX_CONF_UNSET;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1905 conf->ssl_server_name = NGX_CONF_UNSET;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1906 conf->ssl_verify = NGX_CONF_UNSET;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1907 conf->ssl_verify_depth = NGX_CONF_UNSET_UINT;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1908 conf->ssl_passwords = NGX_CONF_UNSET_PTR;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1909 #endif
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1910
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1911 return conf;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1912 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1913
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1914
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1915 static char *
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1916 ngx_stream_proxy_merge_srv_conf(ngx_conf_t cf, void parent, void *child)
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1917 {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1918 ngx_stream_proxy_srv_conf_t *prev = parent;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1919 ngx_stream_proxy_srv_conf_t *conf = child;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1920
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1921 ngx_conf_merge_msec_value(conf->connect_timeout,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1922 prev->connect_timeout, 60000);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1923
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1924 ngx_conf_merge_msec_value(conf->timeout,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1925 prev->timeout, 10 * 60000);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1926
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1927 ngx_conf_merge_msec_value(conf->next_upstream_timeout,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1928 prev->next_upstream_timeout, 0);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1929
6215 8ee6a08ea3eb Stream: added proxy_buffer_size to set the size of data buffers. Roman Arutyunyan <arut@nginx.com> parents: 6208 diff changeset	1930 ngx_conf_merge_size_value(conf->buffer_size,
8ee6a08ea3eb Stream: added proxy_buffer_size to set the size of data buffers. Roman Arutyunyan <arut@nginx.com> parents: 6208 diff changeset	1931 prev->buffer_size, 16384);
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1932
6208 7a14a0d754ad Stream: renamed rate limiting directives. Roman Arutyunyan <arut@nginx.com> parents: 6204 diff changeset	1933 ngx_conf_merge_size_value(conf->upload_rate,
7a14a0d754ad Stream: renamed rate limiting directives. Roman Arutyunyan <arut@nginx.com> parents: 6204 diff changeset	1934 prev->upload_rate, 0);
6201 24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1935
6208 7a14a0d754ad Stream: renamed rate limiting directives. Roman Arutyunyan <arut@nginx.com> parents: 6204 diff changeset	1936 ngx_conf_merge_size_value(conf->download_rate,
7a14a0d754ad Stream: renamed rate limiting directives. Roman Arutyunyan <arut@nginx.com> parents: 6204 diff changeset	1937 prev->download_rate, 0);
6201 24488e6db782 Stream: upstream and downstream limit rates. Roman Arutyunyan <arut@nginx.com> parents: 6200 diff changeset	1938
6436 8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	1939 ngx_conf_merge_uint_value(conf->responses,
8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	1940 prev->responses, NGX_MAX_INT32_VALUE);
8f038068f4bc Stream: UDP proxy. Roman Arutyunyan <arut@nginx.com> parents: 6435 diff changeset	1941
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1942 ngx_conf_merge_uint_value(conf->next_upstream_tries,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1943 prev->next_upstream_tries, 0);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1944
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1945 ngx_conf_merge_value(conf->next_upstream, prev->next_upstream, 1);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1946
6184 fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	1947 ngx_conf_merge_value(conf->proxy_protocol, prev->proxy_protocol, 0);
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 6183 diff changeset	1948
6183 4dcffe43a7ea Stream: the "proxy_bind" directive. Vladimir Homutov <vl@nginx.com> parents: 6174 diff changeset	1949 ngx_conf_merge_ptr_value(conf->local, prev->local, NULL);
4dcffe43a7ea Stream: the "proxy_bind" directive. Vladimir Homutov <vl@nginx.com> parents: 6174 diff changeset	1950
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1951 #if (NGX_STREAM_SSL)
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1952
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1953 ngx_conf_merge_value(conf->ssl_enable, prev->ssl_enable, 0);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1954
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1955 ngx_conf_merge_value(conf->ssl_session_reuse,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1956 prev->ssl_session_reuse, 1);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1957
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1958 ngx_conf_merge_bitmask_value(conf->ssl_protocols, prev->ssl_protocols,
6157 b2899e7d0ef8 Disabled SSLv3 by default (ticket #653). Maxim Dounin <mdounin@mdounin.ru> parents: 6124 diff changeset	1959 (NGX_CONF_BITMASK_SET\|NGX_SSL_TLSv1
b2899e7d0ef8 Disabled SSLv3 by default (ticket #653). Maxim Dounin <mdounin@mdounin.ru> parents: 6124 diff changeset	1960 \|NGX_SSL_TLSv1_1\|NGX_SSL_TLSv1_2));
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1961
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1962 ngx_conf_merge_str_value(conf->ssl_ciphers, prev->ssl_ciphers, "DEFAULT");
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1963
6643 9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1964 if (conf->ssl_name == NULL) {
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1965 conf->ssl_name = prev->ssl_name;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	1966 }
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1967
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1968 ngx_conf_merge_value(conf->ssl_server_name, prev->ssl_server_name, 0);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1969
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1970 ngx_conf_merge_value(conf->ssl_verify, prev->ssl_verify, 0);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1971
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1972 ngx_conf_merge_uint_value(conf->ssl_verify_depth,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1973 prev->ssl_verify_depth, 1);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1974
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1975 ngx_conf_merge_str_value(conf->ssl_trusted_certificate,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1976 prev->ssl_trusted_certificate, "");
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1977
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1978 ngx_conf_merge_str_value(conf->ssl_crl, prev->ssl_crl, "");
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1979
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1980 ngx_conf_merge_str_value(conf->ssl_certificate,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1981 prev->ssl_certificate, "");
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1982
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1983 ngx_conf_merge_str_value(conf->ssl_certificate_key,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1984 prev->ssl_certificate_key, "");
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1985
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1986 ngx_conf_merge_ptr_value(conf->ssl_passwords, prev->ssl_passwords, NULL);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1987
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1988 if (conf->ssl_enable && ngx_stream_proxy_set_ssl(cf, conf) != NGX_OK) {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1989 return NGX_CONF_ERROR;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1990 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1991
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1992 #endif
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1993
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1994 return NGX_CONF_OK;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1995 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1996
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1997
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1998 #if (NGX_STREAM_SSL)
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1999
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2000 static ngx_int_t
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2001 ngx_stream_proxy_set_ssl(ngx_conf_t cf, ngx_stream_proxy_srv_conf_t pscf)
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2002 {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2003 ngx_pool_cleanup_t *cln;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2004
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2005 pscf->ssl = ngx_pcalloc(cf->pool, sizeof(ngx_ssl_t));
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2006 if (pscf->ssl == NULL) {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2007 return NGX_ERROR;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2008 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2009
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2010 pscf->ssl->log = cf->log;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2011
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2012 if (ngx_ssl_create(pscf->ssl, pscf->ssl_protocols, NULL) != NGX_OK) {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2013 return NGX_ERROR;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2014 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2015
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2016 cln = ngx_pool_cleanup_add(cf->pool, 0);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2017 if (cln == NULL) {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2018 return NGX_ERROR;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2019 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2020
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2021 cln->handler = ngx_ssl_cleanup_ctx;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2022 cln->data = pscf->ssl;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2023
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2024 if (pscf->ssl_certificate.len) {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2025
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2026 if (pscf->ssl_certificate_key.len == 0) {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2027 ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2028 "no \"proxy_ssl_certificate_key\" is defined "
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2029 "for certificate \"%V\"", &pscf->ssl_certificate);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2030 return NGX_ERROR;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2031 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2032
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2033 if (ngx_ssl_certificate(cf, pscf->ssl, &pscf->ssl_certificate,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2034 &pscf->ssl_certificate_key, pscf->ssl_passwords)
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2035 != NGX_OK)
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2036 {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2037 return NGX_ERROR;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2038 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2039 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2040
6591 04d8d1f85649 SSL: ngx_ssl_ciphers() to set list of ciphers. Tim Taubert <tim@timtaubert.de> parents: 6530 diff changeset	2041 if (ngx_ssl_ciphers(cf, pscf->ssl, &pscf->ssl_ciphers, 0) != NGX_OK) {
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2042 return NGX_ERROR;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2043 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2044
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2045 if (pscf->ssl_verify) {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2046 if (pscf->ssl_trusted_certificate.len == 0) {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2047 ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2048 "no proxy_ssl_trusted_certificate for proxy_ssl_verify");
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2049 return NGX_ERROR;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2050 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2051
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2052 if (ngx_ssl_trusted_certificate(cf, pscf->ssl,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2053 &pscf->ssl_trusted_certificate,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2054 pscf->ssl_verify_depth)
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2055 != NGX_OK)
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2056 {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2057 return NGX_ERROR;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2058 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2059
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2060 if (ngx_ssl_crl(cf, pscf->ssl, &pscf->ssl_crl) != NGX_OK) {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2061 return NGX_ERROR;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2062 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2063 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2064
7320 696df3ac27ac SSL: save sessions for upstream peers using a callback function. Sergey Kandaurov <pluknet@nginx.com> parents: 7286 diff changeset	2065 if (ngx_ssl_client_session_cache(cf, pscf->ssl, pscf->ssl_session_reuse)
696df3ac27ac SSL: save sessions for upstream peers using a callback function. Sergey Kandaurov <pluknet@nginx.com> parents: 7286 diff changeset	2066 != NGX_OK)
696df3ac27ac SSL: save sessions for upstream peers using a callback function. Sergey Kandaurov <pluknet@nginx.com> parents: 7286 diff changeset	2067 {
696df3ac27ac SSL: save sessions for upstream peers using a callback function. Sergey Kandaurov <pluknet@nginx.com> parents: 7286 diff changeset	2068 return NGX_ERROR;
696df3ac27ac SSL: save sessions for upstream peers using a callback function. Sergey Kandaurov <pluknet@nginx.com> parents: 7286 diff changeset	2069 }
696df3ac27ac SSL: save sessions for upstream peers using a callback function. Sergey Kandaurov <pluknet@nginx.com> parents: 7286 diff changeset	2070
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2071 return NGX_OK;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2072 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2073
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2074 #endif
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2075
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2076
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2077 static char *
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2078 ngx_stream_proxy_pass(ngx_conf_t cf, ngx_command_t cmd, void *conf)
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2079 {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2080 ngx_stream_proxy_srv_conf_t *pscf = conf;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2081
6643 9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	2082 ngx_url_t u;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	2083 ngx_str_t value, url;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	2084 ngx_stream_complex_value_t cv;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	2085 ngx_stream_core_srv_conf_t *cscf;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	2086 ngx_stream_compile_complex_value_t ccv;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	2087
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	2088 if (pscf->upstream \|\| pscf->upstream_value) {
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2089 return "is duplicate";
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2090 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2091
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2092 cscf = ngx_stream_conf_get_module_srv_conf(cf, ngx_stream_core_module);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2093
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2094 cscf->handler = ngx_stream_proxy_handler;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2095
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2096 value = cf->args->elts;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2097
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2098 url = &value[1];
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2099
6643 9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	2100 ngx_memzero(&ccv, sizeof(ngx_stream_compile_complex_value_t));
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	2101
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	2102 ccv.cf = cf;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	2103 ccv.value = url;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	2104 ccv.complex_value = &cv;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	2105
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	2106 if (ngx_stream_compile_complex_value(&ccv) != NGX_OK) {
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	2107 return NGX_CONF_ERROR;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	2108 }
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	2109
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	2110 if (cv.lengths) {
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	2111 pscf->upstream_value = ngx_palloc(cf->pool,
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	2112 sizeof(ngx_stream_complex_value_t));
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	2113 if (pscf->upstream_value == NULL) {
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	2114 return NGX_CONF_ERROR;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	2115 }
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	2116
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	2117 *pscf->upstream_value = cv;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	2118
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	2119 return NGX_CONF_OK;
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	2120 }
9757cffc1e2f Stream: variables in proxy_pass and proxy_ssl_name. Vladimir Homutov <vl@nginx.com> parents: 6610 diff changeset	2121
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2122 ngx_memzero(&u, sizeof(ngx_url_t));
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2123
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2124 u.url = *url;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2125 u.no_resolve = 1;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2126
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2127 pscf->upstream = ngx_stream_upstream_add(cf, &u, 0);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2128 if (pscf->upstream == NULL) {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2129 return NGX_CONF_ERROR;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2130 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2131
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2132 return NGX_CONF_OK;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2133 }
6183 4dcffe43a7ea Stream: the "proxy_bind" directive. Vladimir Homutov <vl@nginx.com> parents: 6174 diff changeset	2134
4dcffe43a7ea Stream: the "proxy_bind" directive. Vladimir Homutov <vl@nginx.com> parents: 6174 diff changeset	2135
4dcffe43a7ea Stream: the "proxy_bind" directive. Vladimir Homutov <vl@nginx.com> parents: 6174 diff changeset	2136 static char *
4dcffe43a7ea Stream: the "proxy_bind" directive. Vladimir Homutov <vl@nginx.com> parents: 6174 diff changeset	2137 ngx_stream_proxy_bind(ngx_conf_t cf, ngx_command_t cmd, void *conf)
4dcffe43a7ea Stream: the "proxy_bind" directive. Vladimir Homutov <vl@nginx.com> parents: 6174 diff changeset	2138 {
4dcffe43a7ea Stream: the "proxy_bind" directive. Vladimir Homutov <vl@nginx.com> parents: 6174 diff changeset	2139 ngx_stream_proxy_srv_conf_t *pscf = conf;
4dcffe43a7ea Stream: the "proxy_bind" directive. Vladimir Homutov <vl@nginx.com> parents: 6174 diff changeset	2140
6610 d5b5866c06c4 Stream: got rid of pseudo variables. Vladimir Homutov <vl@nginx.com> parents: 6606 diff changeset	2141 ngx_int_t rc;
d5b5866c06c4 Stream: got rid of pseudo variables. Vladimir Homutov <vl@nginx.com> parents: 6606 diff changeset	2142 ngx_str_t *value;
d5b5866c06c4 Stream: got rid of pseudo variables. Vladimir Homutov <vl@nginx.com> parents: 6606 diff changeset	2143 ngx_stream_complex_value_t cv;
d5b5866c06c4 Stream: got rid of pseudo variables. Vladimir Homutov <vl@nginx.com> parents: 6606 diff changeset	2144 ngx_stream_upstream_local_t *local;
d5b5866c06c4 Stream: got rid of pseudo variables. Vladimir Homutov <vl@nginx.com> parents: 6606 diff changeset	2145 ngx_stream_compile_complex_value_t ccv;
6183 4dcffe43a7ea Stream: the "proxy_bind" directive. Vladimir Homutov <vl@nginx.com> parents: 6174 diff changeset	2146
4dcffe43a7ea Stream: the "proxy_bind" directive. Vladimir Homutov <vl@nginx.com> parents: 6174 diff changeset	2147 if (pscf->local != NGX_CONF_UNSET_PTR) {
4dcffe43a7ea Stream: the "proxy_bind" directive. Vladimir Homutov <vl@nginx.com> parents: 6174 diff changeset	2148 return "is duplicate";
4dcffe43a7ea Stream: the "proxy_bind" directive. Vladimir Homutov <vl@nginx.com> parents: 6174 diff changeset	2149 }
4dcffe43a7ea Stream: the "proxy_bind" directive. Vladimir Homutov <vl@nginx.com> parents: 6174 diff changeset	2150
4dcffe43a7ea Stream: the "proxy_bind" directive. Vladimir Homutov <vl@nginx.com> parents: 6174 diff changeset	2151 value = cf->args->elts;
4dcffe43a7ea Stream: the "proxy_bind" directive. Vladimir Homutov <vl@nginx.com> parents: 6174 diff changeset	2152
6530 1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6529 diff changeset	2153 if (cf->args->nelts == 2 && ngx_strcmp(value[1].data, "off") == 0) {
6183 4dcffe43a7ea Stream: the "proxy_bind" directive. Vladimir Homutov <vl@nginx.com> parents: 6174 diff changeset	2154 pscf->local = NULL;
4dcffe43a7ea Stream: the "proxy_bind" directive. Vladimir Homutov <vl@nginx.com> parents: 6174 diff changeset	2155 return NGX_CONF_OK;
4dcffe43a7ea Stream: the "proxy_bind" directive. Vladimir Homutov <vl@nginx.com> parents: 6174 diff changeset	2156 }
4dcffe43a7ea Stream: the "proxy_bind" directive. Vladimir Homutov <vl@nginx.com> parents: 6174 diff changeset	2157
6610 d5b5866c06c4 Stream: got rid of pseudo variables. Vladimir Homutov <vl@nginx.com> parents: 6606 diff changeset	2158 ngx_memzero(&ccv, sizeof(ngx_stream_compile_complex_value_t));
d5b5866c06c4 Stream: got rid of pseudo variables. Vladimir Homutov <vl@nginx.com> parents: 6606 diff changeset	2159
d5b5866c06c4 Stream: got rid of pseudo variables. Vladimir Homutov <vl@nginx.com> parents: 6606 diff changeset	2160 ccv.cf = cf;
d5b5866c06c4 Stream: got rid of pseudo variables. Vladimir Homutov <vl@nginx.com> parents: 6606 diff changeset	2161 ccv.value = &value[1];
d5b5866c06c4 Stream: got rid of pseudo variables. Vladimir Homutov <vl@nginx.com> parents: 6606 diff changeset	2162 ccv.complex_value = &cv;
d5b5866c06c4 Stream: got rid of pseudo variables. Vladimir Homutov <vl@nginx.com> parents: 6606 diff changeset	2163
d5b5866c06c4 Stream: got rid of pseudo variables. Vladimir Homutov <vl@nginx.com> parents: 6606 diff changeset	2164 if (ngx_stream_compile_complex_value(&ccv) != NGX_OK) {
d5b5866c06c4 Stream: got rid of pseudo variables. Vladimir Homutov <vl@nginx.com> parents: 6606 diff changeset	2165 return NGX_CONF_ERROR;
d5b5866c06c4 Stream: got rid of pseudo variables. Vladimir Homutov <vl@nginx.com> parents: 6606 diff changeset	2166 }
d5b5866c06c4 Stream: got rid of pseudo variables. Vladimir Homutov <vl@nginx.com> parents: 6606 diff changeset	2167
6598 4a724d6006ee Stream: use ngx_pcalloc() in ngx_stream_proxy_bind(). Roman Arutyunyan <arut@nginx.com> parents: 6595 diff changeset	2168 local = ngx_pcalloc(cf->pool, sizeof(ngx_stream_upstream_local_t));
6529 cb8177ca0990 Stream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6461 diff changeset	2169 if (local == NULL) {
6183 4dcffe43a7ea Stream: the "proxy_bind" directive. Vladimir Homutov <vl@nginx.com> parents: 6174 diff changeset	2170 return NGX_CONF_ERROR;
4dcffe43a7ea Stream: the "proxy_bind" directive. Vladimir Homutov <vl@nginx.com> parents: 6174 diff changeset	2171 }
4dcffe43a7ea Stream: the "proxy_bind" directive. Vladimir Homutov <vl@nginx.com> parents: 6174 diff changeset	2172
6529 cb8177ca0990 Stream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6461 diff changeset	2173 pscf->local = local;
cb8177ca0990 Stream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6461 diff changeset	2174
6610 d5b5866c06c4 Stream: got rid of pseudo variables. Vladimir Homutov <vl@nginx.com> parents: 6606 diff changeset	2175 if (cv.lengths) {
d5b5866c06c4 Stream: got rid of pseudo variables. Vladimir Homutov <vl@nginx.com> parents: 6606 diff changeset	2176 local->value = ngx_palloc(cf->pool, sizeof(ngx_stream_complex_value_t));
d5b5866c06c4 Stream: got rid of pseudo variables. Vladimir Homutov <vl@nginx.com> parents: 6606 diff changeset	2177 if (local->value == NULL) {
d5b5866c06c4 Stream: got rid of pseudo variables. Vladimir Homutov <vl@nginx.com> parents: 6606 diff changeset	2178 return NGX_CONF_ERROR;
d5b5866c06c4 Stream: got rid of pseudo variables. Vladimir Homutov <vl@nginx.com> parents: 6606 diff changeset	2179 }
6595 0c98c4092440 Stream: support for $remote_port in proxy_bind. Roman Arutyunyan <arut@nginx.com> parents: 6594 diff changeset	2180
6610 d5b5866c06c4 Stream: got rid of pseudo variables. Vladimir Homutov <vl@nginx.com> parents: 6606 diff changeset	2181 *local->value = cv;
d5b5866c06c4 Stream: got rid of pseudo variables. Vladimir Homutov <vl@nginx.com> parents: 6606 diff changeset	2182
d5b5866c06c4 Stream: got rid of pseudo variables. Vladimir Homutov <vl@nginx.com> parents: 6606 diff changeset	2183 } else {
6530 1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6529 diff changeset	2184 local->addr = ngx_palloc(cf->pool, sizeof(ngx_addr_t));
1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6529 diff changeset	2185 if (local->addr == NULL) {
1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6529 diff changeset	2186 return NGX_CONF_ERROR;
1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6529 diff changeset	2187 }
1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6529 diff changeset	2188
6594 3c87b82b17d4 Upstream: support for port in proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6593 diff changeset	2189 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: 6593 diff changeset	2190 value[1].len);
6530 1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6529 diff changeset	2191
1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6529 diff changeset	2192 switch (rc) {
1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6529 diff changeset	2193 case NGX_OK:
1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6529 diff changeset	2194 local->addr->name = value[1];
1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6529 diff changeset	2195 break;
1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6529 diff changeset	2196
1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6529 diff changeset	2197 case NGX_DECLINED:
1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6529 diff changeset	2198 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: 6529 diff changeset	2199 "invalid address \"%V\"", &value[1]);
1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6529 diff changeset	2200 /* fall through */
1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6529 diff changeset	2201
1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6529 diff changeset	2202 default:
1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6529 diff changeset	2203 return NGX_CONF_ERROR;
1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6529 diff changeset	2204 }
6529 cb8177ca0990 Stream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6461 diff changeset	2205 }
cb8177ca0990 Stream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6461 diff changeset	2206
6530 1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6529 diff changeset	2207 if (cf->args->nelts > 2) {
1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6529 diff changeset	2208 if (ngx_strcmp(value[2].data, "transparent") == 0) {
1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6529 diff changeset	2209 #if (NGX_HAVE_TRANSPARENT_PROXY)
7174 84e53e4735a4 Retain CAP_NET_RAW capability for transparent proxying. Roman Arutyunyan <arut@nginx.com> parents: 7156 diff changeset	2210 ngx_core_conf_t *ccf;
84e53e4735a4 Retain CAP_NET_RAW capability for transparent proxying. Roman Arutyunyan <arut@nginx.com> parents: 7156 diff changeset	2211
84e53e4735a4 Retain CAP_NET_RAW capability for transparent proxying. Roman Arutyunyan <arut@nginx.com> parents: 7156 diff changeset	2212 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: 7156 diff changeset	2213 ngx_core_module);
84e53e4735a4 Retain CAP_NET_RAW capability for transparent proxying. Roman Arutyunyan <arut@nginx.com> parents: 7156 diff changeset	2214
84e53e4735a4 Retain CAP_NET_RAW capability for transparent proxying. Roman Arutyunyan <arut@nginx.com> parents: 7156 diff changeset	2215 ccf->transparent = 1;
6530 1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6529 diff changeset	2216 local->transparent = 1;
1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6529 diff changeset	2217 #else
1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6529 diff changeset	2218 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: 6529 diff changeset	2219 "transparent proxying is not supported "
1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6529 diff changeset	2220 "on this platform, ignored");
1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6529 diff changeset	2221 #endif
1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6529 diff changeset	2222 } else {
1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6529 diff changeset	2223 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: 6529 diff changeset	2224 "invalid parameter \"%V\"", &value[2]);
1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6529 diff changeset	2225 return NGX_CONF_ERROR;
1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6529 diff changeset	2226 }
6183 4dcffe43a7ea Stream: the "proxy_bind" directive. Vladimir Homutov <vl@nginx.com> parents: 6174 diff changeset	2227 }
6529 cb8177ca0990 Stream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6461 diff changeset	2228
cb8177ca0990 Stream: prepared proxy_bind to accept parameters. Roman Arutyunyan <arut@nginx.com> parents: 6461 diff changeset	2229 return NGX_CONF_OK;
6183 4dcffe43a7ea Stream: the "proxy_bind" directive. Vladimir Homutov <vl@nginx.com> parents: 6174 diff changeset	2230 }

Mercurial > hg > nginx

annotate src/stream/ngx_stream_proxy_module.c @ 7353:87d2ea860f38