summaryrefslogtreecommitdiffstats
path: root/pyload/remote/wsbackend/Server.py
diff options
context:
space:
mode:
authorGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2013-12-15 14:00:42 +0100
committerGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2013-12-15 14:00:42 +0100
commit8fbde7a43b4f838df0379fdb4acd791713b639b7 (patch)
treebb7e78afc6a34823e078ab64c6965321c6866e85 /pyload/remote/wsbackend/Server.py
parentadded new file states (diff)
downloadpyload-8fbde7a43b4f838df0379fdb4acd791713b639b7.tar.xz
more options to get webUI through proxy working
Diffstat (limited to 'pyload/remote/wsbackend/Server.py')
-rw-r--r--pyload/remote/wsbackend/Server.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/pyload/remote/wsbackend/Server.py b/pyload/remote/wsbackend/Server.py
index 02da44f04..9a6649ca9 100644
--- a/pyload/remote/wsbackend/Server.py
+++ b/pyload/remote/wsbackend/Server.py
@@ -67,6 +67,7 @@ _MAX_MEMORIZED_LINES = 1024
def import_ssl():
global _HAS_SSL, _HAS_OPEN_SSL
+ global ssl, OpenSSL
try:
import ssl
_HAS_SSL = True
@@ -77,6 +78,8 @@ def import_ssl():
except ImportError:
pass
+ return _HAS_OPEN_SSL or _HAS_SSL
+
class _StandaloneConnection(object):
"""Mimic mod_python mp_conn."""
@@ -648,6 +651,8 @@ class DefaultOptions:
private_key = ''
certificate = ''
ca_certificate = ''
+ tls_client_ca = ''
+ tls_client_auth = False
dispatcher = None
request_queue_size = _DEFAULT_REQUEST_QUEUE_SIZE
use_basic_auth = False