diff options
| author | Dan Callahan <danc@element.io> | 2021-01-26 15:38:22 +0000 |
|---|---|---|
| committer | Dan Callahan <danc@element.io> | 2021-01-26 15:38:22 +0000 |
| commit | a06dd1d6b5a36a473ad58c186cac61ba929dc154 (patch) | |
| tree | 5a8d355e61b47803acbc8cfabf391b4059b29dcf /synapse/federation/federation_server.py | |
| parent | Fix state endpoint to be faster (diff) | |
| parent | Tweak changes. (diff) | |
| download | synapse-travis/fosdem/hotfixes.tar.xz | |
Merge tag 'v1.26.0rc2' into travis/fosdem/hotfixes github/travis/fosdem/hotfixes travis/fosdem/hotfixes
Diffstat (limited to 'synapse/federation/federation_server.py')
| -rw-r--r-- | synapse/federation/federation_server.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py index e5339aca23..171d25c945 100644 --- a/synapse/federation/federation_server.py +++ b/synapse/federation/federation_server.py @@ -49,7 +49,6 @@ from synapse.events import EventBase from synapse.federation.federation_base import FederationBase, event_from_pdu_json from synapse.federation.persistence import TransactionActions from synapse.federation.units import Edu, Transaction -from synapse.http.endpoint import parse_server_name from synapse.http.servlet import assert_params_in_dict from synapse.logging.context import ( make_deferred_yieldable, @@ -66,6 +65,7 @@ from synapse.types import JsonDict, get_domain_from_id from synapse.util import glob_to_regex, json_decoder, unwrapFirstError from synapse.util.async_helpers import Linearizer, concurrently_execute from synapse.util.caches.response_cache import ResponseCache +from synapse.util.stringutils import parse_server_name if TYPE_CHECKING: from synapse.server import HomeServer |