From 938d3731c8d5f46d699bf9c95b19f3c4ad6e2d4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?agentzh=20=28=E7=AB=A0=E4=BA=A6=E6=98=A5=29?=
 <agentzh@gmail.com>
Date: Fri, 1 Jun 2012 18:21:55 +0800
Subject: [PATCH] applied the resolver_debug_log_overflow.patch:
 http://mailman.nginx.org/pipermail/nginx-devel/2012-June/002281.html

---
 .../nginx-1.0.15-resolver_debug_log_overflow.patch    | 11 +++++++++++
 patches/nginx-1.3.0-resolver_debug_log_overflow.patch | 11 +++++++++++
 util/mirror-tarballs                                  |  3 +++
 3 files changed, 25 insertions(+)
 create mode 100644 patches/nginx-1.0.15-resolver_debug_log_overflow.patch
 create mode 100644 patches/nginx-1.3.0-resolver_debug_log_overflow.patch

diff --git a/patches/nginx-1.0.15-resolver_debug_log_overflow.patch b/patches/nginx-1.0.15-resolver_debug_log_overflow.patch
new file mode 100644
index 0000000..1a923c8
--- /dev/null
+++ b/patches/nginx-1.0.15-resolver_debug_log_overflow.patch
@@ -0,0 +1,11 @@
+--- nginx-1.0.15/src/core/ngx_resolver.c	2012-03-05 21:17:56.000000000 +0800
++++ nginx-1.0.15-patched/src/core/ngx_resolver.c	2012-06-01 17:55:55.861130605 +0800
+@@ -987,7 +987,7 @@
+     nan = (query->nan_hi << 8) + query->nan_lo;
+ 
+     ngx_log_debug6(NGX_LOG_DEBUG_CORE, r->log, 0,
+-                   "resolver DNS response %ui fl:%04Xui %ui/%ui/%ui/%ui",
++                   "resolver DNS response %ui fl:%04Xui %ui/%ui/%ud/%ud",
+                    ident, flags, nqs, nan,
+                    (query->nns_hi << 8) + query->nns_lo,
+                    (query->nar_hi << 8) + query->nar_lo);
diff --git a/patches/nginx-1.3.0-resolver_debug_log_overflow.patch b/patches/nginx-1.3.0-resolver_debug_log_overflow.patch
new file mode 100644
index 0000000..19e192b
--- /dev/null
+++ b/patches/nginx-1.3.0-resolver_debug_log_overflow.patch
@@ -0,0 +1,11 @@
+--- nginx-1.3.0/src/core/ngx_resolver.c	2012-05-14 17:13:45.000000000 +0800
++++ nginx-1.3.0-patched/src/core/ngx_resolver.c	2012-06-01 18:08:06.512047421 +0800
+@@ -1035,7 +1035,7 @@
+     nan = (query->nan_hi << 8) + query->nan_lo;
+ 
+     ngx_log_debug6(NGX_LOG_DEBUG_CORE, r->log, 0,
+-                   "resolver DNS response %ui fl:%04Xui %ui/%ui/%ui/%ui",
++                   "resolver DNS response %ui fl:%04Xui %ui/%ui/%ud/%ud",
+                    ident, flags, nqs, nan,
+                    (query->nns_hi << 8) + query->nns_lo,
+                    (query->nar_hi << 8) + query->nar_lo);
diff --git a/util/mirror-tarballs b/util/mirror-tarballs
index 33f35bd..6ef7e3d 100755
--- a/util/mirror-tarballs
+++ b/util/mirror-tarballs
@@ -69,6 +69,9 @@ patch -p1 < $root/patches/nginx-$main_ver-filter_finalize_hang.patch || exit 1
 echo applying add_core_vars_polluting_globals.patch ...
 patch -p1 < $root/patches/nginx-$main_ver-add_core_vars_polluting_globals.patch || exit 1
 
+echo applying resolver_debug_log_overflow.patch ...
+patch -p1 < $root/patches/nginx-$main_ver-resolver_debug_log_overflow.patch || exit 1
+
 #echo "INFO: applying null-character-fixes patch"
 #patch -p0 < $root/patches/nginx-$main_ver-null_character_fixes.patch || exit 1