Mercurial > hg > nginx
comparison src/mail/ngx_mail_ssl_module.c @ 6699:9cf2dce316e5
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".
author | Valentin Bartenev <vbart@nginx.com> |
---|---|
date | Tue, 20 Sep 2016 15:07:16 +0300 |
parents | 04d8d1f85649 |
children | 08dc60979133 |
comparison
equal
deleted
inserted
replaced
6698:e8d4c9e9682a | 6699:9cf2dce316e5 |
---|---|
486 if (rv != NGX_CONF_OK) { | 486 if (rv != NGX_CONF_OK) { |
487 return rv; | 487 return rv; |
488 } | 488 } |
489 | 489 |
490 if (scf->enable && (ngx_int_t) scf->starttls > NGX_MAIL_STARTTLS_OFF) { | 490 if (scf->enable && (ngx_int_t) scf->starttls > NGX_MAIL_STARTTLS_OFF) { |
491 ngx_conf_log_error(NGX_LOG_WARN, cf, 0, | 491 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
492 "\"starttls\" directive conflicts with \"ssl on\""); | 492 "\"starttls\" directive conflicts with \"ssl on\""); |
493 return NGX_CONF_ERROR; | 493 return NGX_CONF_ERROR; |
494 } | 494 } |
495 | 495 |
496 scf->file = cf->conf_file->file.name.data; | 496 scf->file = cf->conf_file->file.name.data; |
512 if (rv != NGX_CONF_OK) { | 512 if (rv != NGX_CONF_OK) { |
513 return rv; | 513 return rv; |
514 } | 514 } |
515 | 515 |
516 if (scf->enable == 1 && (ngx_int_t) scf->starttls > NGX_MAIL_STARTTLS_OFF) { | 516 if (scf->enable == 1 && (ngx_int_t) scf->starttls > NGX_MAIL_STARTTLS_OFF) { |
517 ngx_conf_log_error(NGX_LOG_WARN, cf, 0, | 517 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
518 "\"ssl\" directive conflicts with \"starttls\""); | 518 "\"ssl\" directive conflicts with \"starttls\""); |
519 return NGX_CONF_ERROR; | 519 return NGX_CONF_ERROR; |
520 } | 520 } |
521 | 521 |
522 scf->file = cf->conf_file->file.name.data; | 522 scf->file = cf->conf_file->file.name.data; |