From 232b324c38b3914509550aa895b791a33874c915 Mon Sep 17 00:00:00 2001
From: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
Date: Mon, 22 Mar 2021 17:48:42 +0000
Subject: Port "Add support for no_proxy and case insensitive env variables"
 from mainline to dinsic (#93)

This PR is simply porting https://github.com/matrix-org/synapse/pull/9372 to dinsic.

I also had to bring in https://github.com/matrix-org/synapse/pull/8821 and https://github.com/matrix-org/synapse/pull/9084 for this code to work properly - a sign that we should merge mainline into dinsic again soon.
---
 synapse/app/generic_worker.py | 1 -
 1 file changed, 1 deletion(-)

(limited to 'synapse/app/generic_worker.py')

diff --git a/synapse/app/generic_worker.py b/synapse/app/generic_worker.py
index e3595a19d1..82ec325a13 100644
--- a/synapse/app/generic_worker.py
+++ b/synapse/app/generic_worker.py
@@ -266,7 +266,6 @@ class GenericWorkerPresence(BasePresenceHandler):
         super().__init__(hs)
         self.hs = hs
         self.is_mine_id = hs.is_mine_id
-        self.http_client = hs.get_simple_http_client()
 
         self._presence_enabled = hs.config.use_presence
 
-- 
cgit 1.5.1