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

Pull request 2184: 6851 upstream mode reset 

Updates #6851.

Squashed commit of the following:

commit ffc50daff8e9a2b0fd48f10c5e66cdc0ab350488
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Mon Mar 25 17:55:39 2024 +0300

    all: fix changelog

commit cdc2193875e72f6504cf283c84e1e6c6768d4f6e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Mon Mar 25 17:28:06 2024 +0300

    dnsforward: fix upstream mode set
This commit is contained in:
Eugene Burkov 2024-03-29 10:45:20 +03:00
parent 2611534de0
commit 9305c45813
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -35,7 +35,12 @@ NOTE: Add new changes BELOW THIS COMMENT.
will cause errors on startup in a future version. will cause errors on startup in a future version.
- Node.JS 16. Future versions will require at least Node.JS 18 to build. - Node.JS 16. Future versions will require at least Node.JS 18 to build.
### Fixed
- Resetting DNS upstream mode when applying unrelated settings ([#6851]).
[#5829]: https://github.com/AdguardTeam/AdGuardHome/issues/5829 [#5829]: https://github.com/AdguardTeam/AdGuardHome/issues/5829
[#6851]: https://github.com/AdguardTeam/AdGuardHome/issues/6851
<!-- <!--
NOTE: Add new changes ABOVE THIS COMMENT. NOTE: Add new changes ABOVE THIS COMMENT.

2
internal/dnsforward/http.go
View File

@ -474,8 +474,6 @@ func (s *Server) setConfig(dc *jsonDNSConfig) (shouldRestart bool) {
if dc.UpstreamMode != nil { if dc.UpstreamMode != nil {
s.conf.UpstreamMode = mustParseUpstreamMode(*dc.UpstreamMode) s.conf.UpstreamMode = mustParseUpstreamMode(*dc.UpstreamMode)
} else {
s.conf.UpstreamMode = UpstreamModeLoadBalance
} }
if dc.EDNSCSUseCustom != nil && *dc.EDNSCSUseCustom { if dc.EDNSCSUseCustom != nil && *dc.EDNSCSUseCustom {

4
internal/dnsforward/http_test.go
View File

@ -29,6 +29,10 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )
// TODO(e.burkov): Use the better approach to testdata with a separate
// directory for each test, and a separate file for each subtest. See the
// [configmigrate] package.
// emptySysResolvers is an empty [SystemResolvers] implementation that always // emptySysResolvers is an empty [SystemResolvers] implementation that always
// returns nil. // returns nil.
type emptySysResolvers struct{} type emptySysResolvers struct{}