From: Ben Darnell <ben@bendarnell.com>
Date: Tue, 19 Oct 2010 21:12:33 +0000 (-0700)
Subject: Attempt to fix StaticFileHandler when os.path.sep != '/'.
X-Git-Tag: v1.2.0~97
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d47c453c5f70b6ecac5e3e8b2aa769377b05da23;p=thirdparty%2Ftornado.git

Attempt to fix StaticFileHandler when os.path.sep != '/'.
---

diff --git a/tornado/web.py b/tornado/web.py
index 9c75d7f4a..6507d7083 100644
--- a/tornado/web.py
+++ b/tornado/web.py
@@ -1236,6 +1236,8 @@ class StaticFileHandler(RequestHandler):
         self.get(path, include_body=False)
 
     def get(self, path, include_body=True):
+        if os.path.sep != "/":
+            path = path.replace("/", os.path.sep)
         abspath = os.path.abspath(os.path.join(self.root, path))
         # os.path.abspath strips a trailing /
         # it needs to be temporarily added back for requests to root/
@@ -1245,8 +1247,8 @@ class StaticFileHandler(RequestHandler):
             # need to look at the request.path here for when path is empty
             # but there is some prefix to the path that was already
             # trimmed by the routing
-            if not self.request.path.endswith(os.path.sep):
-                self.redirect(self.request.path + os.path.sep)
+            if not self.request.path.endswith("/"):
+                self.redirect(self.request.path + "/")
                 return
             abspath = os.path.join(abspath, self.default_filename)
         if not os.path.exists(abspath):