Hakase/nginx-build
2
1 Fork 1
Code Issues Pull Requests Releases Activity

Latest update - 7320

Browse Source
This commit is contained in:
Hakase
2018-07-18 12:06:25 +09:00
parent 6a30197b35
commit 45b383275a
9 changed files with 139 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/stream/ngx_stream_proxy_module.c
+22 -5
View File
@@ -92,6 +92,7 @@ static char *ngx_stream_proxy_ssl_password_file(ngx_conf_t *cf,
ngx_command_t *cmd, void *conf);
static void ngx_stream_proxy_ssl_init_connection(ngx_stream_session_t *s);
static void ngx_stream_proxy_ssl_handshake(ngx_connection_t *pc);
static void ngx_stream_proxy_ssl_save_session(ngx_connection_t *c);
static ngx_int_t ngx_stream_proxy_ssl_name(ngx_stream_session_t *s);
static ngx_int_t ngx_stream_proxy_set_ssl(ngx_conf_t *cf,
ngx_stream_proxy_srv_conf_t *pscf);
@@ -1008,6 +1009,8 @@ ngx_stream_proxy_ssl_init_connection(ngx_stream_session_t *s)
}
if (pscf->ssl_session_reuse) {
pc->ssl->save_session = ngx_stream_proxy_ssl_save_session;
if (u->peer.set_session(&u->peer, u->peer.data) != NGX_OK) {
ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
return;
@@ -1066,11 +1069,6 @@ ngx_stream_proxy_ssl_handshake(ngx_connection_t *pc)
}
}
if (pscf->ssl_session_reuse) {
u = s->upstream;
u->peer.save_session(&u->peer, u->peer.data);
}
if (pc->write->timer_set) {
ngx_del_timer(pc->write);
}
@@ -1086,6 +1084,19 @@ failed:
}
static void
ngx_stream_proxy_ssl_save_session(ngx_connection_t *c)
{
ngx_stream_session_t *s;
ngx_stream_upstream_t *u;
s = c->data;
u = s->upstream;
u->peer.save_session(&u->peer, u->peer.data);
}
static ngx_int_t
ngx_stream_proxy_ssl_name(ngx_stream_session_t *s)
{
@@ -2051,6 +2062,12 @@ ngx_stream_proxy_set_ssl(ngx_conf_t *cf, ngx_stream_proxy_srv_conf_t *pscf)
}
}
if (ngx_ssl_client_session_cache(cf, pscf->ssl, pscf->ssl_session_reuse)
!= NGX_OK)
{
return NGX_ERROR;
}
return NGX_OK;
}
src/stream/ngx_stream_upstream_round_robin.c
+1 -1
View File
@@ -776,7 +776,7 @@ ngx_stream_upstream_save_round_robin_peer_session(ngx_peer_connection_t *pc,
if (peers->shpool) {
ssl_session = SSL_get0_session(pc->connection->ssl->connection);
ssl_session = ngx_ssl_get0_session(pc->connection);
if (ssl_session == NULL) {
return;