mirrors
/
AdGuardHome
mirror of https://github.com/AdguardTeam/AdGuardHome.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pull request 2030: 6156 upd proxy 

Merge in DNS/adguard-home from 6156-upd-proxy to master

Updates #6156.

Squashed commit of the following:

commit 8e765f781e05dbf68d1d1bc89369b3aa37cbbd4f
Merge: b18d0aed5 3ec76cdef
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Mon Oct 9 15:51:22 2023 +0300

    Merge branch 'master' into 6156-upd-proxy

commit b18d0aed5f34cf7eba583b6622dab9bfeb210f8a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Mon Oct 9 13:06:42 2023 +0300

    all: upd proxy
This commit is contained in:
Eugene Burkov 2023-10-11 12:49:22 +03:00
parent 3ec76cdef5
commit 0fb6d6163d
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -41,6 +41,7 @@ NOTE: Add new changes BELOW THIS COMMENT.
### Fixed ### Fixed
- Incorrect domain-specific upstream matching for `DS` queries ([#6156]).
- Improper validation of password length ([#6280]). - Improper validation of password length ([#6280]).
- Wrong algorithm for filtering self addresses from the list of private upstream - Wrong algorithm for filtering self addresses from the list of private upstream
DNS servers ([#6231]). DNS servers ([#6231]).
@ -48,6 +49,7 @@ NOTE: Add new changes BELOW THIS COMMENT.
[#1700]: https://github.com/AdguardTeam/AdGuardHome/issues/1700 [#1700]: https://github.com/AdguardTeam/AdGuardHome/issues/1700
[#4569]: https://github.com/AdguardTeam/AdGuardHome/issues/4569 [#4569]: https://github.com/AdguardTeam/AdGuardHome/issues/4569
[#6156]: https://github.com/AdguardTeam/AdGuardHome/issues/6156
[#6226]: https://github.com/AdguardTeam/AdGuardHome/issues/6226 [#6226]: https://github.com/AdguardTeam/AdGuardHome/issues/6226
[#6231]: https://github.com/AdguardTeam/AdGuardHome/issues/6231 [#6231]: https://github.com/AdguardTeam/AdGuardHome/issues/6231
[#6233]: https://github.com/AdguardTeam/AdGuardHome/issues/6233 [#6233]: https://github.com/AdguardTeam/AdGuardHome/issues/6233

2
go.mod
View File

@ -3,7 +3,7 @@ module github.com/AdguardTeam/AdGuardHome
go 1.20 go 1.20
require ( require (
github.com/AdguardTeam/dnsproxy v0.56.0 github.com/AdguardTeam/dnsproxy v0.56.1
github.com/AdguardTeam/golibs v0.17.1 github.com/AdguardTeam/golibs v0.17.1
github.com/AdguardTeam/urlfilter v0.17.0 github.com/AdguardTeam/urlfilter v0.17.0
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.56.0 h1:kAg88woRTWTgqVEB2i2Uhze8Lv0JF1zTIAGhe0prjKM= github.com/AdguardTeam/dnsproxy v0.56.1 h1:QltfyWO7k4mxWERCEYDzkQnKzvZX/zkneWjbuJ0TU6o=
github.com/AdguardTeam/dnsproxy v0.56.0/go.mod h1:fqmehcE3cHFNqKbWQpIjGk7GqBy7ur1v5At499lFjRc= github.com/AdguardTeam/dnsproxy v0.56.1/go.mod h1:fqmehcE3cHFNqKbWQpIjGk7GqBy7ur1v5At499lFjRc=
github.com/AdguardTeam/golibs v0.17.1 h1:j3Ehhld5GI/amcHYG+CF0sJ4OOzAQ06BY3N/iBYJZ1M= github.com/AdguardTeam/golibs v0.17.1 h1:j3Ehhld5GI/amcHYG+CF0sJ4OOzAQ06BY3N/iBYJZ1M=
github.com/AdguardTeam/golibs v0.17.1/go.mod h1:DKhCIXHcUYtBhU8ibTLKh1paUL96n5zhQBlx763sj+U= github.com/AdguardTeam/golibs v0.17.1/go.mod h1:DKhCIXHcUYtBhU8ibTLKh1paUL96n5zhQBlx763sj+U=
github.com/AdguardTeam/urlfilter v0.17.0 h1:tUzhtR9wMx704GIP3cibsDQJrixlMHfwoQbYJfPdFow= github.com/AdguardTeam/urlfilter v0.17.0 h1:tUzhtR9wMx704GIP3cibsDQJrixlMHfwoQbYJfPdFow=