diff options
| author | Erik Johnston <erik@matrix.org> | 2019-11-04 13:29:35 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-11-04 13:29:35 +0000 |
| commit | 6a0092d3715a168415619fd253c7fb4da5faf348 (patch) | |
| tree | 72f8553014ff152fecd10a40cd2ad7b46387f44d /synapse/server.py | |
| parent | Fix up comment (diff) | |
| parent | document the REPLICATE command a bit better (#6305) (diff) | |
| download | synapse-6a0092d3715a168415619fd253c7fb4da5faf348.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_purge_history
Diffstat (limited to 'synapse/server.py')
| -rw-r--r-- | synapse/server.py | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/synapse/server.py b/synapse/server.py index 0b81af646c..f8aeebcff8 100644 --- a/synapse/server.py +++ b/synapse/server.py @@ -23,6 +23,7 @@ # Imports required for the default HomeServer() implementation import abc import logging +import os from twisted.enterprise import adbapi from twisted.mail.smtp import sendmail @@ -168,6 +169,7 @@ class HomeServer(object): "filtering", "http_client_context_factory", "simple_http_client", + "proxied_http_client", "media_repository", "media_repository_resource", "federation_transport_client", @@ -311,6 +313,13 @@ class HomeServer(object): def build_simple_http_client(self): return SimpleHttpClient(self) + def build_proxied_http_client(self): + return SimpleHttpClient( + self, + http_proxy=os.getenv("http_proxy"), + https_proxy=os.getenv("HTTPS_PROXY"), + ) + def build_room_creation_handler(self): return RoomCreationHandler(self) |