[Bf-extensions-cvs] [8c7a77a] master: Fix T50475: Fixed using netrender with SSL, did not pass all arguments for ssl.wrap_socket
TheOnlyJoey
noreply at git.blender.org
Sat Jan 21 19:02:13 CET 2017
Commit: 8c7a77ab5c8f8e55fd12de72c7388676874e6488
Author: TheOnlyJoey
Date: Sat Jan 21 17:23:22 2017 +0100
Branches: master
https://developer.blender.org/rBA8c7a77ab5c8f8e55fd12de72c7388676874e6488
Fix T50475: Fixed using netrender with SSL, did not pass all arguments for ssl.wrap_socket
===================================================================
M netrender/master.py
===================================================================
diff --git a/netrender/master.py b/netrender/master.py
index 7d79a38..9b7b72a 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",
More information about the Bf-extensions-cvs
mailing list