From: bert hubert <bert.hubert@netherlabs.nl>
Date: Tue, 30 Sep 2014 11:56:23 +0000 (+0200)
Subject: Merge branch 'master' into alias
X-Git-Tag: rec-3.7.0-rc1~208^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=61fd0ca384b05e138554367dee2b2c025477201e;p=thirdparty%2Fpdns.git

Merge branch 'master' into alias

Conflicts:
	pdns/dnsproxy.cc
---

61fd0ca384b05e138554367dee2b2c025477201e
diff --cc pdns/dnsproxy.cc
index e674f3d485,611d139d3e..504691286e
--- a/pdns/dnsproxy.cc
+++ b/pdns/dnsproxy.cc
@@@ -171,8 -134,7 +171,8 @@@ int DNSProxy::getID_locked(
          L<<Logger::Warning<<"Recursive query for remote "<<
            i->second.remote.toStringWithPort()<<" with internal id "<<n<<
            " was not answered by backend within timeout, reusing id"<<endl;
- 	
 +	delete i->second.complete;
+ 	S.inc("recursion-unanswered");
        }
        return n;
      }