From 9fda7bfd34f245ba7e0a50dea96b8a8db78fdaa5 Mon Sep 17 00:00:00 2001
From: Eugene Burkov <e.burkov@adguard.com>
Date: Fri, 9 Jun 2023 19:22:10 +0300
Subject: [PATCH] Pull request 1871: upd-proxy
Merge in DNS/adguard-home from upd-proxy to master
Updates #5872.
Squashed commit of the following:
commit fac8d1cdeb53cb5cfe867c7a3521bb5ca76331ef
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jun 9 19:18:35 2023 +0300
all: fix chlog
commit 10f64ba5683422ecc3cb5d0bd6c679ed4e80e0cc
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jun 9 19:14:07 2023 +0300
all: log changes
commit 14410c4997c674a4f8a4adf8b77c1cf692131d24
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jun 9 18:48:09 2023 +0300
all: upd proxy
---
CHANGELOG.md | 5 +++++
go.mod | 2 +-
go.sum | 4 ++--
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5c8ec671..23164517 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,11 @@ NOTE: Add new changes BELOW THIS COMMENT.
- The ability to edit rewrite rules via `PUT /control/rewrite/update` HTTP API
([#1577]).
+### Fixed
+
+ - DNSCrypt upstream not resetting the client and resolver information on
+ dialing errors ([#5872]).
+
[#1577]: https://github.com/AdguardTeam/AdGuardHome/issues/1577
<!--
diff --git a/go.mod b/go.mod
index 16ffb21a..2a3c0947 100644
--- a/go.mod
+++ b/go.mod
@@ -3,7 +3,7 @@ module github.com/AdguardTeam/AdGuardHome
go 1.19
require (
- github.com/AdguardTeam/dnsproxy v0.50.1
+ github.com/AdguardTeam/dnsproxy v0.50.2
github.com/AdguardTeam/golibs v0.13.2
github.com/AdguardTeam/urlfilter v0.16.1
github.com/NYTimes/gziphandler v1.1.1
diff --git a/go.sum b/go.sum
index 9e235946..ce08ec3e 100644
--- a/go.sum
+++ b/go.sum
@@ -1,5 +1,5 @@
-github.com/AdguardTeam/dnsproxy v0.50.1 h1:A0HmAxb2izkOcuD50pRmR7ZnBL3/qF2DR2SlI6fN+6E=
-github.com/AdguardTeam/dnsproxy v0.50.1/go.mod h1:CQhZTkqC8X0ID6glrtyaxgqRRdiYfn1gJulC1cZ5Dn8=
+github.com/AdguardTeam/dnsproxy v0.50.2 h1:p1471SsMZ6SMo7T51Olw4aNluahvMwSLMorwxYV18ts=
+github.com/AdguardTeam/dnsproxy v0.50.2/go.mod h1:CQhZTkqC8X0ID6glrtyaxgqRRdiYfn1gJulC1cZ5Dn8=
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.13.2 h1:BPASsyQKmb+b8VnvsNOHp7bKfcZl9Z+Z2UhPjOiupSc=