Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Hotfixes v0.8.1-r4 #124

Merged
merged 3 commits into from
Apr 17, 2015
Merged

Hotfixes v0.8.1-r4 #124

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
16dcded
As of version 2.7.9, urllib2 now checks SSL certs
erikjohnston Apr 17, 2015
ced39d0
Bump version
erikjohnston Apr 17, 2015
fd4fa90
The new parameter to urlopen is "context" not "ctx"
Apr 17, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion register_new_matrix_user
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, ctx=ssl.SSLContext(ssl.PROTOCOL_SSLv23))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The parameter is named "context" not "ctx".
Determined by testing on 2.7.9.
Otherwise the fix seems to work.

else:
f = urllib2.urlopen(req)
f.read()
f.close()
print "Success."
Expand Down
2 changes: 1 addition & 1 deletion synapse/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
""" This is a reference implementation of a Matrix home server.
"""

__version__ = "0.8.1-r3"
__version__ = "0.8.1-r4"