Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #16632 -- Crash on responses without Content-Type with IE. Than…

…ks juan for the report and kenth for the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17196 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit affca1369c85116022e42d34f8deae245ce654cd 1 parent 545c315
@aaugustin aaugustin authored
Showing with 49 additions and 1 deletion.
  1. +2 −1  django/http/utils.py
  2. +47 −0 tests/regressiontests/utils/http.py
View
3  django/http/utils.py
@@ -76,7 +76,8 @@ def fix_IE_for_vary(request, response):
# 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:
+ mime_type = response.get('Content-Type', '').partition(';')[0]
+ if mime_type not in safe_mime_types:
try:
del response['Vary']
except KeyError:
View
47 tests/regressiontests/utils/http.py
@@ -1,6 +1,8 @@
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,3 +53,48 @@ def test_urlencode(self):
'position=Developer&name=Adrian&name=Simon'
]
self.assertTrue(result in acceptable_results)
+
+ def test_fix_IE_for_vary(self):
+ """
+ Regression for #16632.
+
+ `fix_IE_for_vary` shouldn't crash when there's no Content-Type header.
+ """
+
+ # functions to generate responses
+ def response_with_unsafe_content_type():
+ r = HttpResponse(content_type="text/unsafe")
+ r['Vary'] = 'Cookie'
+ return r
+
+ def no_content_response_with_unsafe_content_type():
+ # 'Content-Type' always defaulted, so delete it
+ r = response_with_unsafe_content_type()
+ 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')
+
+ # not IE, unsafe_content_type
+ response = response_with_unsafe_content_type()
+ utils.fix_IE_for_vary(request, response)
+ self.assertTrue('Vary' in response)
+
+ # IE, unsafe_content_type
+ response = response_with_unsafe_content_type()
+ utils.fix_IE_for_vary(ie_request, response)
+ self.assertFalse('Vary' in response)
+
+ # not IE, no_content
+ response = no_content_response_with_unsafe_content_type()
+ utils.fix_IE_for_vary(request, response)
+ self.assertTrue('Vary' in response)
+
+ # IE, no_content
+ response = no_content_response_with_unsafe_content_type()
+ utils.fix_IE_for_vary(ie_request, response)
+ self.assertFalse('Vary' in response)
+
Please sign in to comment.
Something went wrong with that request. Please try again.