diff options
| author | David Baker <dave@matrix.org> | 2016-05-10 18:27:06 +0200 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2016-05-10 18:27:06 +0200 |
| commit | d46b18a00f0811489299b4835482af2a71dcaf55 (patch) | |
| tree | d57b2bc9017184d046cbb29a26a081c3a877c4ba | |
| parent | unbreak schema (diff) | |
| download | synapse-d46b18a00f0811489299b4835482af2a71dcaf55.tar.xz | |
Pass through _get_event_txn
| -rw-r--r-- | synapse/crypto/context_factory.py | 2 | ||||
| -rw-r--r-- | synapse/replication/slave/storage/events.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/synapse/crypto/context_factory.py b/synapse/crypto/context_factory.py index aad4752fe7..4fb32d2108 100644 --- a/synapse/crypto/context_factory.py +++ b/synapse/crypto/context_factory.py @@ -43,7 +43,7 @@ class ServerContextFactory(ssl.ContextFactory): context.use_privatekey(config.tls_private_key) context.load_tmp_dh(config.tls_dh_params_path) - context.set_cipher_list("!ADH:HIGH+kEDH:!AECDH:HIGH+kEECDH") + context.set_cipher_list("!ADH:HIGH+kEDH:!AECDH:HIGH+kEECDH:HIGH") def getContext(self): return self._context diff --git a/synapse/replication/slave/storage/events.py b/synapse/replication/slave/storage/events.py index 86f00b6ff5..56e8b9d906 100644 --- a/synapse/replication/slave/storage/events.py +++ b/synapse/replication/slave/storage/events.py @@ -104,6 +104,7 @@ class SlavedEventStore(BaseSlavedStore): _invalidate_get_event_cache = DataStore._invalidate_get_event_cache.__func__ _parse_events_txn = DataStore._parse_events_txn.__func__ _get_events_txn = DataStore._get_events_txn.__func__ + _get_event_txn = DataStore._get_event_txn.__func__ _enqueue_events = DataStore._enqueue_events.__func__ _do_fetch = DataStore._do_fetch.__func__ _fetch_events_txn = DataStore._fetch_events_txn.__func__ |