details: http://hg.nginx.org/nginx/rev/70a0408cca7b
branches:
changeset: 5768:70a0408cca7b
user: Ruslan Ermilov <ru@nginx.com>
date: Wed Jul 16 10:21:28 2014 +0400
description:
Resolver: fixed resend on malformed responses.

DNS request resend on malformed responses was broken in 98876ce2a7fd (1.5.8).

Reported by Pramod Korathota.

diffstat:

src/core/ngx_resolver.c | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 deletions(-)

diffs (81 lines):

diff -r abd460ece11e -r 70a0408cca7b src/core/ngx_resolver.c
--- a/src/core/ngx_resolver.c Wed Jul 09 12:27:15 2014 -0700
+++ b/src/core/ngx_resolver.c Wed Jul 16 10:21:28 2014 +0400
@@ -1467,7 +1467,6 @@ ngx_resolver_process_a(ngx_resolver_t *r
goto failed;
}

- rn->naddrs6 = 0;
qident = (rn->query6[0] << 8) + rn->query6[1];

break;
@@ -1482,7 +1481,6 @@ ngx_resolver_process_a(ngx_resolver_t *r
goto failed;
}

- rn->naddrs = 0;
qident = (rn->query[0] << 8) + rn->query[1];
}

@@ -1507,6 +1505,8 @@ ngx_resolver_process_a(ngx_resolver_t *r

case NGX_RESOLVE_AAAA:

+ rn->naddrs6 = 0;
+
if (rn->naddrs == (u_short) -1) {
goto next;
}
@@ -1519,6 +1519,8 @@ ngx_resolver_process_a(ngx_resolver_t *r

default: /* NGX_RESOLVE_A */

+ rn->naddrs = 0;
+
if (rn->naddrs6 == (u_short) -1) {
goto next;
}
@@ -1539,6 +1541,8 @@ ngx_resolver_process_a(ngx_resolver_t *r

case NGX_RESOLVE_AAAA:

+ rn->naddrs6 = 0;
+
if (rn->naddrs == (u_short) -1) {
rn->code = (u_char) code;
goto next;
@@ -1548,6 +1552,8 @@ ngx_resolver_process_a(ngx_resolver_t *r

default: /* NGX_RESOLVE_A */

+ rn->naddrs = 0;
+
if (rn->naddrs6 == (u_short) -1) {
rn->code = (u_char) code;
goto next;
@@ -1817,6 +1823,25 @@ ngx_resolver_process_a(ngx_resolver_t *r
}
}

+ switch (qtype) {
+
+#if (NGX_HAVE_INET6)
+ case NGX_RESOLVE_AAAA:
+
+ if (rn->naddrs6 == (u_short) -1) {
+ rn->naddrs6 = 0;
+ }
+
+ break;
+#endif
+
+ default: /* NGX_RESOLVE_A */
+
+ if (rn->naddrs == (u_short) -1) {
+ rn->naddrs = 0;
+ }
+ }
+
if (rn->naddrs != (u_short) -1
#if (NGX_HAVE_INET6)
&& rn->naddrs6 != (u_short) -1

_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel