Compare commits

...

3 Commits

Author SHA1 Message Date
John 57c78f00a0
Merge 99a1661ae7 into 17c4eeb646 2024-05-03 04:14:49 +07:00
Eugene Burkov 17c4eeb646 Pull request 2214: 6744 Fix TLD subdomain
Updates #6744.

Squashed commit of the following:

commit 04894ca268
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Thu May 2 16:48:37 2024 +0300

    all: upd proxy finally

commit 0cb063ed57
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Thu May 2 15:26:17 2024 +0300

    all: upd again

commit 3deb71c08d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Thu May 2 14:46:38 2024 +0300

    all: upd proxy
2024-05-02 17:47:24 +03:00
hishope 99a1661ae7 docs: remove repetitive words
Signed-off-by: hishope <csqiye@126.com>
2024-03-07 15:56:25 +08:00
4 changed files with 5 additions and 5 deletions

2
go.mod
View File

@ -3,7 +3,7 @@ module github.com/AdguardTeam/AdGuardHome
go 1.22.2
require (
github.com/AdguardTeam/dnsproxy v0.71.0
github.com/AdguardTeam/dnsproxy v0.71.1
github.com/AdguardTeam/golibs v0.23.2
github.com/AdguardTeam/urlfilter v0.18.0
github.com/NYTimes/gziphandler v1.1.1

4
go.sum
View File

@ -1,5 +1,5 @@
github.com/AdguardTeam/dnsproxy v0.71.0 h1:7epvSeTtjTdwbeifRJK6jTXldoJwqd3GWqAYDlSo7zQ=
github.com/AdguardTeam/dnsproxy v0.71.0/go.mod h1:rCaCL4m4n63sgwTOyUVdc7MC42PlUYBt11Fz/UjD+kM=
github.com/AdguardTeam/dnsproxy v0.71.1 h1:R8jKmoE9HwqdTt7bm8irpvrQEOSmD+iGdNXbOg/uM8Y=
github.com/AdguardTeam/dnsproxy v0.71.1/go.mod h1:rCaCL4m4n63sgwTOyUVdc7MC42PlUYBt11Fz/UjD+kM=
github.com/AdguardTeam/golibs v0.23.2 h1:rMjYantwtQ39e8G4zBQ6ZLlm4s3XH30Bc9VxhoOHwao=
github.com/AdguardTeam/golibs v0.23.2/go.mod h1:o9i55Sx6v7qogRQeqaBfmLbC/pZqeMBWi015U5PTDY0=
github.com/AdguardTeam/urlfilter v0.18.0 h1:ZZzwODC/ADpjJSODxySrrUnt/fvOCfGFaCW6j+wsGfQ=

View File

@ -30,7 +30,7 @@ func substRootDirFS(t testing.TB, fsys fs.FS) {
// RunCmdFunc is the signature of aghos.RunCommand function.
type RunCmdFunc func(cmd string, args ...string) (code int, out []byte, err error)
// substShell replaces the the aghos.RunCommand function used throughout the
// substShell replaces the aghos.RunCommand function used throughout the
// package with rc for tests ran under t.
func substShell(t testing.TB, rc RunCmdFunc) {
t.Helper()

View File

@ -22,7 +22,7 @@ var testdata fs.FS = os.DirFS("./testdata")
// RunCmdFunc is the signature of aghos.RunCommand function.
type RunCmdFunc func(cmd string, args ...string) (code int, out []byte, err error)
// substShell replaces the the aghos.RunCommand function used throughout the
// substShell replaces the aghos.RunCommand function used throughout the
// package with rc for tests ran under t.
func substShell(t testing.TB, rc RunCmdFunc) {
t.Helper()