Deluge
diff options
| author | Calum Lind <calumlind+deluge@gmail.com> | 2017-06-15 11:22:10 +0100 |
|---|---|---|
| committer | Calum Lind <calumlind+deluge@gmail.com> | 2017-06-15 13:47:10 +0100 |
| commit | 06dfeed7505dc84daa90cd8dbaf468bf6d50ea9e (patch) | |
| tree | 4cc926a96dc470809a093bc941248d9418f9dbaa /deluge/ui/web/server.py | |
| parent | 60c764ac338a83f5fe835e880bf2bac25b33d4da (diff) | |
| download | deluge-06dfeed7505dc84daa90cd8dbaf468bf6d50ea9e.tar.gz deluge-06dfeed7505dc84daa90cd8dbaf468bf6d50ea9e.tar.bz2 deluge-06dfeed7505dc84daa90cd8dbaf468bf6d50ea9e.zip | |
[#3064|WebUI] Fix server not sending TLS intermediate certs
* Sending of cert chain was unintentionallly removed in commit c1902e43 (#2792).
Diffstat (limited to 'deluge/ui/web/server.py')
| -rw-r--r-- | deluge/ui/web/server.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/deluge/ui/web/server.py b/deluge/ui/web/server.py index 2897ae323..92e63dedd 100644 --- a/deluge/ui/web/server.py +++ b/deluge/ui/web/server.py @@ -661,7 +661,9 @@ class DelugeWeb(component.Component): with open(configmanager.get_config_dir(self.pkey)) as pkey: private_key = KeyPair.load(pkey.read(), FILETYPE_PEM).original options = CertificateOptions(privateKey=private_key, certificate=certificate, method=SSL.SSLv23_METHOD) - options.getContext().set_options(SSL.OP_NO_SSLv2 | SSL.OP_NO_SSLv3) + ctx = options.getContext() + ctx.set_options(SSL.OP_NO_SSLv2 | SSL.OP_NO_SSLv3) + ctx.use_certificate_chain_file(configmanager.get_config_dir(self.cert)) self.socket = reactor.listenSSL(self.port, self.site, options, interface=self.interface) ip = self.socket.getHost().host |