diff options
| author | Joel Rivera <rivera@joel.mx> | 2014-12-18 15:39:02 -0600 |
|---|---|---|
| committer | Joel Rivera <rivera@joel.mx> | 2014-12-18 15:39:02 -0600 |
| commit | 03eb4d54f021e4b8db6fa7b5266ad3907df17187 (patch) | |
| tree | 4819f96f5b8eb9df39f07fb1ab2d72e0b49c5397 | |
| parent | 7584c6c13ad2d33176478fba0bc37a01317f95e6 (diff) | |
| parent | 71b8fc82af9860ecbf8762a1e595c7acbfff38a7 (diff) | |
| download | cherrypy-03eb4d54f021e4b8db6fa7b5266ad3907df17187.tar.gz | |
Merged in cavallo71/cherrypy/fix.https.message (pull request #86)
fix the output message to show the correct scheme with ssl enabled server
| -rw-r--r-- | cherrypy/process/servers.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cherrypy/process/servers.py b/cherrypy/process/servers.py index fef37f77..6e4694ec 100644 --- a/cherrypy/process/servers.py +++ b/cherrypy/process/servers.py @@ -183,7 +183,8 @@ class ServerAdapter(object): if not self.httpserver: return '' host, port = self.bind_addr - if getattr(self.httpserver, 'ssl_certificate', None): + if getattr(self.httpserver, 'ssl_certificate', None) or \ + getattr(self.httpserver, 'ssl_adapter', None): scheme = "https" if port != 443: host += ":%s" % port |