Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into dnsmasq

[ipfire-2.x.git] / src / patches / dnsmasq / 0090-Tweak-EDNS-timeout-code.patch

diff --git a/src/patches/dnsmasq/0090-Tweak-EDNS-timeout-code.patch b/src/patches/dnsmasq/0090-Tweak-EDNS-timeout-code.patch
index de1e0e6ef5dcb924ad49585e883a3e5b9b187d91..d50872bb360c2d297e2b05fbbe4de6303b90a65f 100644 (file)
--- a/src/patches/dnsmasq/0090-Tweak-EDNS-timeout-code.patch
+++ b/src/patches/dnsmasq/0090-Tweak-EDNS-timeout-code.patch
@@ -1,14 +1,14 @@
 From 86fa1046920dedc8134136a6244ca96e8a37e9d8 Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Sun, 10 May 2015 13:50:59 +0100
-Subject: [PATCH] Tweak EDNS timeout code.
+Subject: [PATCH 90/98] Tweak EDNS timeout code.
 
 ---
- src/forward.c |    6 ++++--
+ src/forward.c | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/src/forward.c b/src/forward.c
-index 592243f..74e5ab6 100644
+index 592243fd4d35..74e5ab66c423 100644
 --- a/src/forward.c
 +++ b/src/forward.c
 @@ -799,8 +799,10 @@ void reply_query(int fd, int family, time_t now)
@@ -25,5 +25,4 @@ index 592243f..74e5ab6 100644
    
    /* If the answer is an error, keep the forward record in place in case
 -- 
-1.7.10.4
-
+2.1.0