From 2f06fe4d2ac86d2f7726755828b8ea0403167266 Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Fri, 23 Nov 2012 11:58:36 -0600
Subject: [PATCH] fixed router regex runaway, thanks Jonathan

---
 VERSION          | 2 +-
 gluon/rewrite.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/VERSION b/VERSION
index 8877677f..b60f4545 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.2.1 (2012-11-23 08:01:16) stable
+Version 2.2.1 (2012-11-23 11:57:55) stable
diff --git a/gluon/rewrite.py b/gluon/rewrite.py
index e0f87d08..5c677970 100644
--- a/gluon/rewrite.py
+++ b/gluon/rewrite.py
@@ -76,7 +76,7 @@ def _router_default():
         map_hyphen=False,
         acfe_match=r'\w+$',                   # legal app/ctlr/fcn/ext
         file_match=r'([-+=@$%\w]+[./]?)+$',   # legal static subpath
-        args_match=r'([\w@ -]+[=.]?)*$',      # legal arg in args
+        args_match=r'([\w@ -]|(?<=[\w@ -])[.=])*$', # legal arg in args
     )
     return router