Latest update - 7371
This commit is contained in:
@@ -31,6 +31,7 @@ typedef struct {
|
||||
ngx_flag_t next_upstream;
|
||||
ngx_flag_t proxy_protocol;
|
||||
ngx_stream_upstream_local_t *local;
|
||||
ngx_flag_t socket_keepalive;
|
||||
|
||||
#if (NGX_STREAM_SSL)
|
||||
ngx_flag_t ssl_enable;
|
||||
@@ -136,6 +137,13 @@ static ngx_command_t ngx_stream_proxy_commands[] = {
|
||||
0,
|
||||
NULL },
|
||||
|
||||
{ ngx_string("proxy_socket_keepalive"),
|
||||
NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_FLAG,
|
||||
ngx_conf_set_flag_slot,
|
||||
NGX_STREAM_SRV_CONF_OFFSET,
|
||||
offsetof(ngx_stream_proxy_srv_conf_t, socket_keepalive),
|
||||
NULL },
|
||||
|
||||
{ ngx_string("proxy_connect_timeout"),
|
||||
NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1,
|
||||
ngx_conf_set_msec_slot,
|
||||
@@ -388,6 +396,10 @@ ngx_stream_proxy_handler(ngx_stream_session_t *s)
|
||||
return;
|
||||
}
|
||||
|
||||
if (pscf->socket_keepalive) {
|
||||
u->peer.so_keepalive = 1;
|
||||
}
|
||||
|
||||
u->peer.type = c->type;
|
||||
u->start_sec = ngx_time();
|
||||
|
||||
@@ -1898,6 +1910,7 @@ ngx_stream_proxy_create_srv_conf(ngx_conf_t *cf)
|
||||
conf->next_upstream = NGX_CONF_UNSET;
|
||||
conf->proxy_protocol = NGX_CONF_UNSET;
|
||||
conf->local = NGX_CONF_UNSET_PTR;
|
||||
conf->socket_keepalive = NGX_CONF_UNSET;
|
||||
|
||||
#if (NGX_STREAM_SSL)
|
||||
conf->ssl_enable = NGX_CONF_UNSET;
|
||||
@@ -1948,6 +1961,9 @@ ngx_stream_proxy_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
|
||||
|
||||
ngx_conf_merge_ptr_value(conf->local, prev->local, NULL);
|
||||
|
||||
ngx_conf_merge_value(conf->socket_keepalive,
|
||||
prev->socket_keepalive, 0);
|
||||
|
||||
#if (NGX_STREAM_SSL)
|
||||
|
||||
ngx_conf_merge_value(conf->ssl_enable, prev->ssl_enable, 0);
|
||||
|
||||
Reference in New Issue
Block a user