diff --git a/VERSION b/VERSION index c9065c1e..8a0f3edf 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.00.0 (2012-06-30 12:10:58) dev +Version 2.00.0 (2012-07-01 22:43:58) dev diff --git a/gluon/rewrite.py b/gluon/rewrite.py index dda710c8..157d37fc 100644 --- a/gluon/rewrite.py +++ b/gluon/rewrite.py @@ -337,6 +337,7 @@ def load(routes='routes.py', app=None, data=None, rdict=None): regex_at = re.compile(r'(?(.*)') def compile_regex(k, v): """ @@ -513,6 +514,9 @@ def regex_filter_in(e): e['WEB2PY_ORIGINAL_URI'] = e['PATH_INFO'] + (query and ('?' + query) or '') if thread.routes.routes_in: path = regex_uri(e, thread.routes.routes_in, "routes_in", e['PATH_INFO']) + rmatch = regex_redirect.match(path) + if rmatch: + raise HTTP(int(rmatch.group(1)),location=rmatch.group(2)) items = path.split('?', 1) e['PATH_INFO'] = items[0] if len(items) > 1: