Mercurial > hg > nginx-mail
comparison src/mail/ngx_mail_smtp_handler.c @ 570:9773720b845e
Merge with 0.8.16.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Sat, 26 Sep 2009 01:25:07 +0400 |
parents | c78a94ba4ae1 98143f74eb3d |
children | 5938746e70c2 |
comparison
equal
deleted
inserted
replaced
511:1e91f9968443 | 570:9773720b845e |
---|---|
64 s->host = smtp_unavailable; | 64 s->host = smtp_unavailable; |
65 ngx_mail_smtp_greeting(s, c); | 65 ngx_mail_smtp_greeting(s, c); |
66 return; | 66 return; |
67 } | 67 } |
68 | 68 |
69 if (c->sockaddr->sa_family != AF_INET) { | |
70 s->host = smtp_tempunavail; | |
71 ngx_mail_smtp_greeting(s, c); | |
72 return; | |
73 } | |
74 | |
69 c->log->action = "in resolving client address"; | 75 c->log->action = "in resolving client address"; |
70 | 76 |
71 ctx = ngx_resolve_start(cscf->resolver, NULL); | 77 ctx = ngx_resolve_start(cscf->resolver, NULL); |
72 if (ctx == NULL) { | 78 if (ctx == NULL) { |
73 ngx_mail_close_connection(c); | 79 ngx_mail_close_connection(c); |