diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-11-09 19:15:11 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2009-11-09 19:15:11 +0000 |
| commit | a59ba3306029b8ab733da38f9b41175795ac2704 (patch) | |
| tree | b6e5aac5f0dd49a12cbd336ad3d3822b42e2bb3e /src/core/ngx_resolver.c | |
| parent | 70966c154fa867a0465e18cf64d46b6a1a61a597 (diff) | |
| download | nginx-a59ba3306029b8ab733da38f9b41175795ac2704.tar.gz nginx-a59ba3306029b8ab733da38f9b41175795ac2704.tar.bz2 | |
*) fix resolving an empty name ("."),
*) add quotes in an error message,
*) backout r3299 in ngx_mail_smtp_handler.c
Diffstat (limited to 'src/core/ngx_resolver.c')
| -rw-r--r-- | src/core/ngx_resolver.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/ngx_resolver.c b/src/core/ngx_resolver.c index 775f17fa1..48d569ea3 100644 --- a/src/core/ngx_resolver.c +++ b/src/core/ngx_resolver.c @@ -1754,7 +1754,8 @@ ngx_resolver_create_name_query(ngx_resolver_node_t *rn, ngx_resolver_ctx_t *ctx) query->nns_hi = 0; query->nns_lo = 0; query->nar_hi = 0; query->nar_lo = 0; - p += sizeof(ngx_resolver_query_t) + 1 + ctx->name.len + 1; + p += sizeof(ngx_resolver_query_t) + + ctx->name.len ? (1 + ctx->name.len + 1) : 1; qs = (ngx_resolver_qs_t *) p; |