From: Igor Sysoev <igor@sysoev.ru>
Date: Thu, 20 Nov 2008 17:24:16 +0000 (+0000)
Subject: r2315 merge:
X-Git-Tag: release-0.6.33~1
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=6ef713bdd05bdaf2bedecbd9071f52e2eefab9ae;p=nginx.git

r2315 merge:

fix compression pointer for big (>255) DNS responses
---

diff --git a/src/core/ngx_resolver.c b/src/core/ngx_resolver.c
index a7fe056e6..2998bb2e0 100644
--- a/src/core/ngx_resolver.c
+++ b/src/core/ngx_resolver.c
@@ -1836,7 +1836,7 @@ ngx_resolver_copy(ngx_resolver_t *r, ngx_str_t *name, u_char *buf, u_char *src,
         }
 
         if (n & 0xc0) {
-            n = (n & 0x3f << 8) + *p;
+            n = ((n & 0x3f) << 8) + *p;
             p = &buf[n];
 
         } else {
@@ -1886,7 +1886,7 @@ done:
             }
 
         } else {
-            n = (n & 0x3f << 8) + *src;
+            n = ((n & 0x3f) << 8) + *src;
             src = &buf[n];
 
             n = *src++;