Mercurial > hg > nginx
changeset 4671:af9342747669
Support for IPv6 literals and an optional port in resolver.
author | Ruslan Ermilov <ru@nginx.com> |
---|---|
date | Mon, 04 Jun 2012 14:23:27 +0000 |
parents | c070fa19511e |
children | dc6c658942a8 |
files | src/core/ngx_resolver.c |
diffstat | 1 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/core/ngx_resolver.c Mon Jun 04 14:07:34 2012 +0000 +++ b/src/core/ngx_resolver.c Mon Jun 04 14:23:27 2012 +0000 @@ -171,14 +171,14 @@ ngx_memzero(&u, sizeof(ngx_url_t)); - u.host = names[i]; - u.port = 53; - - if (ngx_inet_resolve_host(cf->pool, &u) != NGX_OK) { + u.url = names[i]; + u.default_port = 53; + + if (ngx_parse_url(cf->pool, &u) != NGX_OK) { if (u.err) { ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "%s in resolver \"%V\"", - u.err, &u.host); + u.err, &u.url); } return NULL; @@ -2189,7 +2189,7 @@ ngx_socket_t s; ngx_connection_t *c; - s = ngx_socket(AF_INET, SOCK_DGRAM, 0); + s = ngx_socket(uc->sockaddr->sa_family, SOCK_DGRAM, 0); ngx_log_debug1(NGX_LOG_DEBUG_EVENT, &uc->log, 0, "UDP socket %d", s);