nginx: src/stream/ngx_stream_proxy

annotate src/stream/ngx_stream_proxy_module.c @ 7156:9c29644f6d03

Fixed worker_shutdown_timeout in various cases. The ngx_http_upstream_process_upgraded() did not handle c->close request, and upgraded connections do not use the write filter. As a result, worker_shutdown_timeout did not affect upgraded connections (ticket #1419). Fix is to handle c->close in the ngx_http_request_handler() function, thus covering most of the possible cases in http handling. Additionally, mail proxying did not handle neither c->close nor c->error, and thus worker_shutdown_timeout did not work for mail connections. Fix is to add c->close handling to ngx_mail_proxy_handler(). Also, added explicit handling of c->close to stream proxy, ngx_stream_proxy_process_connection(). This improves worker_shutdown_timeout handling in stream, it will no longer wait for some data being transferred in a connection before closing it, and will also provide appropriate logging at the "info" level.

author	Maxim Dounin <mdounin@mdounin.ru>
date	Mon, 20 Nov 2017 16:31:07 +0300
parents	0846dd76a487
children	84e53e4735a4

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

Mercurial > hg > nginx

annotate src/stream/ngx_stream_proxy_module.c @ 7156:9c29644f6d03