summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hellkamp <marc@gsites.de>2009-10-22 12:29:26 +0200
committerMarcel Hellkamp <marc@gsites.de>2009-10-22 12:29:26 +0200
commit0d9cd9375224a4d2b407d80c0193a2fd36857d91 (patch)
tree1a86b62fee44bee8a061744a914a5553ca1f5944
parentca8b8c57df884ce93673d892b18b1372394dfd92 (diff)
downloadbottle-0d9cd9375224a4d2b407d80c0193a2fd36857d91.tar.gz
Issue #12: send_file always returns 401 on Windows
-rw-r--r--bottle.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/bottle.py b/bottle.py
index ac1d43c..0a49928 100644
--- a/bottle.py
+++ b/bottle.py
@@ -490,8 +490,8 @@ def redirect(url, code=307):
def send_file(filename, root, guessmime = True, mimetype = None):
""" Aborts execution and sends a static files as response. """
- root = os.path.abspath(root) + '/'
- filename = os.path.abspath(os.path.join(root, filename.strip('/')))
+ root = os.path.abspath(root) + os.sep
+ filename = os.path.abspath(os.path.join(root, filename.strip('/\\')))
if not filename.startswith(root):
abort(401, "Access denied.")