Merge pull request #8030 from rgacogne/ddist-tcp-enotconn-read-bsd

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

Fri, 9 Aug 2019 12:40:24 +0000 (14:40 +0200)

committer GitHub <noreply@github.com>

Fri, 9 Aug 2019 12:40:24 +0000 (14:40 +0200)
author Remi Gacogne <rgacogne@users.noreply.github.com>
Fri, 9 Aug 2019 12:40:24 +0000 (14:40 +0200)
committer GitHub <noreply@github.com>
Fri, 9 Aug 2019 12:40:24 +0000 (14:40 +0200)
diff --cc pdns/dnsdist-tcp.cc
Simple merge
diff --cc pdns/tcpiohandler.hh
Simple merge
author	Remi Gacogne <rgacogne@users.noreply.github.com>
	Fri, 9 Aug 2019 12:40:24 +0000 (14:40 +0200)
committer	GitHub <noreply@github.com>
	Fri, 9 Aug 2019 12:40:24 +0000 (14:40 +0200)
		1	2
pdns/dnsdist-tcp.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/tcpiohandler.hh	patch \|	diff1 \|	diff2 \|	blob \| history