Merge pull request #7927 from rgacogne/dnsdist-doh-timeout

author Remi Gacogne <rgacogne@users.noreply.github.com>

Wed, 17 Jul 2019 12:02:11 +0000 (14:02 +0200)

committer GitHub <noreply@github.com>

Wed, 17 Jul 2019 12:02:11 +0000 (14:02 +0200)
author Remi Gacogne <rgacogne@users.noreply.github.com>
Wed, 17 Jul 2019 12:02:11 +0000 (14:02 +0200)
committer GitHub <noreply@github.com>
Wed, 17 Jul 2019 12:02:11 +0000 (14:02 +0200)
diff --cc pdns/dnsdist.hh
Simple merge
diff --cc pdns/dnsdistdist/Makefile.am
Simple merge
diff --cc pdns/dnsdistdist/doh.cc
Simple merge
diff --cc pdns/doh.hh
Simple merge
author	Remi Gacogne <rgacogne@users.noreply.github.com>
	Wed, 17 Jul 2019 12:02:11 +0000 (14:02 +0200)
committer	GitHub <noreply@github.com>
	Wed, 17 Jul 2019 12:02:11 +0000 (14:02 +0200)
		1	2
pdns/dnsdist.hh	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdistdist/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdistdist/doh.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/doh.hh	patch \|	diff1 \|	diff2 \|	blob \| history