From e3db134caa0a1a3b2d1773daa2902d669b6d068f Mon Sep 17 00:00:00 2001 From: RaNaN Date: Fri, 25 Jan 2013 19:47:58 +0100 Subject: fix ssl deactivation for server selector --- module/web/ServerThread.py | 3 +++ pyload.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/module/web/ServerThread.py b/module/web/ServerThread.py index 99137b591..b83864d86 100644 --- a/module/web/ServerThread.py +++ b/module/web/ServerThread.py @@ -116,6 +116,9 @@ class WebServer(threading.Thread): if self.https and not server.SSL: log.warning(_("This server offers no SSL, please consider using threaded instead")) + elif not self.https: + self.cert = self.key = None # This implicitly disables SSL + # there is no extra argument for the server adapter # Now instantiate the serverAdapter server = server(self.host, self.port, self.key, self.cert, 6, self.debug) # todo, num_connections diff --git a/pyload.py b/pyload.py index cc5295860..f54e0d17e 100755 --- a/pyload.py +++ b/pyload.py @@ -513,7 +513,7 @@ class Core(object): except: # something did go wrong, locale is heavily platform dependant pass - # default formatting when no ne was obtained + # default formatting when no one was obtained if not tfrm: tfrm = "%d.%m.%Y %H:%M:%S" -- cgit v1.2.3