mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-07 17:52:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Support for IPv6 literals and an optional port in resolver.

Browse Source
This commit is contained in:
Ruslan Ermilov 2012-06-04 14:23:27 +00:00
parent 596226f6f7
commit ac7f704931
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/ngx_resolver.c
View File

@ -171,14 +171,14 @@ ngx_resolver_create(ngx_conf_t *cf, ngx_str_t *names, ngx_uint_t n)
ngx_memzero(&u, sizeof(ngx_url_t)); ngx_memzero(&u, sizeof(ngx_url_t));
u.host = names[i]; u.url = names[i];
u.port = 53; u.default_port = 53;
if (ngx_inet_resolve_host(cf->pool, &u) != NGX_OK) { if (ngx_parse_url(cf->pool, &u) != NGX_OK) {
if (u.err) { if (u.err) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"%s in resolver \"%V\"", "%s in resolver \"%V\"",
u.err, &u.host); u.err, &u.url);
} }
return NULL; return NULL;
@ -2189,7 +2189,7 @@ ngx_udp_connect(ngx_udp_connection_t *uc)
ngx_socket_t s; ngx_socket_t s;
ngx_connection_t *c; 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); ngx_log_debug1(NGX_LOG_DEBUG_EVENT, &uc->log, 0, "UDP socket %d", s);