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

Merge remote-tracking branch 'origin/master' into 2499-rewrites-3

Browse Source
This commit is contained in:
Dimitry Kolyshev
2022-12-27 10:09:33 +07:00
parent 8e058b8042 e7fc61a997
commit 5a794411d9
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@@ -42,14 +42,18 @@ See also the [v0.107.21 GitHub milestone][ms-v0.107.21].
### Fixed ### Fixed
- Failing HTTPS redirection on saving the encryption settings ([#4898]).
- Zeroing rules counter of erroneusly edited filtering rule lists ([#5290]).
- Filters updating strategy, which could sometimes lead to use of broken or - Filters updating strategy, which could sometimes lead to use of broken or
incompletely downloaded lists ([#5258]). incompletely downloaded lists ([#5258]).
- Errors popping up during updates of settings, which could sometimes cause the - Errors popping up during updates of settings, which could sometimes cause the
server to stop responding ([#5251]). server to stop responding ([#5251]).
[#4898]: https://github.com/AdguardTeam/AdGuardHome/issues/4898
[#5238]: https://github.com/AdguardTeam/AdGuardHome/issues/5238 [#5238]: https://github.com/AdguardTeam/AdGuardHome/issues/5238
[#5251]: https://github.com/AdguardTeam/AdGuardHome/issues/5251 [#5251]: https://github.com/AdguardTeam/AdGuardHome/issues/5251
[#5258]: https://github.com/AdguardTeam/AdGuardHome/issues/5258 [#5258]: https://github.com/AdguardTeam/AdGuardHome/issues/5258
[#5290]: https://github.com/AdguardTeam/AdGuardHome/issues/5290
[ms-v0.107.21]: https://github.com/AdguardTeam/AdGuardHome/milestone/57?closed=1 [ms-v0.107.21]: https://github.com/AdguardTeam/AdGuardHome/milestone/57?closed=1

4
client/src/actions/encryption.js
View File

@@ -41,6 +41,10 @@ export const setTlsConfig = (config) => async (dispatch, getState) => {
response.certificate_chain = atob(response.certificate_chain); response.certificate_chain = atob(response.certificate_chain);
response.private_key = atob(response.private_key); response.private_key = atob(response.private_key);
if (values.enabled && values.force_https && window.location.protocol === 'http:') {
window.location.reload();
return;
}
redirectToCurrentProtocol(response, httpPort); redirectToCurrentProtocol(response, httpPort);
const dnsStatus = await apiClient.getGlobalStatus(); const dnsStatus = await apiClient.getGlobalStatus();

5
internal/filtering/filter.go
View File

@@ -99,14 +99,15 @@ func (d *DNSFilter) filterSetProperties(
filt.URL, filt.URL,
) )
defer func(oldURL, oldName string, oldEnabled bool, oldUpdated time.Time) { defer func(oldURL, oldName string, oldEnabled bool, oldUpdated time.Time, oldRulesCount int) {
if err != nil { if err != nil {
filt.URL = oldURL filt.URL = oldURL
filt.Name = oldName filt.Name = oldName
filt.Enabled = oldEnabled filt.Enabled = oldEnabled
filt.LastUpdated = oldUpdated filt.LastUpdated = oldUpdated
filt.RulesCount = oldRulesCount
} }
}(filt.URL, filt.Name, filt.Enabled, filt.LastUpdated) }(filt.URL, filt.Name, filt.Enabled, filt.LastUpdated, filt.RulesCount)
filt.Name = newList.Name filt.Name = newList.Name