Make @removeslash a no-op when applied to a request for '/'.

This prevents a redirect loop as browsers interpret an empty redirect as a redirect to /.
alekstorm · Feb 12, 2011 · 88833c1 · 88833c1
1 parent 73d3c82
commit 88833c1
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/tornado/web.py b/tornado/web.py
@@ -954,10 +954,12 @@ def wrapper(self, *args, **kwargs):
         if self.request.path.endswith("/"):
             if self.request.method in ("GET", "HEAD"):
                 uri = self.request.path.rstrip("/")
-                if self.request.query: uri += "?" + self.request.query
-                self.redirect(uri)
-                return
-            raise HTTPError(404)
+                if uri:  # don't try to redirect '/' to ''
+                    if self.request.query: uri += "?" + self.request.query
+                    self.redirect(uri)
+                    return
+            else:
+                raise HTTPError(404)
         return method(self, *args, **kwargs)
     return wrapper