Pull request 1868: 5874-fix-tcp-fallback

Merge in DNS/adguard-home from 5874-fix-tcp-fallback to master

Updates #5783.
Updates #5784.

Squashed commit of the following:

commit b57ca38d21308d71c3a2dd5c5d4b87a31e845930
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Thu Jun 8 16:22:36 2023 +0300

    all: upd proxy
This commit is contained in:
Eugene Burkov 2023-06-08 16:28:01 +03:00
parent 040596f3a0
commit 156c199bbb
2 changed files with 3 additions and 3 deletions

2
go.mod
View File

@ -4,7 +4,7 @@ go 1.19
require ( require (
// TODO(a.garipov): Return to a release version once there is one. // TODO(a.garipov): Return to a release version once there is one.
github.com/AdguardTeam/dnsproxy v0.50.1-0.20230608093628-20fd4734e086 github.com/AdguardTeam/dnsproxy v0.50.1
github.com/AdguardTeam/golibs v0.13.2 github.com/AdguardTeam/golibs v0.13.2
github.com/AdguardTeam/urlfilter v0.16.1 github.com/AdguardTeam/urlfilter v0.16.1
github.com/NYTimes/gziphandler v1.1.1 github.com/NYTimes/gziphandler v1.1.1

4
go.sum
View File

@ -1,5 +1,5 @@
github.com/AdguardTeam/dnsproxy v0.50.1-0.20230608093628-20fd4734e086 h1:jYfWlJcChmOaJ1NLmoMWUvY2lse4qEVpKCBv7hZFW9U= github.com/AdguardTeam/dnsproxy v0.50.1 h1:A0HmAxb2izkOcuD50pRmR7ZnBL3/qF2DR2SlI6fN+6E=
github.com/AdguardTeam/dnsproxy v0.50.1-0.20230608093628-20fd4734e086/go.mod h1:CQhZTkqC8X0ID6glrtyaxgqRRdiYfn1gJulC1cZ5Dn8= github.com/AdguardTeam/dnsproxy v0.50.1/go.mod h1:CQhZTkqC8X0ID6glrtyaxgqRRdiYfn1gJulC1cZ5Dn8=
github.com/AdguardTeam/golibs v0.4.0/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4= github.com/AdguardTeam/golibs v0.4.0/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
github.com/AdguardTeam/golibs v0.10.4/go.mod h1:rSfQRGHIdgfxriDDNgNJ7HmE5zRoURq8R+VdR81Zuzw= github.com/AdguardTeam/golibs v0.10.4/go.mod h1:rSfQRGHIdgfxriDDNgNJ7HmE5zRoURq8R+VdR81Zuzw=
github.com/AdguardTeam/golibs v0.13.2 h1:BPASsyQKmb+b8VnvsNOHp7bKfcZl9Z+Z2UhPjOiupSc= github.com/AdguardTeam/golibs v0.13.2 h1:BPASsyQKmb+b8VnvsNOHp7bKfcZl9Z+Z2UhPjOiupSc=