daxi20/AdGuardHome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pull request: 3185 fix recursion vol.2

Browse Source 
Merge in DNS/adguard-home from fix-recursion to master

Closes #3185.

Squashed commit of the following:

commit c78650b762163f39b2eb4b10f76f1845913134b2
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Mon May 31 13:12:46 2021 +0300

    all: fix changelog

commit e43017a4b6d245f14e1a3bdf735a9c9f03501156
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Sun May 30 22:39:05 2021 +0300

    dnsforward: reduce recursion ttl

commit 79208a82bdad8280c439669413aef8dc7df0a85c
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Sun May 30 22:29:27 2021 +0300

    dnsforward: only check recursion for private rdns

commit 1b8075b086f33e58e273dfcf4168a6ba0473ebae
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Sun May 30 22:18:11 2021 +0300

    dnsforward: rm recursion detecting from upstream
This commit is contained in:
Eugene Burkov
2021-05-31 13:25:40 +03:00
parent f3687104dd
commit 78d47d8884
4 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
internal/dnsforward/dns.go
View File

@@ -532,7 +532,6 @@ func (s *Server) processUpstream(ctx *dnsContext) (rc resultCode) {
}
// request was not filtered so let it be processed further
s.recDetector.add(*req)
if ctx.err = s.dnsProxy.Resolve(d); ctx.err != nil {
return resultCodeError
}