From 016a0abb8d400468b0bae46b8e567dc4a9f89700 Mon Sep 17 00:00:00 2001
From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Tue, 23 Jul 2013 15:24:37 +0200
Subject: [PATCH] actually notice timeout during AXFR retrieve, thanks hkraal

---
 pdns/resolver.cc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pdns/resolver.cc b/pdns/resolver.cc
index 25c3fa0e25..7ae35adf15 100644
--- a/pdns/resolver.cc
+++ b/pdns/resolver.cc
@@ -460,8 +460,11 @@ void AXFRRetriever::timeoutReadn(uint16_t bytes)
   int n=0;
   int numread;
   while(n<bytes) {
-    if(waitForData(d_sock, 10-(time(0)-start))<0)
+    int res=waitForData(d_sock, 10-(time(0)-start));
+    if(res<0)
       throw ResolverException("Reading data from remote nameserver over TCP: "+stringerror());
+    if(!res)
+      throw ResolverException("Timeout while reading data from remote nameserver over TCP");
 
     numread=recv(d_sock, d_buf.get()+n, bytes-n, 0);
     if(numread<0)
-- 
2.47.3