diff options
author | Adrian Tschira <nota@notafile.com> | 2018-04-28 23:56:59 +0200 |
---|---|---|
committer | Adrian Tschira <nota@notafile.com> | 2018-04-29 00:13:57 +0200 |
commit | e9143b659352e87fd9e26c8e5a771c78011bc945 (patch) | |
tree | 18d53d291157b9e9eb69b8bdb405ccfaf51e1135 /synapse/http | |
parent | Merge pull request #3127 from matrix-org/rav/deferred_timeout (diff) | |
download | synapse-e9143b659352e87fd9e26c8e5a771c78011bc945.tar.xz |
more bytes strings
Signed-off-by: Adrian Tschira <nota@notafile.com>
Diffstat (limited to 'synapse/http')
-rw-r--r-- | synapse/http/endpoint.py | 2 | ||||
-rw-r--r-- | synapse/http/server.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/http/endpoint.py b/synapse/http/endpoint.py index 00572c2897..db455e5909 100644 --- a/synapse/http/endpoint.py +++ b/synapse/http/endpoint.py @@ -286,7 +286,7 @@ def resolve_service(service_name, dns_client=client, cache=SERVER_CACHE, clock=t if (len(answers) == 1 and answers[0].type == dns.SRV and answers[0].payload - and answers[0].payload.target == dns.Name('.')): + and answers[0].payload.target == dns.Name(b'.')): raise ConnectError("Service %s unavailable" % service_name) for answer in answers: diff --git a/synapse/http/server.py b/synapse/http/server.py index 8d632290de..55b9ad5251 100644 --- a/synapse/http/server.py +++ b/synapse/http/server.py @@ -546,6 +546,6 @@ def _request_user_agent_is_curl(request): b"User-Agent", default=[] ) for user_agent in user_agents: - if "curl" in user_agent: + if b"curl" in user_agent: return True return False |