Commit 8eaffeac authored by Jannis Leidel's avatar Jannis Leidel
Browse files

[1.1.X] Fixed #11757 - Set mimetype when responding with... 

[1.1.X] Fixed #11757 - Set mimetype when responding with HttpResponseNotModified in django.server.static.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12240 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 02162556

django/views/static.py

+2 −2
Original line number Diff line number Diff line
@@ -56,10 +56,10 @@ def serve(request, path, document_root=None, show_indexes=False): 
        raise Http404, '"%s" does not exist' % fullpath

    # Respect the If-Modified-Since header.

    statobj = os.stat(fullpath)

    mimetype = mimetypes.guess_type(fullpath)[0] or 'application/octet-stream'

    if not was_modified_since(request.META.get('HTTP_IF_MODIFIED_SINCE'),

                              statobj[stat.ST_MTIME], statobj[stat.ST_SIZE]):

        return HttpResponseNotModified()

    mimetype = mimetypes.guess_type(fullpath)[0] or 'application/octet-stream'

        return HttpResponseNotModified(mimetype=mimetype)

    contents = open(fullpath, 'rb').read()

    response = HttpResponse(contents, mimetype=mimetype)

    response["Last-Modified"] = http_date(statobj[stat.ST_MTIME])