ludra/nginx-build
1
0 Fork 0
forked from Hakase/nginx-build
Code Issues Pull Requests Releases Wiki Activity

Latest update - 7270

Browse Source
This commit is contained in:
Hakase
2018-04-26 06:11:13 +09:00
parent e5c350e752
commit 97e0d9574a
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/http/modules/ngx_http_ssl_module.c
+6 -1
View File
@@ -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[] = { static ngx_command_t ngx_http_ssl_commands[] = {
{ ngx_string("ssl"), { ngx_string("ssl"),
@@ -78,7 +83,7 @@ static ngx_command_t ngx_http_ssl_commands[] = {
ngx_http_ssl_enable, ngx_http_ssl_enable,
NGX_HTTP_SRV_CONF_OFFSET, NGX_HTTP_SRV_CONF_OFFSET,
offsetof(ngx_http_ssl_srv_conf_t, enable), offsetof(ngx_http_ssl_srv_conf_t, enable),
NULL }, &ngx_http_ssl_deprecated },
{ ngx_string("ssl_certificate"), { ngx_string("ssl_certificate"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1, NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
src/mail/ngx_mail_ssl_module.c
+6 -1
View File
@@ -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[] = { static ngx_command_t ngx_mail_ssl_commands[] = {
{ ngx_string("ssl"), { ngx_string("ssl"),
@@ -63,7 +68,7 @@ static ngx_command_t ngx_mail_ssl_commands[] = {
ngx_mail_ssl_enable, ngx_mail_ssl_enable,
NGX_MAIL_SRV_CONF_OFFSET, NGX_MAIL_SRV_CONF_OFFSET,
offsetof(ngx_mail_ssl_conf_t, enable), offsetof(ngx_mail_ssl_conf_t, enable),
NULL }, &ngx_mail_ssl_deprecated },
{ ngx_string("starttls"), { ngx_string("starttls"),
NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_TAKE1, NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_TAKE1,