diff options
| author | Odd Stranne <odd@mullvad.net> | 2019-04-11 12:34:19 +0200 |
|---|---|---|
| committer | Odd Stranne <odd@mullvad.net> | 2019-04-11 12:34:19 +0200 |
| commit | b3e509b94b574a42910bb4df5c834c77d43e2a57 (patch) | |
| tree | a52a9e203b06bbc7b1f20cdba4409b2fb2002d13 | |
| parent | 8b2d13d07a974dad22b35954426f47b93be9253e (diff) | |
| parent | 4d73dec2a5e33a26d1d0f42b2dbd9561eeac85dd (diff) | |
| download | mullvadvpn-b3e509b94b574a42910bb4df5c834c77d43e2a57.tar.xz mullvadvpn-b3e509b94b574a42910bb4df5c834c77d43e2a57.zip | |
Merge branch 'increase-set-dns-timeout'
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | windows/windns/src/windns/netsh.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 2408c1a968..069e956e9a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -33,6 +33,7 @@ Line wrap the file at 100 chars. Th ### Changed #### Windows - Make the firewall rules permanent until reboot, or until the daemon removes them. +- Increase timeout when updating DNS settings. ## [2019.3] - 2019-04-02 ### Fixed diff --git a/windows/windns/src/windns/netsh.cpp b/windows/windns/src/windns/netsh.cpp index b1b9dbc677..1b703bcd66 100644 --- a/windows/windns/src/windns/netsh.cpp +++ b/windows/windns/src/windns/netsh.cpp @@ -260,7 +260,7 @@ NetSh::NetSh(ILogSink *logSink) void NetSh::ValidateShellOut(common::ApplicationRunner &netsh, uint32_t timeout) { - const uint32_t actualTimeout = (0 == timeout ? 3000 : timeout); + const uint32_t actualTimeout = (0 == timeout ? 10000 : timeout); const auto startTime = GetTickCount64(); |