Mercurial > hg > nginx
comparison src/mail/ngx_mail_smtp_handler.c @ 3336:11ec1c7a57e9 stable-0.7
r3140, r3144, r3298, r3299, r3300, r3307, r3308 merge:
resolver fixes:
*) fix memory leak in resolver
*) fix resolver cache rbtree comparison
*) fix segfault in resolver:
ngx_resolve_name_done() and ngx_resolve_addr_done() did not delete
contexts from a resolver node waiting list.
*) fix "PTR ." case in address resolver
*) add quotes in an error message,
*) fix resolving an empty name (".")
*) use ngx_resolver_alloc() instead of ngx_resolver_calloc()
since all fields are filled
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 16 Nov 2009 15:13:02 +0000 |
parents | a96a8c916b0c |
children |
comparison
equal
deleted
inserted
replaced
3335:616ff375a68f | 3336:11ec1c7a57e9 |
---|---|
189 s = ctx->data; | 189 s = ctx->data; |
190 c = s->connection; | 190 c = s->connection; |
191 | 191 |
192 if (ctx->state) { | 192 if (ctx->state) { |
193 ngx_log_error(NGX_LOG_ERR, c->log, 0, | 193 ngx_log_error(NGX_LOG_ERR, c->log, 0, |
194 "%V could not be resolved (%i: %s)", | 194 "\"%V\" could not be resolved (%i: %s)", |
195 &ctx->name, ctx->state, | 195 &ctx->name, ctx->state, |
196 ngx_resolver_strerror(ctx->state)); | 196 ngx_resolver_strerror(ctx->state)); |
197 | 197 |
198 if (ctx->state == NGX_RESOLVE_NXDOMAIN) { | 198 if (ctx->state == NGX_RESOLVE_NXDOMAIN) { |
199 s->host = smtp_unavailable; | 199 s->host = smtp_unavailable; |