Ticket #717: 717.diff

django/middleware/http.py

@@ -1 +1 @@
 import datetime
+import time
 
 class ConditionalGetMiddleware:
     """
@@ -24 +25 @@
                 response['Content-Length'] = '0'
 
         if response.has_header('Last-Modified'):
-            last_mod = response['Last-Modified']
             if_modified_since = request.META.get('HTTP_IF_MODIFIED_SINCE', None)
-            if if_modified_since == response['Last-Modified']:
-                response.status_code = 304
-                response.content = ''
-                response['Content-Length'] = '0'
+            if if_modified_since:
+                format = '%a, %d %b %Y %H:%M:%S GMT'
+                if time.strptime(response['Last-Modified'], format) <= time.strptime(if_modified_since, format):
+                    response.status_code = 304
+                    response.content = ''
+                    response['Content-Length'] = '0'
 
         if request.META['REQUEST_METHOD'] == 'HEAD':
             response.content = ''