42 lines
1.3 KiB
Diff
42 lines
1.3 KiB
Diff
From a3ba0eb30e7becdfe0eb83dc2babaa40847cd7d0 Mon Sep 17 00:00:00 2001
|
|
From: Marcel Hellkamp <marc@gsites.de>
|
|
Date: Sat, 25 Mar 2017 17:59:26 +0100
|
|
Subject: [PATCH] Added 'cheroot' server adapter to list of server names, so it
|
|
can be selected from the command line and by name.
|
|
|
|
Alos added cheroot after cherrypy in the 'auto' adapter to make it future proof.
|
|
|
|
(backported from commit 617d08a2ccca95b2e8668fef7057127049595fd9)
|
|
[juergh: Adjust context.]
|
|
Signed-off-by: Juerg Haefliger <juergh@protonmail.com>
|
|
---
|
|
bottle.py | 5 ++++-
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/bottle.py b/bottle.py
|
|
index 73886a2..11121b8 100644
|
|
--- a/bottle.py
|
|
+++ b/bottle.py
|
|
@@ -3002,7 +3002,9 @@ class BjoernServer(ServerAdapter):
|
|
|
|
class AutoServer(ServerAdapter):
|
|
""" Untested. """
|
|
- adapters = [WaitressServer, PasteServer, TwistedServer, CherryPyServer, WSGIRefServer]
|
|
+ adapters = [WaitressServer, PasteServer, TwistedServer, CherryPyServer,
|
|
+ CherootServer, WSGIRefServer]
|
|
+
|
|
def run(self, handler):
|
|
for sa in self.adapters:
|
|
try:
|
|
@@ -3016,6 +3018,7 @@ server_names = {
|
|
'wsgiref': WSGIRefServer,
|
|
'waitress': WaitressServer,
|
|
'cherrypy': CherryPyServer,
|
|
+ 'cheroot': CherootServer,
|
|
'paste': PasteServer,
|
|
'fapws3': FapwsServer,
|
|
'tornado': TornadoServer,
|
|
--
|
|
2.39.0.windows.2
|
|
|