Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2025-10-28 00:34:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade caddy to 0.11.X (#2541)

Browse Source 
* Upgrade caddy to 0.11.2

Redo of #2505 (cherry-picked commit)

Signed-off-by: Miek Gieben <miek@miek.nl>

* .4 has been released

Signed-off-by: Miek Gieben <miek@miek.nl>
This commit is contained in:
Miek Gieben
2019-02-17 15:11:19 +00:00
committed by GitHub
parent a72f3a161c
commit 2743c8eab1
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -31,7 +31,7 @@ godeps:
go get -u github.com/miekg/dns 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/promhttp
go get -u github.com/prometheus/client_golang/prometheus 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/miekg/dns && git checkout -q v1.1.4)
(cd $(GOPATH)/src/github.com/prometheus/client_golang && git checkout -q v0.9.1) (cd $(GOPATH)/src/github.com/prometheus/client_golang && git checkout -q v0.9.1)

5
core/dnsserver/server.go
View File

@@ -142,6 +142,11 @@ func (s *Server) Listen() (net.Listener, error) {
return l, nil 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. // ListenPacket implements caddy.UDPServer interface.
func (s *Server) ListenPacket() (net.PacketConn, error) { func (s *Server) ListenPacket() (net.PacketConn, error) {
p, err := listenPacket("udp", s.Addr[len(transport.DNS+"://"):]) p, err := listenPacket("udp", s.Addr[len(transport.DNS+"://"):])