aboutsummaryrefslogtreecommitdiff
path: root/src/http/ngx_http_request.c
diff options
context:
space:
mode:
authorSergey Kandaurov <pluknet@nginx.com>2020-10-01 12:21:11 +0100
committerSergey Kandaurov <pluknet@nginx.com>2020-10-01 12:21:11 +0100
commit88cb4d3ab046622b2b71e4d94c583d45e00a56c4 (patch)
treea75aca6b6836c224a0030c32569b9cb0d289b417 /src/http/ngx_http_request.c
parentee4a6024cc0097d8ab29af8441172846de6b0f64 (diff)
parent135b707ab02d5921d7e789c231995f0cc11ae4a6 (diff)
downloadnginx-88cb4d3ab046622b2b71e4d94c583d45e00a56c4.tar.gz
nginx-88cb4d3ab046622b2b71e4d94c583d45e00a56c4.zip
Merged with the default branch.
Diffstat (limited to 'src/http/ngx_http_request.c')
-rw-r--r--src/http/ngx_http_request.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
index b3e27c62e..e33a3038f 100644
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -988,7 +988,10 @@ ngx_http_ssl_servername(ngx_ssl_conn_t *ssl_conn, int *ad, void *arg)
c->ssl->buffer_size = sscf->buffer_size;
if (sscf->ssl.ctx) {
- SSL_set_SSL_CTX(ssl_conn, sscf->ssl.ctx);
+ if (SSL_set_SSL_CTX(ssl_conn, sscf->ssl.ctx) == NULL) {
+ *ad = SSL_AD_INTERNAL_ERROR;
+ return SSL_TLSEXT_ERR_ALERT_FATAL;
+ }
/*
* SSL_set_SSL_CTX() only changes certs as of 1.0.0d