github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-10 15:32:38 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add back init scripts

Browse source 
Update cherrypy to 3.8.0
Remove unnecessary includes
Remove old references to Headphones
This commit is contained in:
Tim 2015-06-30 21:27:07 +02:00
parent 4936ad0476
commit 0a170c20e6
22 changed files with 531 additions and 2250 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/cherrypy/process/servers.py
View file

@ -124,7 +124,7 @@ class ServerAdapter(object):
If you need to start more than one HTTP server (to serve on multiple
ports, or protocols, etc.), you can manually register each one and then
start them all with bus.start:
start them all with bus.start::
s1 = ServerAdapter(bus, MyWSGIServer(host='0.0.0.0', port=80))
s2 = ServerAdapter(bus, another.HTTPServer(host='127.0.0.1', SSL=True))
@ -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