From 97e0d9574a86440eb79f1f8f384850217e92180f Mon Sep 17 00:00:00 2001 From: Hakase Date: Thu, 26 Apr 2018 06:11:13 +0900 Subject: [PATCH] Latest update - 7270 --- src/http/modules/ngx_http_ssl_module.c | 7 ++++++- src/mail/ngx_mail_ssl_module.c | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/http/modules/ngx_http_ssl_module.c b/src/http/modules/ngx_http_ssl_module.c index 572fa7e..1858ed3 100644 --- a/src/http/modules/ngx_http_ssl_module.c +++ b/src/http/modules/ngx_http_ssl_module.c @@ -71,6 +71,11 @@ static ngx_conf_enum_t ngx_http_ssl_verify[] = { }; +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_commands[] = { 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 --git a/src/mail/ngx_mail_ssl_module.c b/src/mail/ngx_mail_ssl_module.c index cd22039..a661cda 100644 --- a/src/mail/ngx_mail_ssl_module.c +++ b/src/mail/ngx_mail_ssl_module.c @@ -56,6 +56,11 @@ static ngx_conf_enum_t ngx_mail_ssl_verify[] = { }; +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_commands[] = { 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,