From 76e2f9cd0396c71eedf7e3b1dabf60f36585722e Mon Sep 17 00:00:00 2001 From: Armin Ronacher Date: Sun, 9 Feb 2014 13:01:54 +0000 Subject: [PATCH] Fixed send_from_directory not rebasing to the root path. This fixes #921 --- CHANGES | 2 ++ flask/helpers.py | 2 ++ 2 files changed, 4 insertions(+) diff --git a/CHANGES b/CHANGES index b66432af..fc5831b5 100644 --- a/CHANGES +++ b/CHANGES @@ -18,6 +18,8 @@ Version 0.10.2 the test client when absolute URLs were requested. - Made `@before_first_request` into a decorator as intended. - Fixed an etags bug when sending a file streams with a name. +- Fixed `send_from_directory` not expanding to the application root path + correctly. Version 0.10.1 -------------- diff --git a/flask/helpers.py b/flask/helpers.py index 7b69b63c..3e303305 100644 --- a/flask/helpers.py +++ b/flask/helpers.py @@ -615,6 +615,8 @@ def send_from_directory(directory, filename, **options): forwarded to :func:`send_file`. """ filename = safe_join(directory, filename) + if not os.path.isabs(filename): + filename = os.path.join(current_app.root_path, filename) if not os.path.isfile(filename): raise NotFound() options.setdefault('conditional', True)