forked from MirrorHub/synapse
Merge branch 'develop' of github.com:matrix-org/synapse into postgres
This commit is contained in:
commit
2492efb162
2 changed files with 7 additions and 2 deletions
|
@ -49,7 +49,12 @@ def request_registration(user, password, server_location, shared_secret):
|
||||||
headers={'Content-Type': 'application/json'}
|
headers={'Content-Type': 'application/json'}
|
||||||
)
|
)
|
||||||
try:
|
try:
|
||||||
f = urllib2.urlopen(req)
|
if sys.version_info[:3] >= (2, 7, 9):
|
||||||
|
# As of version 2.7.9, urllib2 now checks SSL certs
|
||||||
|
import ssl
|
||||||
|
f = urllib2.urlopen(req, context=ssl.SSLContext(ssl.PROTOCOL_SSLv23))
|
||||||
|
else:
|
||||||
|
f = urllib2.urlopen(req)
|
||||||
f.read()
|
f.read()
|
||||||
f.close()
|
f.close()
|
||||||
print "Success."
|
print "Success."
|
||||||
|
|
|
@ -16,4 +16,4 @@
|
||||||
""" This is a reference implementation of a Matrix home server.
|
""" This is a reference implementation of a Matrix home server.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
__version__ = "0.8.1-r3"
|
__version__ = "0.8.1-r4"
|
||||||
|
|
Loading…
Reference in a new issue