From 2743c8eab1209beedb4b5efca885f40defa5c57d Mon Sep 17 00:00:00 2001 From: Miek Gieben Date: Sun, 17 Feb 2019 15:11:19 +0000 Subject: [PATCH] Upgrade caddy to 0.11.X (#2541) * Upgrade caddy to 0.11.2 Redo of #2505 (cherry-picked commit) Signed-off-by: Miek Gieben * .4 has been released Signed-off-by: Miek Gieben --- Makefile | 2 +- core/dnsserver/server.go | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4be7057c3..d76b31d4b 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,7 @@ godeps: go get -u github.com/miekg/dns go get -u github.com/prometheus/client_golang/prometheus/promhttp go get -u github.com/prometheus/client_golang/prometheus - (cd $(GOPATH)/src/github.com/mholt/caddy && git checkout -q v0.11.1) + (cd $(GOPATH)/src/github.com/mholt/caddy && git checkout -q v0.11.4) (cd $(GOPATH)/src/github.com/miekg/dns && git checkout -q v1.1.4) (cd $(GOPATH)/src/github.com/prometheus/client_golang && git checkout -q v0.9.1) diff --git a/core/dnsserver/server.go b/core/dnsserver/server.go index 4909fefd5..22ab8e1c3 100644 --- a/core/dnsserver/server.go +++ b/core/dnsserver/server.go @@ -142,6 +142,11 @@ func (s *Server) Listen() (net.Listener, error) { return l, nil } +// WrapListener Listen implements caddy.GracefulServer interface. +func (s *Server) WrapListener(ln net.Listener) net.Listener { + return ln +} + // ListenPacket implements caddy.UDPServer interface. func (s *Server) ListenPacket() (net.PacketConn, error) { p, err := listenPacket("udp", s.Addr[len(transport.DNS+"://"):])