]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Merge pull request #13381 from rgacogne/ddist-clean-up-nghttp2-no-doh
authorRemi Gacogne <remi.gacogne@powerdns.com>
Tue, 31 Oct 2023 07:34:55 +0000 (08:34 +0100)
committerGitHub <noreply@github.com>
Tue, 31 Oct 2023 07:34:55 +0000 (08:34 +0100)
dnsdist: Fix the case where nghttp2 is available but DoH is disabled

1  2 
pdns/dnsdist-tcp.cc
pdns/dnsdist.cc
pdns/dnsdistdist/Makefile.am
pdns/dnsdistdist/dnsdist-nghttp2-in.cc
pdns/dnsdistdist/test-dnsdistnghttp2_cc.cc

Simple merge
diff --cc pdns/dnsdist.cc
Simple merge
Simple merge