@@ -29,10 +29,10 @@ Upstream Patch Reference: https://github.com/coredns/coredns/commit/0d8cbb1a6bcb
2929---
3030 core/dnsserver/config.go | 12 ++
3131 core/dnsserver/server_grpc.go | 69 +++++++--
32- core/dnsserver/server_https.go | 36 + +++-
32+ core/dnsserver/server_https.go | 32 +++-
3333 core/dnsserver/server_https_test.go | 61 ++++++++
3434 core/dnsserver/server_quic.go | 29 +++-
35- core/dnsserver/zdirectives.go | 4 +-
35+ core/dnsserver/zdirectives.go | 2 +
3636 core/plugin/zplugin.go | 2 +
3737 plugin.cfg | 2 +
3838 plugin/chaos/zowners.go | 2 +-
@@ -46,7 +46,7 @@ Upstream Patch Reference: https://github.com/coredns/coredns/commit/0d8cbb1a6bcb
4646 test/https_test.go | 177 ++++++++++++++++++++++
4747 vendor/golang.org/x/net/netutil/listen.go | 87 +++++++++++
4848 vendor/modules.txt | 1 +
49- 19 files changed, 1159 insertions(+), 27 deletions(-)
49+ 19 files changed, 1156 insertions(+), 24 deletions(-)
5050 create mode 100644 plugin/grpc_server/README.md
5151 create mode 100644 plugin/grpc_server/setup.go
5252 create mode 100644 plugin/grpc_server/setup_test.go
@@ -200,25 +200,15 @@ index 9d7a95a..5149436 100644
200200 if err != nil {
201201 return nil, err
202202diff --git a/core/dnsserver/server_https.go b/core/dnsserver/server_https.go
203- index 09c7d62..b0465d9 100644
203+ index 09c7d62..f92b1b4 100644
204204--- a/core/dnsserver/server_https.go
205205+++ b/core/dnsserver/server_https.go
206- @@ -10,23 +10,31 @@ import (
207- "strconv"
208- "time"
209-
210- - "github.com/coredns/caddy"
211- - "github.com/coredns/coredns/plugin/metrics/vars"
212- + "github.com/coredns/caddy"
213- + "github.com/coredns/coredns/plugin/metrics/vars"
214- "github.com/coredns/coredns/plugin/pkg/dnsutil"
215- "github.com/coredns/coredns/plugin/pkg/doh"
216- clog "github.com/coredns/coredns/plugin/pkg/log"
206+ @@ -18,15 +18,23 @@ import (
217207 "github.com/coredns/coredns/plugin/pkg/response"
218208 "github.com/coredns/coredns/plugin/pkg/reuseport"
219209 "github.com/coredns/coredns/plugin/pkg/transport"
220210+
221- + "golang.org/x/net/netutil"
211+ + "golang.org/x/net/netutil"
222212+ )
223213+
224214+ const (
@@ -382,15 +372,13 @@ index a744cd0..ed362b5 100644
382372 }
383373
384374diff --git a/core/dnsserver/zdirectives.go b/core/dnsserver/zdirectives.go
385- index eb054c9..793f416 100644
375+ index eb054c9..bc4b086 100644
386376--- a/core/dnsserver/zdirectives.go
387377+++ b/core/dnsserver/zdirectives.go
388- @@ -15,7 +15,9 @@ var Directives = []string{
389- "geoip",
378+ @@ -16,6 +16,8 @@ var Directives = []string{
390379 "cancel",
391380 "tls",
392- - "quic",
393- + "quic",
381+ "quic",
394382+ "grpc_server",
395383+ "https",
396384 "timeouts",
0 commit comments