OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:matrix-org/synapse into develop

pull/127/head
Erik Johnston 2015-04-17 16:08:28 +01:00
parent 1352ae2c07 231498ac45
commit 4a5990ff8f
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
register_new_matrix_user
View File

@ -49,6 +49,11 @@ def request_registration(user, password, server_location, shared_secret):
headers={'Content-Type': 'application/json'} headers={'Content-Type': 'application/json'}
) )
try: try:
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 = urllib2.urlopen(req)
f.read() f.read()
f.close() f.close()

2
synapse/__init__.py
View File

@ -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"