From 2f81a0ca6543f4f7b59bf6cd9aeb8ae87f1e968e Mon Sep 17 00:00:00 2001 From: Julien Phalip Date: Sun, 31 Mar 2013 00:54:52 -0700 Subject: Fixed #20169 -- Ensured that the WSGI request's path is correctly based on the `SCRIPT_NAME` environment parameter or the `FORCE_SCRIPT_NAME` setting, regardless of whether or not those have a trailing slash. Thanks to bmispelon for the review. --- django/core/handlers/wsgi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'django') diff --git a/django/core/handlers/wsgi.py b/django/core/handlers/wsgi.py index 78bf101e20..3c88aeac6d 100644 --- a/django/core/handlers/wsgi.py +++ b/django/core/handlers/wsgi.py @@ -137,7 +137,7 @@ class WSGIRequest(http.HttpRequest): path_info = '/' self.environ = environ self.path_info = path_info - self.path = '%s%s' % (script_name, path_info) + self.path = '%s/%s' % (script_name.rstrip('/'), path_info.lstrip('/')) self.META = environ self.META['PATH_INFO'] = path_info self.META['SCRIPT_NAME'] = script_name -- cgit v1.3