django.views.static.serve does not properly set Content-Encoding header

[Kevin Hunter <hunteke@…>]

Amidst trying to gzip a javascript file, I noted that the interaction between my browser (FF3/Linux) and the manage.py server only showed me the compressed version of the requested file. I believe it's due to not properly setting the Content-Encoding header.

This patch adds the Content-Encoding header to django.views.static.serve as returned by mimetypes.guess_type .

[Kevin Hunter <hunteke@…]

Content-Encoding patch for django.views.static.serve

[Bastian Kleineidam <calvin@…>]

The patch will break if mimetypes cannot guess the content type or the encoding. Specifically this expression:

mimetypes.guess_type(fullpath) or mimetype

will never use the second mimetype variable since .guess_type() returns a 2-tuple which has a boolean value of True.

It is easier (albeit a little longer) to check both content-type and -encoding separately for None and use appropriate fallbacks.

[Kevin Hunter <hunteke@…>]

Content-Encoding patch for django.views.static.serve, revision 2

[Kevin Hunter <hunteke@…>]

Heh, length I am not worried about; I'm just learning. For whatever reason, mimetypes and encodings confuse me. In any event, I was attempting to follow the "compressed" look of the code.

Does this second revision of the patch work then?

[Bastian Kleineidam <calvin@…>]

The patch looks ok. You can shorten the code a bit by assigning a tuple to multiple variables:

mimetype, encoding = mimetypes.guess_type(fullpath) 
if mimetype is None:
    mimetype = 'application/octet-stream'

[Kevin Hunter <hunteke@…>]

Ah cool, and even one more line?
mimetype = mimetype or 'application/octet-stream'

[Bastian Kleineidam <calvin@…>]

Yes, the "or" expression would save another line :-)

[Kevin Hunter <hunteke@…>]

Is this patch good then? I note the "Patch needs improvement" bit is still set so is there anything else I need to do while this is still fresh in my mind? Should I submit .3 of the patch with minification discussed?

[Bastian Kleineidam <calvin@…>]

Yes, add a .3 patch (or replace the .2 one) and delete the improvement checkbox. Thanks for the work.

[Kevin Hunter <hunteke@…>]

Content-Encoding patch for django.views.static.serve, revision 3, hopefully final

[Kevin Hunter <hunteke@…>]

Alright, thar she blows. v3, hopefully final patch, added. Pleasure doin' business with ya.

[Adam Nelson]

Patch needs to be ported to current version of source:/django/trunk/django/views/static.py.

[Jannis Leidel]

(In [13868]) Fixed #7535 -- Correctly set Content-Encoding header in static files serving view. Thanks for the report and patch, Kevin Hunter.

[Jannis Leidel]

(In [13869]) [1.2.X] Fixed #7535 -- Correctly set Content-Encoding header in static files serving view. Thanks for the report and patch, Kevin Hunter.

Backport from trunk (r13868).