Merge remote-tracking branch 'upstream/0.12-maintenance'

This commit is contained in:
Adrian Moennich 2017-11-25 00:44:07 +01:00
commit eb1c2faf9f
3 changed files with 32 additions and 2 deletions

View file

@ -610,7 +610,8 @@ def send_file(filename_or_fp, mimetype=None, as_attachment=False,
rv = rv.make_conditional(request, accept_ranges=True,
complete_length=fsize)
except RequestedRangeNotSatisfiable:
file.close()
if file is not None:
file.close()
raise
else:
rv = rv.make_conditional(request)