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

encode filenames as ascii instead of latin-1

Browse source 
latin-1 is allowed by pep3333, but that breaks gunicorn
This commit is contained in:
David Lord 2018-05-28 06:26:27 -07:00
parent 401d7f9bb2
commit b51ab3ff2c
No known key found for this signature in database
GPG key ID: 7A1C87E3F5BC42A8
3 changed files with 27 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
flask/helpers.py
View file

@ -506,6 +506,10 @@ def send_file(filename_or_fp, mimetype=None, as_attachment=False,
.. _RFC 2231: https://tools.ietf.org/html/rfc2231#section-4
.. versionchanged:: 1.0.3
Filenames are encoded with ASCII instead of Latin-1 for broader
compatibility with WSGI servers.
:param filename_or_fp: the filename of the file to send.
This is relative to the :attr:`~Flask.root_path`
if a relative path is specified.
@ -564,11 +568,11 @@ def send_file(filename_or_fp, mimetype=None, as_attachment=False,
'sending as attachment')
try:
attachment_filename = attachment_filename.encode('latin-1')
attachment_filename = attachment_filename.encode('ascii')
except UnicodeEncodeError:
filenames = {
'filename': unicodedata.normalize(
'NFKD', attachment_filename).encode('latin-1', 'ignore'),
'NFKD', attachment_filename).encode('ascii', 'ignore'),
'filename*': "UTF-8''%s" % url_quote(attachment_filename),
}
else: