diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2012-09-24 18:58:13 +0000 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2012-09-24 18:58:13 +0000 |
| commit | 9288e6587b2b7e50d81425a0c101adf4182c70fb (patch) | |
| tree | 9101b53f29f483b7aa3dd93c82c66e2458b5168b /src/mail/ngx_mail_handler.c | |
| parent | 191e31938e81f2a59a4ba4dc6b3f4f28bc232187 (diff) | |
| download | nginx-9288e6587b2b7e50d81425a0c101adf4182c70fb.tar.gz nginx-9288e6587b2b7e50d81425a0c101adf4182c70fb.tar.bz2 | |
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.
Diffstat (limited to '')
| -rw-r--r-- | src/mail/ngx_mail_handler.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/mail/ngx_mail_handler.c b/src/mail/ngx_mail_handler.c index a1c4464f7..ae955f9c6 100644 --- a/src/mail/ngx_mail_handler.c +++ b/src/mail/ngx_mail_handler.c @@ -38,8 +38,6 @@ ngx_mail_init_connection(ngx_connection_t *c) /* find the server configuration for the address:port */ - /* AF_INET only */ - port = c->listening->servers; if (port->naddrs > 1) { |