diff options
| author | TheOnlyJoey <joeyferweda@gmail.com> | 2017-01-21 19:23:22 +0300 |
|---|---|---|
| committer | TheOnlyJoey <joeyferweda@gmail.com> | 2017-01-21 19:27:46 +0300 |
| commit | 8c7a77ab5c8f8e55fd12de72c7388676874e6488 (patch) | |
| tree | 0b701d9edca019241095368cf3a8ea4a6090fc3e /netrender | |
| parent | 4b77fe5bee806a33d3d6235ce8367742387ebc4d (diff) | |
Fix T50475: Fixed using netrender with SSL, did not pass all arguments for ssl.wrap_socket
Diffstat (limited to 'netrender')
| -rw-r--r-- | netrender/master.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/netrender/master.py b/netrender/master.py index 7d79a382..9b7b72a9 100644 --- a/netrender/master.py +++ b/netrender/master.py @@ -1159,6 +1159,8 @@ def runMaster(address, broadcast, clear, force, path, update_stats, test_break,u if use_ssl: import ssl httpd.socket = ssl.wrap_socket( + httpd.socket, + certfile=cert_path, server_side=True, keyfile=key_path, ciphers="ALL", |