summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Davis <ian.w.davis@gmail.com>2010-09-26 01:04:42 +0200
committerMarcel Hellkamp <marc@gsites.de>2010-09-26 01:04:42 +0200
commitbb3f10c09bb0e49e71943ea2602e6418ce9bebd4 (patch)
tree7428351d9b293a0f5fae56988abc71861ab2a571
parent3aace735442f01981836f5d25dffe325a2d90baf (diff)
downloadbottle-bb3f10c09bb0e49e71943ea2602e6418ce9bebd4.tar.gz
Prior to this patch, one can't use a socket with FlupFCGIServer
(because bindAddress is hard-coded as the host & port) and any other options that are passed in are ignored. This fixes both issues.
-rwxr-xr-xbottle.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/bottle.py b/bottle.py
index 6efe05f..c387a24 100755
--- a/bottle.py
+++ b/bottle.py
@@ -1374,7 +1374,9 @@ class CGIServer(ServerAdapter):
class FlupFCGIServer(ServerAdapter):
def run(self, handler): # pragma: no cover
import flup.server.fcgi
- flup.server.fcgi.WSGIServer(handler, bindAddress=(self.host, self.port)).run()
+ kwargs = {'bindAddress':(self.host, self.port)}
+ kwargs.update(self.options) # allow to override bindAddress and others
+ flup.server.fcgi.WSGIServer(handler, **kwargs).run()
class WSGIRefServer(ServerAdapter):