mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-12-21 12:14:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

Shuffle config

Browse source
This commit is contained in:
Andrew Morgan 2019-04-02 13:45:58 +01:00
parent f38da61ae7
commit 3f1fe92a3b
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
synapse/http/federation/matrix_federation_agent.py
View file

@ -79,11 +79,10 @@ class MatrixFederationAgent(object):
def __init__( def __init__(
self, reactor, tls_client_options_factory, self, reactor, tls_client_options_factory,
config, _well_known_tls_policy=None, _well_known_tls_policy=None,
_srv_resolver=None, _srv_resolver=None,
_well_known_cache=well_known_cache, _well_known_cache=well_known_cache,
): ):
self.config = config
self._reactor = reactor self._reactor = reactor
self._clock = Clock(reactor) self._clock = Clock(reactor)
@ -150,7 +149,7 @@ class MatrixFederationAgent(object):
tls_options = None tls_options = None
else: else:
tls_options = self._tls_client_options_factory.get_options( tls_options = self._tls_client_options_factory.get_options(
res.tls_server_name.decode("ascii"), self.config, res.tls_server_name.decode("ascii"),
) )
# make sure that the Host header is set correctly # make sure that the Host header is set correctly

1
tests/http/federation/test_matrix_federation_agent.py
View file

@ -59,7 +59,6 @@ class MatrixFederationAgentTests(TestCase):
self.agent = MatrixFederationAgent( self.agent = MatrixFederationAgent(
reactor=self.reactor, reactor=self.reactor,
tls_client_options_factory=ClientTLSOptionsFactory(config), tls_client_options_factory=ClientTLSOptionsFactory(config),
config=config,
_well_known_tls_policy=TrustingTLSPolicyForHTTPS(), _well_known_tls_policy=TrustingTLSPolicyForHTTPS(),
_srv_resolver=self.mock_resolver, _srv_resolver=self.mock_resolver,
_well_known_cache=self.well_known_cache, _well_known_cache=self.well_known_cache,