diff options
| author |  RaNaN <Mast3rRaNaN@hotmail.de>
| 2013-01-25 19:47:58 +0100 |
|---|---|---|
| committer | RaNaN <Mast3rRaNaN@hotmail.de>
| 2013-01-25 19:47:58 +0100 |
| commit | e3db134caa0a1a3b2d1773daa2902d669b6d068f (patch) | |
| tree | 2a500cee7ffb3dac1f99053beb406f947b89ef92 /module/web/ServerThread.py | |
| parent | fallback when no system locale can be retrieved (diff) | |
| download | pyload-e3db134caa0a1a3b2d1773daa2902d669b6d068f.tar.xz | |
fix ssl deactivation for server selector
Diffstat (limited to 'module/web/ServerThread.py')
| -rw-r--r-- | module/web/ServerThread.py | 3 |
1 files changed, 3 insertions, 0 deletions
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 |