Ticket #12464: 12464.patch

django/core/handlers/base.py

@@ -215 +215 @@
     if not script_url:
         script_url = environ.get('REDIRECT_URL', u'')
     if script_url:
-        return force_unicode(script_url[:-len(environ.get('PATH_INFO', ''))])
+        path_info = environ.get('PATH_INFO', u'')
+        if path_info:
+            script_url = script_url[:-len(path_info)]
+        return force_unicode(script_url)
     return force_unicode(environ.get('SCRIPT_NAME', u''))
 

tests/regressiontests/requests/tests.py

@@ -3 +3 @@
 import unittest
 
 from django.http import HttpRequest, HttpResponse, parse_cookie
+from django.core.handlers.base import get_script_name
 from django.core.handlers.wsgi import WSGIRequest
 from django.core.handlers.modpython import ModPythonRequest
 from django.utils.http import cookie_date
+from django.conf import settings
 
 class RequestsTests(unittest.TestCase):
 
@@ -45 +47 @@
         self.assertEqual(request.COOKIES.keys(), [])
         self.assertEqual(request.META.keys(), [])
 
+    def test_get_script_name(self):
+        'get_script_name is computing the script name correctly'
+        old = getattr(settings,'FORCE_SCRIPT_NAME',None)
+        if old:
+            settings.FORCE_SCRIPT_NAME = None
+        self.assertEqual(get_script_name({'PATH_INFO': u'', 'SCRIPT_URL': u'test'}), u'test')
+        self.assertEqual(get_script_name({'PATH_INFO': u'/path', 'SCRIPT_URL': u'test/path'}), u'test')
+        self.assertEqual(get_script_name({'PATH_INFO': u'/path', 'REDIRECT_URL': u'test/path'}), u'test')
+        self.assertEqual(get_script_name({'SCRIPT_NAME': u'test'}), u'test')
+        settings.FORCE_SCRIPT_NAME = u'forced'
+        self.assertEqual(get_script_name({'SCRIPT_NAME': u'test'}), u'forced')
+        settings.FORCE_SCRIPT_NAME = old
+
     def test_parse_cookie(self):
         self.assertEqual(parse_cookie('invalid:key=true'), {})