mirror of
https://github.com/element-hq/synapse.git
synced 2024-11-22 17:46:08 +03:00
Merge branch 'master' into develop
This commit is contained in:
commit
8ac9199f56
3 changed files with 5 additions and 5 deletions
2
VERSION
2
VERSION
|
@ -1 +1 @@
|
|||
0.6.1
|
||||
0.6.1a
|
||||
|
|
|
@ -16,4 +16,4 @@
|
|||
""" This is a reference implementation of a Matrix home server.
|
||||
"""
|
||||
|
||||
__version__ = "0.6.1"
|
||||
__version__ = "0.6.1a"
|
||||
|
|
|
@ -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],
|
||||
})
|
||||
)
|
||||
|
||||
|
|
Loading…
Reference in a new issue