diff options
| author | Erik Johnston <erik@matrix.org> | 2015-04-17 16:08:28 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-04-17 16:08:28 +0100 |
| commit | 4a5990ff8fba3c00851bb601a2482152fc4bb57f (patch) | |
| tree | ca5b548faf1a3044c82f344d5601ea05fe718a07 | |
| parent | Add kick users script (diff) | |
| parent | Merge pull request #124 from matrix-org/hotfixes-v0.8.1-r4 (diff) | |
| download | synapse-4a5990ff8fba3c00851bb601a2482152fc4bb57f.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into develop
| -rwxr-xr-x | register_new_matrix_user | 7 | ||||
| -rw-r--r-- | synapse/__init__.py | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/register_new_matrix_user b/register_new_matrix_user index daddadc302..4a520bdb5d 100755 --- a/register_new_matrix_user +++ b/register_new_matrix_user @@ -49,7 +49,12 @@ def request_registration(user, password, server_location, shared_secret): headers={'Content-Type': 'application/json'} ) 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.close() print "Success." diff --git a/synapse/__init__.py b/synapse/__init__.py index fd87c7e2d0..56c10a84e9 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -16,4 +16,4 @@ """ This is a reference implementation of a Matrix home server. """ -__version__ = "0.8.1-r3" +__version__ = "0.8.1-r4" |