Mercurial > hg > nginx

comparison src/http/modules/ngx_http_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 ba971deb4b44
comparison
equal deleted inserted replaced
7269:7f955d3b9a0d 7270:46c0c7ef4913
69 { ngx_string("optional_no_ca"), 3 }, 69 { ngx_string("optional_no_ca"), 3 },
70 { ngx_null_string, 0 } 70 { ngx_null_string, 0 }
71 }; 71 };
72 72
73 73
74 static ngx_conf_deprecated_t ngx_http_ssl_deprecated = {
75 ngx_conf_deprecated, "ssl", "listen ... ssl"
76 };
77
78
74 static ngx_command_t ngx_http_ssl_commands[] = { 79 static ngx_command_t ngx_http_ssl_commands[] = {
75 80
76 { ngx_string("ssl"), 81 { ngx_string("ssl"),
77 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG, 82 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG,
78 ngx_http_ssl_enable, 83 ngx_http_ssl_enable,
79 NGX_HTTP_SRV_CONF_OFFSET, 84 NGX_HTTP_SRV_CONF_OFFSET,
80 offsetof(ngx_http_ssl_srv_conf_t, enable), 85 offsetof(ngx_http_ssl_srv_conf_t, enable),
81 NULL }, 86 &ngx_http_ssl_deprecated },
82 87
83 { ngx_string("ssl_certificate"), 88 { ngx_string("ssl_certificate"),
84 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1, 89 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
85 ngx_conf_set_str_array_slot, 90 ngx_conf_set_str_array_slot,
86 NGX_HTTP_SRV_CONF_OFFSET, 91 NGX_HTTP_SRV_CONF_OFFSET,