mirror of
https://github.com/django/django.git
synced 2024-12-27 19:46:22 +00:00
d88c24f436
make_bytes() assumed that if the Content-Encoding header is set, then
everything had already been dealt with bytes-wise, but in a streaming
situation this was not necessarily the case.
make_bytes() is only called when necessary when working with a
StreamingHttpResponse iterable, but by that point the middleware has
added the Content-Encoding header and thus make_bytes() tried to call
bytes(value) (and dies). If it had been a normal HttpResponse,
make_bytes() would have been called when the content was set, well
before the middleware set the Content-Encoding header.
This commit removes the special casing when Content-Encoding is set,
allowing unicode strings to be encoded during the iteration before they
are e.g. gzipped. This behaviour was added a long time ago for #4969 and
it doesn't appear to be necessary any more, as everything is correctly
made into bytes at the appropriate places.
Two new tests, to show that supplying non-ASCII characters to a
StreamingHttpResponse works fine normally, and when passed through the
GZip middleware (the latter dies without the change to make_bytes()).
Removes the test with a nonsense Content-Encoding and Unicode input - if
this were to happen, it can still be encoded as bytes fine.
Backport of
|
||
|---|---|---|
| .. | ||
| apps | ||
| bin | ||
| conf | ||
| contrib | ||
| core | ||
| db | ||
| dispatch | ||
| forms | ||
| http | ||
| middleware | ||
| template | ||
| templatetags | ||
| test | ||
| utils | ||
| views | ||
| __init__.py | ||
| shortcuts.py | ||