Mercurial > hg > nginx

diff src/mail/ngx_mail_handler.c @ 9120:0aaa09927703

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
SSL: removed the "ssl" directive. It has been deprecated since 7270:46c0c7ef4913 (1.15.0) in favour of the "ssl" parameter of the "listen" directive, which has been available since 2224:109849282793 (0.7.14).
author Roman Arutyunyan <arut@nginx.com>
date Thu, 08 Jun 2023 14:49:27 +0400
parents ec1071830799
children 9ca12c957304
line wrap: on
line diff
--- a/src/mail/ngx_mail_handler.c
+++ b/src/mail/ngx_mail_handler.c
@@ -283,10 +283,10 @@ ngx_mail_init_session_handler(ngx_event_
 
     s = c->data;
 
-    sslcf = ngx_mail_get_module_srv_conf(s, ngx_mail_ssl_module);
+    if (s->ssl) {
+        c->log->action = "SSL handshaking";
 
-    if (sslcf->enable || s->ssl) {
-        c->log->action = "SSL handshaking";
+        sslcf = ngx_mail_get_module_srv_conf(s, ngx_mail_ssl_module);
 
         ngx_mail_ssl_init_connection(&sslcf->ssl, c);
         return;