Update CherryPy to 5.1.0

2016-04-23 16:24:41 -07:00
parent f9825410dc
commit b2304992e5
25 changed files with 2383 additions and 130 deletions
--- a/lib/cherrypy/process/servers.py
+++ b/lib/cherrypy/process/servers.py
@@ -183,8 +183,7 @@ class ServerAdapter(object):
        if not self.httpserver:
            return ''
        host, port = self.bind_addr
-        if getattr(self.httpserver, 'ssl_certificate', None) or \
-                getattr(self.httpserver, 'ssl_adapter', None):
+        if getattr(self.httpserver, 'ssl_adapter', None):
            scheme = "https"
            if port != 443:
                host += ":%s" % port