summaryrefslogtreecommitdiffstats
path: root/pyload/remote/WebSocketBackend.py
diff options
context:
space:
mode:
authorGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2013-12-15 14:36:38 +0100
committerGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2013-12-15 14:36:38 +0100
commit367172406d1382f2fdd39936bde31ebcbcd1c56f (patch)
tree6abd7b2adffdd7fbb4eb35a9171c25b0e8eee4a0 /pyload/remote/WebSocketBackend.py
parentmore options to get webUI through proxy working (diff)
downloadpyload-367172406d1382f2fdd39936bde31ebcbcd1c56f.tar.xz
updated pywebsocket
Diffstat (limited to 'pyload/remote/WebSocketBackend.py')
-rw-r--r--pyload/remote/WebSocketBackend.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/pyload/remote/WebSocketBackend.py b/pyload/remote/WebSocketBackend.py
index 7238af679..55edee50e 100644
--- a/pyload/remote/WebSocketBackend.py
+++ b/pyload/remote/WebSocketBackend.py
@@ -48,10 +48,11 @@ class WebSocketBackend(BackendBase):
# tls is needed when requested or webUI is also on tls
if self.core.api.isWSSecure():
from wsbackend.Server import import_ssl
- if import_ssl():
+ tls_module = import_ssl()
+ if tls_module:
options.use_tls = True
+ options.tls_module = tls_module
options.certificate = self.core.config['ssl']['cert']
- options.ca_certificate = options.certificate
options.private_key = self.core.config['ssl']['key']
self.core.log.info(_('Using secure WebSocket'))
else: