chore: v2.3.10

chore: upgrade dependencies
Merge pull request #169 from vinnyperella/patch-4
2026-03-31 18:25:38 +00:00 · 2025-03-29 01:02:43 +01:00 · 2025-03-29 01:00:16 +01:00 · 2025-03-28 14:07:47 +00:00 · 2025-03-28 14:04:53 +00:00 · 2025-03-28 12:20:42 +01:00
7 changed files with 70 additions and 31 deletions
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -14,14 +14,14 @@ jobs:
      id: go

    - name: Check out repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4

    - name: Linux build
      run: |
        make

    - name: Upload Linux build
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
      with:
        name: linux-amd64
        path: |
@@ -29,7 +29,7 @@ jobs:
          doh-server/doh-server

    - name: Cache
-      uses: actions/cache@v2
+      uses: actions/cache@v4
      with:
        # A directory to store and save the cache
        path: ~/go/pkg/mod
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -0,0 +1,36 @@
+---
+issues:
+  fix: true
+linters:
+  enable-all: true
+  disable:
+    - importas
+    - depguard
+    - lll
+    - exhaustruct
+    - perfsprint
+    - gochecknoinits
+    - wsl
+    - exportloopref
+linters-settings:
+  revive:
+    enable-all-rules: true
+    rules:
+      - name: line-length-limit
+        disabled: true
+  gocritic:
+    enabled-tags:
+      - diagnostic
+      - style
+      - performance
+      - experimental
+      - opinionated
+  govet:
+    enable-all: true
+  gci:
+    sections:
+      - standard
+      - default
+      - prefix(github.com/m13253/dns-over-https/v2)
+  gofumpt:
+    extra-rules: true
--- a/Readme.md
+++ b/Readme.md
@@ -58,7 +58,7 @@ sudo make uninstall
 ```bash
 docker run -d --name doh-server \
  -p 8053:8053 \
-  -e UPSTREAM_DNS_SERVER="udp:8.8.8.8:53" \
+  -e UPSTREAM_DNS_SERVER="udp:208.67.222.222:53,udp:208.67.220.220:53" \
  -e DOH_HTTP_PREFIX="/dns-query" \
  -e DOH_SERVER_LISTEN=":8053" \
  -e DOH_SERVER_TIMEOUT="10" \
@@ -66,6 +66,7 @@ docker run -d --name doh-server \
  -e DOH_SERVER_VERBOSE="false" \
  satishweb/doh-server
 ```
+Note: Multiple Upstream DNS server support was added in the container image on 2024-12-19.

 Feeling adventurous? Try the latest build:

--- a/doh-client/version.go
+++ b/doh-client/version.go
@@ -24,6 +24,6 @@
 package main

 const (
-	VERSION    = "2.3.6"
+	VERSION    = "2.3.10"
 	USER_AGENT = "DNS-over-HTTPS/" + VERSION + " (+https://github.com/m13253/dns-over-https)"
 )
--- a/doh-server/version.go
+++ b/doh-server/version.go
@@ -24,6 +24,6 @@
 package main

 const (
-	VERSION    = "2.3.6"
+	VERSION    = "2.3.10"
 	USER_AGENT = "DNS-over-HTTPS/" + VERSION + " (+https://github.com/m13253/dns-over-https)"
 )
--- a/go.mod
+++ b/go.mod
@@ -1,20 +1,20 @@
 module github.com/m13253/dns-over-https/v2

-go 1.20
+go 1.23.5

 require (
-	github.com/BurntSushi/toml v1.4.0
+	github.com/BurntSushi/toml v1.5.0
 	github.com/gorilla/handlers v1.5.2
 	github.com/infobloxopen/go-trees v0.0.0-20221216143356-66ceba885ebc
-	github.com/miekg/dns v1.1.61
-	golang.org/x/net v0.27.0
+	github.com/miekg/dns v1.1.64
+	golang.org/x/net v0.38.0
 )

 require (
 	github.com/felixge/httpsnoop v1.0.4 // indirect
-	golang.org/x/mod v0.19.0 // indirect
-	golang.org/x/sync v0.7.0 // indirect
-	golang.org/x/sys v0.22.0 // indirect
-	golang.org/x/text v0.16.0 // indirect
-	golang.org/x/tools v0.22.0 // indirect
+	golang.org/x/mod v0.24.0 // indirect
+	golang.org/x/sync v0.12.0 // indirect
+	golang.org/x/sys v0.31.0 // indirect
+	golang.org/x/text v0.23.0 // indirect
+	golang.org/x/tools v0.31.0 // indirect
 )
--- a/go.sum
+++ b/go.sum
@@ -1,26 +1,28 @@
-github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0=
-github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
+github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg=
+github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
 github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
 github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/gorilla/handlers v1.5.2 h1:cLTUSsNkgcwhgRqvCNmdbRWG0A3N4F+M2nWKdScwyEE=
 github.com/gorilla/handlers v1.5.2/go.mod h1:dX+xVpaxdSw+q0Qek8SSsl3dfMk3jNddUkMzo0GtH0w=
 github.com/infobloxopen/go-trees v0.0.0-20221216143356-66ceba885ebc h1:RhT2pjLo3EVRmldbEcBdeRA7CGPWsNEJC+Y/N1aXQbg=
 github.com/infobloxopen/go-trees v0.0.0-20221216143356-66ceba885ebc/go.mod h1:BaIJzjD2ZnHmx2acPF6XfGLPzNCMiBbMRqJr+8/8uRI=
-github.com/miekg/dns v1.1.61 h1:nLxbwF3XxhwVSm8g9Dghm9MHPaUZuqhPiGL+675ZmEs=
-github.com/miekg/dns v1.1.61/go.mod h1:mnAarhS3nWaW+NVP2wTkYVIZyHNJ098SJZUki3eykwQ=
+github.com/miekg/dns v1.1.64 h1:wuZgD9wwCE6XMT05UU/mlSko71eRSXEAm2EbjQXLKnQ=
+github.com/miekg/dns v1.1.64/go.mod h1:Dzw9769uoKVaLuODMDZz9M6ynFU6Em65csPuoi8G0ck=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-golang.org/x/mod v0.19.0 h1:fEdghXQSo20giMthA7cd28ZC+jts4amQ3YMXiP5oMQ8=
-golang.org/x/mod v0.19.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
-golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys=
-golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE=
-golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
-golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
-golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
-golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
-golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA=
-golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c=
+golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU=
+golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
+golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8=
+golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
+golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=
+golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
+golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
+golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
+golang.org/x/tools v0.31.0 h1:0EedkvKDbh+qistFTd0Bcwe/YLh4vHwWEkiI0toFIBU=
+golang.org/x/tools v0.31.0/go.mod h1:naFTU+Cev749tSJRXJlna0T3WxKvb1kWEx15xA4SdmQ=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
Author	SHA1	Message	Date
GreyXor	f13dea391f	chore: v2.3.10	2025-03-29 01:02:43 +01:00
GreyXor	45edaad516	chore: upgrade dependencies	2025-03-29 01:00:16 +01:00
Star Brilliant	2179ee0054	Merge pull request #169 from vinnyperella/patch-4 Update go.yml	2025-03-28 14:07:47 +00:00
Vinny	6ddb1ad401	Update go.yml Updated actions checkout/cache to v4.	2025-03-28 14:04:53 +00:00
GreyXor	35e0835949	chore: v2.3.9	2025-03-28 12:20:42 +01:00
GreyXor	5c744889be	chore: upgrade dependencies	2025-03-28 11:47:07 +01:00
GreyXor	cb1c336217	chore: upgrade dependencies	2025-02-20 10:41:30 +01:00
GreyXor	f82ac1118e	feat: new version 2.3.8	2025-01-28 09:09:13 +01:00
GreyXor	e5fef5690e	chore: upgrade package dependencies	2025-01-28 09:07:28 +01:00
GreyXor	9c997f1491	Merge pull request #166 from vinnyperella/patch-3 chore: update dependencies	2025-01-27 22:51:34 +01:00
Vinny	d33fc60182	chore: update dependencies	2025-01-27 15:01:08 -05:00
Vinny	89bb7e95a6	chore: update dependencies	2025-01-27 14:58:41 -05:00
GreyXor	c5a06988d5	chore: upgrade dependencies	2024-12-28 18:17:23 +01:00
Satish Gaikwad	ea57996685	Merge pull request #162 from m13253/add-multi-upstream-dns-servers	2024-12-20 08:41:18 -08:00
Satish Gaikwad	0a1aa98a01	Updated comment	2024-12-19 22:27:26 +00:00
Satish Gaikwad	7ca84d162f	Updated comment	2024-12-19 22:24:23 +00:00
Satish Gaikwad	0ea5c5015f	Added a note for multiple DNS server support in the container image	2024-12-17 18:56:10 +00:00
Satish Gaikwad	65424da23f	Update example to use multiple upstream DNS servers Update example to use multiple upstream DNS servers	2024-12-17 10:41:51 -08:00
GreyXor	d35e6a6117	chore: upgrade package dependencies	2024-11-14 12:47:00 +01:00
Star Brilliant	4a98f0997b	Update to actions/upload-artifact@v4	2024-11-13 18:58:47 +00:00
GreyXor	b70babf43e	chore: upgrade package dependencies	2024-11-09 09:00:22 +01:00
GreyXor	967c43016c	chore: upgrade package dependencies	2024-08-10 08:39:30 +02:00
GreyXor	a10da0ed10	Pre-bump to next version 2.3.7	2024-07-05 18:14:09 +02:00