]> granicus.if.org Git - pdns/commitdiff
Merge pull request #8383 from rgacogne/ddist-merge-doh-dot-contexts
authorRemi Gacogne <rgacogne@users.noreply.github.com>
Tue, 15 Oct 2019 12:47:38 +0000 (14:47 +0200)
committerGitHub <noreply@github.com>
Tue, 15 Oct 2019 12:47:38 +0000 (14:47 +0200)
dnsdist: Merge the setup of TLS contexts in Doh and DoT

1  2 
pdns/dnsdist-lua.cc
pdns/dnsdistdist/doh.cc
pdns/dnsdistdist/tcpiohandler.cc
pdns/doh.hh
pdns/tcpiohandler.hh

Simple merge
Simple merge
Simple merge
diff --cc pdns/doh.hh
Simple merge
Simple merge