Skip to content

Commit 29e05c5

Browse files
committed
Merge pull request #16 from wandenberg/nginx_1_9_13
fix #15 supporting nginx 1.9.13+
2 parents 6872492 + a0d721e commit 29e05c5

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

ngx_http_upstream_dynamic_servers.c

+5-4
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,10 @@ static void ngx_http_upstream_dynamic_server_resolve_handler(ngx_resolver_ctx_t
422422

423423
goto end;
424424
}
425-
ctx->addrs = u.addrs;
425+
ctx->addr.sockaddr = u.addrs[0].sockaddr;
426+
ctx->addr.socklen = u.addrs[0].socklen;
427+
ctx->addr.name = u.addrs[0].name;
428+
ctx->addrs = &ctx->addr;
426429
ctx->naddrs = u.naddrs;
427430
}
428431

@@ -432,14 +435,12 @@ static void ngx_http_upstream_dynamic_server_resolve_handler(ngx_resolver_ctx_t
432435

433436
ngx_uint_t i, j, founded;
434437
ngx_addr_t *existing_addr;
435-
ngx_addr_t *new_addr;
436438
for (i = 0; i < ctx->naddrs; i++) {
437439
founded = 0;
438-
new_addr = &ctx->addrs[i];
439440

440441
for (j = 0; j < ctx->naddrs; j++) {
441442
existing_addr = &dynamic_server->server->addrs[j];
442-
if (ngx_cmp_sockaddr(existing_addr->sockaddr, existing_addr->socklen, new_addr->sockaddr, new_addr->socklen, 0) == NGX_OK) {
443+
if (ngx_cmp_sockaddr(existing_addr->sockaddr, existing_addr->socklen, ctx->addrs[i].sockaddr, ctx->addrs[i].socklen, 0) == NGX_OK) {
443444
founded = 1;
444445
break;
445446
}

0 commit comments

Comments
 (0)