aboutsummaryrefslogtreecommitdiff
path: root/src/http/ngx_http_request.c
diff options
context:
space:
mode:
authorMaxim Dounin <mdounin@mdounin.ru>2018-04-24 15:29:01 +0300
committerMaxim Dounin <mdounin@mdounin.ru>2018-04-24 15:29:01 +0300
commit76be1ea9de13c5e8bb0d9523c6a2ad4009a5d7cf (patch)
treeefc4b871b998e7e04d5ab4a11a7df9e89a3e1dde /src/http/ngx_http_request.c
parent5d3a854ebd4f59854ade798b94070ff1ee3eddcf (diff)
downloadnginx-76be1ea9de13c5e8bb0d9523c6a2ad4009a5d7cf.tar.gz
nginx-76be1ea9de13c5e8bb0d9523c6a2ad4009a5d7cf.zip
SSL: detect "listen ... ssl" without certificates (ticket #178).
In mail and stream modules, no certificate provided is a fatal condition, much like with the "ssl" and "starttls" directives. In http, "listen ... ssl" can be used in a non-default server without certificates as long as there is a certificate in the default one, so missing certificate is only fatal for default servers.
Diffstat (limited to 'src/http/ngx_http_request.c')
-rw-r--r--src/http/ngx_http_request.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
index 2db7a6279..47c62d9fd 100644
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -336,19 +336,8 @@ ngx_http_init_connection(ngx_connection_t *c)
sscf = ngx_http_get_module_srv_conf(hc->conf_ctx, ngx_http_ssl_module);
if (sscf->enable || hc->addr_conf->ssl) {
-
- c->log->action = "SSL handshaking";
-
- if (hc->addr_conf->ssl && sscf->ssl.ctx == NULL) {
- ngx_log_error(NGX_LOG_ERR, c->log, 0,
- "no \"ssl_certificate\" is defined "
- "in server listening on SSL port");
- ngx_http_close_connection(c);
- return;
- }
-
hc->ssl = 1;
-
+ c->log->action = "SSL handshaking";
rev->handler = ngx_http_ssl_handshake;
}
}