Merge branch 'disable-grpc-http-proxy'

2 files changed, 5 insertions, 0 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 83564bc28c..1912b28ebf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -71,6 +71,8 @@ Line wrap the file at 100 chars.                                              Th
 ### Fixed
 - Always kill `sslocal` if the tunnel monitor fails to start when using bridges.
 - Show relay location constraint correctly in the CLI when it is set to `any`.
+- Prevent gRPC from trying to run the app-daemon IPC communication through a HTTP proxy when the
+  environment variable `http_proxy` is set. This caused the app to fail to connect to the daemon.
 
 #### macOS
 - Disable built-in DNS resolver in Electron. Prevents Electron from establishing connections to
diff --git a/gui/src/main/daemon-rpc.ts b/gui/src/main/daemon-rpc.ts
index 32fc7adccf..c8cad6fa6a 100644
--- a/gui/src/main/daemon-rpc.ts
+++ b/gui/src/main/daemon-rpc.ts
@@ -584,6 +584,9 @@ export class DaemonRpc {
       'grpc.initial_reconnect_backoff_ms': 3000,
       'grpc.keepalive_time_ms': Math.pow(2, 30),
       'grpc.keepalive_timeout_ms': Math.pow(2, 30),
+      // Prevents grpc-js from parsing the `http_proxy` environment variable and trying to use it
+      // even for IPC sockets.
+      'grpc.enable_http_proxy': 0,
     };
     /* eslint-enable @typescript-eslint/naming-convention */
   }