Mercurial > hg > nginx

comparison src/mail/ngx_mail_auth_http_module.c @ 4853:0b0ddfdbdd7b stable-1.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge of r4813, r4814, r4818, r4819, r4820, r4823: mail fixes. *) Corrected the directive name in the ngx_mail_auth_http_module error message. *) Don't let the well-known port in the "listen" directive to override the already set "protocol". *) Fixed sorting of listen addresses (ticket #187). For http module this problem was already fixed in r4756. *) Removed a stale "AF_INET only" comment. IPv6 client connections in mail modules have been supported since r2856. *) Fixed handling of AF_UNIX addresses in "listen". This makes AF_UNIX addresses in mail officially supported. *) Whitespace fix.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 24 Sep 2012 18:58:13 +0000
parents d620f497c50f
children eaf95350d75c
comparison
equal deleted inserted replaced
4852:9be0b6b749ae 4853:0b0ddfdbdd7b
1330 conf->host_header = prev->host_header; 1330 conf->host_header = prev->host_header;
1331 conf->uri = prev->uri; 1331 conf->uri = prev->uri;
1332 1332
1333 if (conf->peer == NULL) { 1333 if (conf->peer == NULL) {
1334 ngx_log_error(NGX_LOG_EMERG, cf->log, 0, 1334 ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
1335 "no \"http_auth\" is defined for server in %s:%ui", 1335 "no \"auth_http\" is defined for server in %s:%ui",
1336 conf->file, conf->line); 1336 conf->file, conf->line);
1337 1337
1338 return NGX_CONF_ERROR; 1338 return NGX_CONF_ERROR;
1339 } 1339 }
1340 } 1340 }