Merge pull request #1136 from shrkw/1135-fix-ssl-options-for-tornado

fix-ssl-options-for-tornado
This commit is contained in:
Benoit Chesneau 2015-11-16 15:37:09 +01:00
commit c8f820b95a

View File

@ -3,6 +3,7 @@
# This file is part of gunicorn released under the MIT license.
# See the NOTICE for more information.
import copy
import os
import sys
@ -102,8 +103,13 @@ class TornadoWorker(Worker):
server_class = _HTTPServer
if self.cfg.is_ssl:
_ssl_opt = copy.deepcopy(self.cfg.ssl_options)
# tornado refuses initialization if ssl_options contains following
# options
del _ssl_opt["do_handshake_on_connect"]
del _ssl_opt["suppress_ragged_eofs"]
server = server_class(app, io_loop=self.ioloop,
ssl_options=self.cfg.ssl_options)
ssl_options=_ssl_opt)
else:
server = server_class(app, io_loop=self.ioloop)