[nginx] SSL: deprecated the "ssl" directive.

Ruslan Ermilov ru at nginx.com
Wed Apr 25 12:00:51 UTC 2018


details:   http://hg.nginx.org/nginx/rev/46c0c7ef4913
branches:  
changeset: 7270:46c0c7ef4913
user:      Ruslan Ermilov <ru at nginx.com>
date:      Wed Apr 25 14:57:24 2018 +0300
description:
SSL: deprecated the "ssl" directive.

diffstat:

 src/http/modules/ngx_http_ssl_module.c |  7 ++++++-
 src/mail/ngx_mail_ssl_module.c         |  7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diffs (48 lines):

diff -r 7f955d3b9a0d -r 46c0c7ef4913 src/http/modules/ngx_http_ssl_module.c
--- a/src/http/modules/ngx_http_ssl_module.c	Tue Apr 24 15:29:01 2018 +0300
+++ b/src/http/modules/ngx_http_ssl_module.c	Wed Apr 25 14:57:24 2018 +0300
@@ -71,6 +71,11 @@ static ngx_conf_enum_t  ngx_http_ssl_ver
 };
 
 
+static ngx_conf_deprecated_t  ngx_http_ssl_deprecated = {
+    ngx_conf_deprecated, "ssl", "listen ... ssl"
+};
+
+
 static ngx_command_t  ngx_http_ssl_commands[] = {
 
     { ngx_string("ssl"),
@@ -78,7 +83,7 @@ static ngx_command_t  ngx_http_ssl_comma
       ngx_http_ssl_enable,
       NGX_HTTP_SRV_CONF_OFFSET,
       offsetof(ngx_http_ssl_srv_conf_t, enable),
-      NULL },
+      &ngx_http_ssl_deprecated },
 
     { ngx_string("ssl_certificate"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
diff -r 7f955d3b9a0d -r 46c0c7ef4913 src/mail/ngx_mail_ssl_module.c
--- a/src/mail/ngx_mail_ssl_module.c	Tue Apr 24 15:29:01 2018 +0300
+++ b/src/mail/ngx_mail_ssl_module.c	Wed Apr 25 14:57:24 2018 +0300
@@ -56,6 +56,11 @@ static ngx_conf_enum_t  ngx_mail_ssl_ver
 };
 
 
+static ngx_conf_deprecated_t  ngx_mail_ssl_deprecated = {
+    ngx_conf_deprecated, "ssl", "listen ... ssl"
+};
+
+
 static ngx_command_t  ngx_mail_ssl_commands[] = {
 
     { ngx_string("ssl"),
@@ -63,7 +68,7 @@ static ngx_command_t  ngx_mail_ssl_comma
       ngx_mail_ssl_enable,
       NGX_MAIL_SRV_CONF_OFFSET,
       offsetof(ngx_mail_ssl_conf_t, enable),
-      NULL },
+      &ngx_mail_ssl_deprecated },
 
     { ngx_string("starttls"),
       NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_TAKE1,


More information about the nginx-devel mailing list