From 9f0e48e4d120506b0b37aa021d85473994517f53 Mon Sep 17 00:00:00 2001
From: Marcel Hellkamp <marc@gsites.de>
Date: Thu, 16 Jun 2011 14:51:17 +0200
Subject: Fix for cherrypy hanging on shutdown. This should fix #14 and #171.
 Thanks to Joshua Roesslein and "zombat"

---
 bottle.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/bottle.py b/bottle.py
index 04fee46..0b0769d 100755
--- a/bottle.py
+++ b/bottle.py
@@ -1710,8 +1710,10 @@ class CherryPyServer(ServerAdapter):
     def run(self, handler): # pragma: no cover
         from cherrypy import wsgiserver
         server = wsgiserver.CherryPyWSGIServer((self.host, self.port), handler)
-        server.start()
-
+        try:
+            server.start()
+        finally:
+            server.stop()
 
 class PasteServer(ServerAdapter):
     def run(self, handler): # pragma: no cover
-- 
cgit v1.2.1