Mercurial > hg > nginx

comparison src/mail/ngx_mail_ssl_module.c @ 5219:32fe021911c9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Mail: missing ngx_ssl_ecdh_curve() call.
author F. da Silva <fdasilvayy@gmail.com>
date Fri, 10 May 2013 16:53:45 +0200
parents d620f497c50f
children 23a186e8ca45
comparison
equal deleted inserted replaced
5218:f026adb935ad 5219:32fe021911c9
306 306
307 if (ngx_ssl_dhparam(cf, &conf->ssl, &conf->dhparam) != NGX_OK) { 307 if (ngx_ssl_dhparam(cf, &conf->ssl, &conf->dhparam) != NGX_OK) {
308 return NGX_CONF_ERROR; 308 return NGX_CONF_ERROR;
309 } 309 }
310 310
311 if (ngx_ssl_ecdh_curve(cf, &conf->ssl, &conf->ecdh_curve) != NGX_OK) {
312 return NGX_CONF_ERROR;
313 }
314
311 ngx_conf_merge_value(conf->builtin_session_cache, 315 ngx_conf_merge_value(conf->builtin_session_cache,
312 prev->builtin_session_cache, NGX_SSL_NONE_SCACHE); 316 prev->builtin_session_cache, NGX_SSL_NONE_SCACHE);
313 317
314 if (conf->shm_zone == NULL) { 318 if (conf->shm_zone == NULL) {
315 conf->shm_zone = prev->shm_zone; 319 conf->shm_zone = prev->shm_zone;