summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-01-08 09:43:01 +0000
committerMark Haines <mark.haines@matrix.org>2015-01-08 09:43:01 +0000
commitf3467d4646e05c0d5d057e0652ad12ce6d63bc77 (patch)
tree73e2f3622fb5c6e8613085f12bb867525394b0e4 /synapse
parentMerge branch 'release-v0.6.1' of github.com:matrix-org/synapse (diff)
parentBump version (diff)
downloadsynapse-f3467d4646e05c0d5d057e0652ad12ce6d63bc77.tar.xz
Merge branch 'hotfixes-v0.6.1' v0.6.1a
Diffstat (limited to 'synapse')
-rw-r--r--synapse/__init__.py2
-rw-r--r--synapse/http/client.py6
2 files changed, 4 insertions, 4 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py
index c3f1ac63be..2195ad3177 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -16,4 +16,4 @@
 """ This is a reference implementation of a synapse home server.
 """
 
-__version__ = "0.6.1"
+__version__ = "0.6.1a"
diff --git a/synapse/http/client.py b/synapse/http/client.py
index e5d4939e2d..7793bab106 100644
--- a/synapse/http/client.py
+++ b/synapse/http/client.py
@@ -53,7 +53,7 @@ class SimpleHttpClient(object):
             uri.encode("ascii"),
             headers=Headers({
                 b"Content-Type": [b"application/x-www-form-urlencoded"],
-                b"User-Agent": AGENT_NAME,
+                b"User-Agent": [AGENT_NAME],
             }),
             bodyProducer=FileBodyProducer(StringIO(query_bytes))
         )
@@ -89,7 +89,7 @@ class SimpleHttpClient(object):
             "GET",
             uri.encode("ascii"),
             headers=Headers({
-                b"User-Agent": AGENT_NAME,
+                b"User-Agent": [AGENT_NAME],
             })
         )
 
@@ -114,7 +114,7 @@ class CaptchaServerHttpClient(SimpleHttpClient):
             bodyProducer=FileBodyProducer(StringIO(query_bytes)),
             headers=Headers({
                 b"Content-Type": [b"application/x-www-form-urlencoded"],
-                b"User-Agent": AGENT_NAME,
+                b"User-Agent": [AGENT_NAME],
             })
         )