Mercurial > hg > nginx

comparison src/mail/ngx_mail_ssl_module.c @ 7270:46c0c7ef4913

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
SSL: deprecated the "ssl" directive.
author Ruslan Ermilov <ru@nginx.com>
date Wed, 25 Apr 2018 14:57:24 +0300
parents 7f955d3b9a0d
children 6708bec13757
comparison
equal deleted inserted replaced
7269:7f955d3b9a0d 7270:46c0c7ef4913
54 { ngx_string("optional_no_ca"), 3 }, 54 { ngx_string("optional_no_ca"), 3 },
55 { ngx_null_string, 0 } 55 { ngx_null_string, 0 }
56 }; 56 };
57 57
58 58
59 static ngx_conf_deprecated_t ngx_mail_ssl_deprecated = {
60 ngx_conf_deprecated, "ssl", "listen ... ssl"
61 };
62
63
59 static ngx_command_t ngx_mail_ssl_commands[] = { 64 static ngx_command_t ngx_mail_ssl_commands[] = {
60 65
61 { ngx_string("ssl"), 66 { ngx_string("ssl"),
62 NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_FLAG, 67 NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_FLAG,
63 ngx_mail_ssl_enable, 68 ngx_mail_ssl_enable,
64 NGX_MAIL_SRV_CONF_OFFSET, 69 NGX_MAIL_SRV_CONF_OFFSET,
65 offsetof(ngx_mail_ssl_conf_t, enable), 70 offsetof(ngx_mail_ssl_conf_t, enable),
66 NULL }, 71 &ngx_mail_ssl_deprecated },
67 72
68 { ngx_string("starttls"), 73 { ngx_string("starttls"),
69 NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_TAKE1, 74 NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_TAKE1,
70 ngx_mail_ssl_starttls, 75 ngx_mail_ssl_starttls,
71 NGX_MAIL_SRV_CONF_OFFSET, 76 NGX_MAIL_SRV_CONF_OFFSET,