diff options
| author | F. da Silva <fdasilvayy@gmail.com> | 2013-05-10 16:53:45 +0200 |
|---|---|---|
| committer | F. da Silva <fdasilvayy@gmail.com> | 2013-05-10 16:53:45 +0200 |
| commit | 2b1779b9162541286c4d046411d4050d95a05ee8 (patch) | |
| tree | 4245a7ea92402f9ef0d281f55ac581cd9b40552d /src | |
| parent | 8ef3374a5abbeaf40a1f5d8296348518151dba10 (diff) | |
| download | nginx-2b1779b9162541286c4d046411d4050d95a05ee8.tar.gz nginx-2b1779b9162541286c4d046411d4050d95a05ee8.tar.bz2 | |
Mail: missing ngx_ssl_ecdh_curve() call.
Diffstat (limited to 'src')
| -rw-r--r-- | src/mail/ngx_mail_ssl_module.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/mail/ngx_mail_ssl_module.c b/src/mail/ngx_mail_ssl_module.c index dd6f2ac41..780d834c6 100644 --- a/src/mail/ngx_mail_ssl_module.c +++ b/src/mail/ngx_mail_ssl_module.c @@ -308,6 +308,10 @@ ngx_mail_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child) return NGX_CONF_ERROR; } + if (ngx_ssl_ecdh_curve(cf, &conf->ssl, &conf->ecdh_curve) != NGX_OK) { + return NGX_CONF_ERROR; + } + ngx_conf_merge_value(conf->builtin_session_cache, prev->builtin_session_cache, NGX_SSL_NONE_SCACHE); |