Author: kmtracey
Date: 2010-03-02 13:41:39 -0600 (Tue, 02 Mar 2010)
New Revision: 12660
Modified:
django/branches/releases/1.1.X/
django/branches/releases/1.1.X/django/http/__init__.py
django/branches/releases/1.1.X/tests/regressiontests/views/tests/specials.py
django/branches/releases/1.1.X/tests/regressiontests/views/urls.py
Log:
[1.1.X] Fixed #11522: Restored ability of http redirect responses to correctly
handle redirect locations with non-ASCII chars.
r12659 from trunk.
Property changes on: django/branches/releases/1.1.X
___________________________________________________________________
Name: svnmerge-integrated
-
/django/trunk:1-11500,11523,11527-11528,11531-11552,11554,11577,11579-11581,11588-11589,11591-11592,11596-11599,11601-11617,11619-11626,11628-11635,11637-11638,11643-11644,11648-11653,11656,11670,11678,11681,11684,11686,11688,11691,11693,11695,11697,11699,11701,11703,11705,11707,11714,11719,11732,11734,11740,11748,11751,11753,11756,11760,11800,11802,11808,11815,11817,11820,11822,11824,11826,11828,11831,11833,11835,11837,11839,11841,11844,11857,11864,11874,11876,11878,11885,11898,11901,11905,11909,11912,11914,11917,11938,11953,11961,11977,11979,11984,11986,11988,11990,11992,11994,11996,11998,12001,12004,12006,12011,12022,12024,12044-12045,12048,12054-12056,12059,12064,12066,12068,12070,12079,12086,12088,12104,12118,12132,12137-12138,12140-12141,12144,12150-12152,12220-12221,12229,12249,12253,12276,12282,12284,12293,12313,12317-12324,12333,12341,12343,12346,12353,12362,12379,12384,12398,12405,12408-12411,12419-12420,12423,12425-12426,12429,12434,12436,12439-12442,12448,12457,12461-12464,12467,12473,12475,12490,12492,12497-12498,12502,12513,12515-12516,12518,12523,12526,12528,12533,12535,12537,12539,12541,12548,12553,12556,12558-12560,12562,12567,12569-12570,12573,12576,12581,12584,12616,12621-12622,12631,12648,12650,12652
+
/django/trunk:1-11500,11523,11527-11528,11531-11552,11554,11577,11579-11581,11588-11589,11591-11592,11596-11599,11601-11617,11619-11626,11628-11635,11637-11638,11643-11644,11648-11653,11656,11670,11678,11681,11684,11686,11688,11691,11693,11695,11697,11699,11701,11703,11705,11707,11714,11719,11732,11734,11740,11748,11751,11753,11756,11760,11800,11802,11808,11815,11817,11820,11822,11824,11826,11828,11831,11833,11835,11837,11839,11841,11844,11857,11864,11874,11876,11878,11885,11898,11901,11905,11909,11912,11914,11917,11938,11953,11961,11977,11979,11984,11986,11988,11990,11992,11994,11996,11998,12001,12004,12006,12011,12022,12024,12044-12045,12048,12054-12056,12059,12064,12066,12068,12070,12079,12086,12088,12104,12118,12132,12137-12138,12140-12141,12144,12150-12152,12220-12221,12229,12249,12253,12276,12282,12284,12293,12313,12317-12324,12333,12341,12343,12346,12353,12362,12379,12384,12398,12405,12408-12411,12419-12420,12423,12425-12426,12429,12434,12436,12439-12442,12448,12457,12461-12464,12467,12473,12475,12490,12492,12497-12498,12502,12513,12515-12516,12518,12523,12526,12528,12533,12535,12537,12539,12541,12548,12553,12556,12558-12560,12562,12567,12569-12570,12573,12576,12581,12584,12616,12621-12622,12631,12648,12650,12652,12659
Modified: django/branches/releases/1.1.X/django/http/__init__.py
===================================================================
--- django/branches/releases/1.1.X/django/http/__init__.py 2010-03-02
19:37:48 UTC (rev 12659)
+++ django/branches/releases/1.1.X/django/http/__init__.py 2010-03-02
19:41:39 UTC (rev 12660)
@@ -434,14 +434,14 @@
def __init__(self, redirect_to):
HttpResponse.__init__(self)
- self['Location'] = redirect_to
+ self['Location'] = iri_to_uri(redirect_to)
class HttpResponsePermanentRedirect(HttpResponse):
status_code = 301
def __init__(self, redirect_to):
HttpResponse.__init__(self)
- self['Location'] = redirect_to
+ self['Location'] = iri_to_uri(redirect_to)
class HttpResponseNotModified(HttpResponse):
status_code = 304
Modified:
django/branches/releases/1.1.X/tests/regressiontests/views/tests/specials.py
===================================================================
---
django/branches/releases/1.1.X/tests/regressiontests/views/tests/specials.py
2010-03-02 19:37:48 UTC (rev 12659)
+++
django/branches/releases/1.1.X/tests/regressiontests/views/tests/specials.py
2010-03-02 19:41:39 UTC (rev 12660)
@@ -5,11 +5,31 @@
"""
Tests for URL handling in views and responses.
"""
- def test_iri_redirect(self):
+ redirect_target = "/views/%E4%B8%AD%E6%96%87/target/"
+
+ def test_combining_redirect(self):
"""
Tests that redirecting to an IRI, requiring encoding before we use it
- in an HTTP response, is handled correctly.
+ in an HTTP response, is handled correctly. In this case the arg to
+ HttpRedirect is ASCII but the current request path contains non-ASCII
+ characters so this test ensures the creation of the full path with a
+ base non-ASCII part is handled correctly.
"""
response = self.client.get(u'/views/中文/')
- self.assertRedirects(response, "/views/%E4%B8%AD%E6%96%87/target/")
+ self.assertRedirects(response, self.redirect_target)
+ def test_nonascii_redirect(self):
+ """
+ Tests that a non-ASCII argument to HttpRedirect is handled properly.
+ """
+ response = self.client.get('/views/nonascii_redirect/')
+ self.assertRedirects(response, self.redirect_target)
+
+ def test_permanent_nonascii_redirect(self):
+ """
+ Tests that a non-ASCII argument to HttpPermanentRedirect is handled
+ properly.
+ """
+ response = self.client.get('/views/permanent_nonascii_redirect/')
+ self.assertRedirects(response, self.redirect_target, status_code=301)
+
Modified: django/branches/releases/1.1.X/tests/regressiontests/views/urls.py
===================================================================
--- django/branches/releases/1.1.X/tests/regressiontests/views/urls.py
2010-03-02 19:37:48 UTC (rev 12659)
+++ django/branches/releases/1.1.X/tests/regressiontests/views/urls.py
2010-03-02 19:41:39 UTC (rev 12660)
@@ -97,3 +97,12 @@
urlpatterns += patterns('',
(r'^raises/$', views.raises)
)
+
+# rediriects, both temporary and permanent, with non-ASCII targets
+urlpatterns += patterns('django.views.generic.simple',
+ ('^nonascii_redirect/$', 'redirect_to',
+ {'url': u'/views/中文/target/', 'permanent': False}),
+ ('^permanent_nonascii_redirect/$', 'redirect_to',
+ {'url': u'/views/中文/target/', 'permanent': True}),
+)
+
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
