summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hellkamp <marc@gsites.de>2016-01-10 22:03:04 +0100
committerMarcel Hellkamp <marc@gsites.de>2016-01-10 22:03:04 +0100
commitb1e25d391f2c17fa93924e7f88e816ade4246c3d (patch)
treeb327c3ed705e53f65be63e3783721643035f7582
parent509d1ead1159049081b119ae807cf4e73405d35d (diff)
parent39cea11fb518ebf7d0b9fb54533c552fa1861cd5 (diff)
downloadbottle-b1e25d391f2c17fa93924e7f88e816ade4246c3d.tar.gz
Merge pull request #816 from ctengiz/master
Catching redirect exception which is raised in before_request hook
-rw-r--r--bottle.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/bottle.py b/bottle.py
index fd1a20d..1f42d6a 100644
--- a/bottle.py
+++ b/bottle.py
@@ -1012,7 +1012,10 @@ class Bottle(object):
environ['bottle.app'] = self
request.bind(environ)
response.bind()
- self.trigger_hook('before_request')
+ try:
+ self.trigger_hook('before_request')
+ except HTTPResponse:
+ return _e()
out = _inner_handle()
return out;
finally: