Fixed #11757 - Set mimetype when responding with HttpResponseNotModified in django.server.static.

jezdez · jezdez · commit 8a109a7bc8e6 · 2010-01-09T20:04:33.000Z
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12141 bcc190cf-cafb-0310-a4f2-bffc1f526a37
diff --git a/django/views/static.py b/django/views/static.py
@@ -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])
