From: F. da Silva <fdasilvayy@gmail.com>
Date: Fri, 10 May 2013 14:53:45 +0000 (+0200)
Subject: Mail: missing ngx_ssl_ecdh_curve() call.
X-Git-Tag: release-1.5.1~18
X-Git-Url: http://git.kaiwu.me/%7B@url%7D?a=commitdiff_plain;h=2b1779b9162541286c4d046411d4050d95a05ee8;p=nginx.git

Mail: missing ngx_ssl_ecdh_curve() call.
---

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);