Turn off HTTP keep alive for all RPC requests

2 files changed, 6 insertions, 1 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index efeff0df33..2962415bba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -42,6 +42,8 @@ Line wrap the file at 100 chars.                                              Th
 - Cancel pending system notifications when the app becomes visible.
 - Transition to connected state after all routes are configured. Avoids problems with reaching the
   internet directly after the app says it's connected.
+- Disable keep alive on API RPC requests. Should stop reuse of invalid sockets after tunnel state
+  changes.
 
 #### Windows
 - Use proper app id in the registry. This avoids false-positives with certain anti-virus software.
diff --git a/mullvad-rpc/src/https_client_with_sni.rs b/mullvad-rpc/src/https_client_with_sni.rs
index 8ec091ac47..62dc66df28 100644
--- a/mullvad-rpc/src/https_client_with_sni.rs
+++ b/mullvad-rpc/src/https_client_with_sni.rs
@@ -39,7 +39,10 @@ impl ClientCreator for HttpsClientWithSni {
     fn create(&self, handle: &Handle) -> Result<Client<Self::Connect, Body>, Self::Error> {
         let mut connector = HttpsConnectorWithSni::new(&self.ca_path, handle)?;
         connector.set_sni_hostname(Some(self.sni_hostname.clone()));
-        let client = Client::configure().connector(connector).build(handle);
+        let client = Client::configure()
+            .keep_alive(false)
+            .connector(connector)
+            .build(handle);
         Ok(client)
     }
 }