mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-09-11 10:45:42 +03:00
Pull request: 4898 reload page on tls settings save
Merge in DNS/adguard-home from 4898-reload-page to master Closes #4898. Squashed commit of the following: commit c2d78804d96d00b5ff10e23c0f275a6c73455b93 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Dec 26 18:03:31 2022 +0400 all: fix changelog commit e55db6a620e4aa74eb3562a4eb35bbd3d13c8712 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Dec 26 18:02:37 2022 +0400 all: log changes commit 3985dc4a42d1dc717def3011d7dfd24dd49da0da Author: Ildar Kamalov <ik@adguard.com> Date: Mon Dec 26 15:20:38 2022 +0300 client: reload page on tls settings save
This commit is contained in:
parent
97af23b0af
commit
e7fc61a997
@ -42,12 +42,14 @@ See also the [v0.107.21 GitHub milestone][ms-v0.107.21].
|
||||
|
||||
### 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
|
||||
incompletely downloaded lists ([#5258]).
|
||||
- Errors popping up during updates of settings, which could sometimes cause the
|
||||
server to stop responding ([#5251]).
|
||||
|
||||
[#4898]: https://github.com/AdguardTeam/AdGuardHome/issues/4898
|
||||
[#5238]: https://github.com/AdguardTeam/AdGuardHome/issues/5238
|
||||
[#5251]: https://github.com/AdguardTeam/AdGuardHome/issues/5251
|
||||
[#5258]: https://github.com/AdguardTeam/AdGuardHome/issues/5258
|
||||
|
@ -41,6 +41,10 @@ export const setTlsConfig = (config) => async (dispatch, getState) => {
|
||||
response.certificate_chain = atob(response.certificate_chain);
|
||||
response.private_key = atob(response.private_key);
|
||||
|
||||
if (values.enabled && values.force_https && window.location.protocol === 'http:') {
|
||||
window.location.reload();
|
||||
return;
|
||||
}
|
||||
redirectToCurrentProtocol(response, httpPort);
|
||||
|
||||
const dnsStatus = await apiClient.getGlobalStatus();
|
||||
|
Loading…
Reference in New Issue
Block a user