Django

Code

Show
Ignore:
Timestamp:
10/07/08 03:22:50 (3 months ago)
Author:
mtredinnick
Message:

Fixed #9199 -- We were erroneously only prepending "www" to the domain if we
also needed to append a slash (when PREPEND_WWW=True).

Based on a patch and tests from gonz. Thanks.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/tests/regressiontests/middleware/tests.py

    r8456 r9184  
    9090            r['Location'], 
    9191            'http://testserver/middleware/needsquoting%23/') 
     92 
     93    def test_prepend_www(self): 
     94        settings.PREPEND_WWW = True 
     95        settings.APPEND_SLASH = False 
     96        request = self._get_request('path/') 
     97        r = CommonMiddleware().process_request(request) 
     98        self.assertEquals(r.status_code, 301) 
     99        self.assertEquals( 
     100            r['Location'], 
     101            'http://www.testserver/middleware/path/') 
     102 
     103    def test_prepend_www_append_slash_have_slash(self): 
     104        settings.PREPEND_WWW = True 
     105        settings.APPEND_SLASH = True 
     106        request = self._get_request('slash/') 
     107        r = CommonMiddleware().process_request(request) 
     108        self.assertEquals(r.status_code, 301) 
     109        self.assertEquals(r['Location'], 
     110                          'http://www.testserver/middleware/slash/') 
     111 
     112    def test_prepend_www_append_slash_slashless(self): 
     113        settings.PREPEND_WWW = True 
     114        settings.APPEND_SLASH = True 
     115        request = self._get_request('slash') 
     116        r = CommonMiddleware().process_request(request) 
     117        self.assertEquals(r.status_code, 301) 
     118        self.assertEquals(r['Location'], 
     119                          'http://www.testserver/middleware/slash/')