diff options
| author | Valentin Bartenev <vbart@nginx.com> | 2016-09-20 15:07:16 +0300 |
|---|---|---|
| committer | Valentin Bartenev <vbart@nginx.com> | 2016-09-20 15:07:16 +0300 |
| commit | 89f82c1155d0e2291f30819c38d438e112ba569a (patch) | |
| tree | ddc283c3533ec2801242fd933b028e5213333087 /src/mail/ngx_mail_ssl_module.c | |
| parent | 1fd83ac0c83b2ffffbe5fdbaec61be4f1b39171b (diff) | |
| download | nginx-89f82c1155d0e2291f30819c38d438e112ba569a.tar.gz nginx-89f82c1155d0e2291f30819c38d438e112ba569a.zip | |
Fixed log levels of configuration parsing errors.
All the errors that prevent loading configuration must be printed on the "emerg"
log level. Previously, nginx might silently fail to load configuration in some
cases as the default log level is "error".
Diffstat (limited to 'src/mail/ngx_mail_ssl_module.c')
| -rw-r--r-- | src/mail/ngx_mail_ssl_module.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mail/ngx_mail_ssl_module.c b/src/mail/ngx_mail_ssl_module.c index 11e428cb9..fbc9bc74b 100644 --- a/src/mail/ngx_mail_ssl_module.c +++ b/src/mail/ngx_mail_ssl_module.c @@ -488,7 +488,7 @@ ngx_mail_ssl_enable(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) } if (scf->enable && (ngx_int_t) scf->starttls > NGX_MAIL_STARTTLS_OFF) { - ngx_conf_log_error(NGX_LOG_WARN, cf, 0, + ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "\"starttls\" directive conflicts with \"ssl on\""); return NGX_CONF_ERROR; } @@ -514,7 +514,7 @@ ngx_mail_ssl_starttls(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) } if (scf->enable == 1 && (ngx_int_t) scf->starttls > NGX_MAIL_STARTTLS_OFF) { - ngx_conf_log_error(NGX_LOG_WARN, cf, 0, + ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "\"ssl\" directive conflicts with \"starttls\""); return NGX_CONF_ERROR; } |