maya-chen/flask
1
0
Fork 0
forked from orbit-oss/flask
Code Pull requests Activity

Merge branch '0.10-maintenance'

Browse source
This commit is contained in:
Armin Ronacher 2014-02-09 13:14:26 +00:00
commit 9298d89aed
3 changed files with 20 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
flask/helpers.py
View file

@ -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)