Ticket #16632: 16632.diff

django/http/utils.py

@@ -76 +76 @@
 
     # The first part of the Content-Type field will be the MIME type,
     # everything after ';', such as character-set, can be ignored.
-    if response['Content-Type'].split(';')[0] not in safe_mime_types:
+    if response.get('Content-Type', '').split(';')[0] not in safe_mime_types:
         try:
             del response['Vary']
         except KeyError:

tests/regressiontests/utils/http.py

@@ -1 +1 @@
 from django.utils import http
 from django.utils import unittest
 from django.utils.datastructures import MultiValueDict
+from django.http import HttpResponse, utils
+from django.test import RequestFactory
 
 class TestUtilsHttp(unittest.TestCase):
 
@@ -51 +53 @@
             'position=Developer&name=Adrian&name=Simon'
         ]
         self.assertTrue(result in acceptable_results)
+
+
+    def test_ie_novary(self):
+        """
+        test ``fix_IE_for_vary`` response to user_agent, content-type
+        Ref #16632
+        """
+
+        # functions to generate responses
+        def response_with_excluded_mime():
+            r = HttpResponse(content_type="text/unsafe")
+            r['Vary'] = 'Cookie'
+            return r
+
+        def response_with_no_content():
+            # 'Content-Type' always defaulted, so delete it
+            r = response_with_excluded_mime()
+            del r['Content-Type']
+            return r
+            
+        # request with & without IE user agent
+        rf = RequestFactory()
+        request = rf.get('/')
+        ie_request = rf.get('/', HTTP_USER_AGENT='MSIE')
+    
+        # test four cases: normal/ie * excluded_mime/no_content
+        # not IE, excluded_mime_type
+        response = response_with_excluded_mime()
+        utils.fix_IE_for_vary(request, response)
+        self.assertTrue('Vary' in response)
+
+        # IE, excluded_mime_type
+        response = response_with_excluded_mime()
+        utils.fix_IE_for_vary(ie_request, response)
+        self.assertFalse('Vary' in response)
+
+        # not IE, no_content
+        response = response_with_no_content()
+        utils.fix_IE_for_vary(request, response)
+        self.assertTrue('Vary' in response)
+
+        # IE, no_content
+        response = response_with_no_content()
+        utils.fix_IE_for_vary(ie_request, response)
+        self.assertFalse('Vary' in response)
+