Merge pull request #6469 from rgacogne/rec-axfr-timeout

author Pieter Lexis <pieterlexis@users.noreply.github.com>

Wed, 11 Apr 2018 13:47:05 +0000 (15:47 +0200)

committer GitHub <noreply@github.com>

Wed, 11 Apr 2018 13:47:05 +0000 (15:47 +0200)
author Pieter Lexis <pieterlexis@users.noreply.github.com>
Wed, 11 Apr 2018 13:47:05 +0000 (15:47 +0200)
committer GitHub <noreply@github.com>
Wed, 11 Apr 2018 13:47:05 +0000 (15:47 +0200)
diff --cc pdns/resolver.cc
Simple merge
diff --cc pdns/resolver.hh
Simple merge
author	Pieter Lexis <pieterlexis@users.noreply.github.com>
	Wed, 11 Apr 2018 13:47:05 +0000 (15:47 +0200)
committer	GitHub <noreply@github.com>
	Wed, 11 Apr 2018 13:47:05 +0000 (15:47 +0200)
		1	2
pdns/resolver.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/resolver.hh	patch \|	diff1 \|	diff2 \|	blob \| history