Ticket #285: 285.2.patch

django/core/handlers/base.py

@@ -65 +65 @@
 
         resolver = urlresolvers.RegexURLResolver(r'^/', urlconf)
         try:
-            callback, callback_args, callback_kwargs = resolver.resolve(request.path)
+            callback, callback_args, callback_kwargs = resolver.resolve(request.META['PATH_INFO'])
 
             # Apply view middleware
             for middleware_method in self._view_middleware:

django/core/handlers/modpython.py

@@ -94 +94 @@
                 'CONTENT_LENGTH':    self._req.clength, # This may be wrong
                 'CONTENT_TYPE':      self._req.content_type, # This may be wrong
                 'GATEWAY_INTERFACE': 'CGI/1.1',
-                'PATH_INFO':         self._req.path_info,
+                'PATH_INFO':         self._req.uri,
                 'PATH_TRANSLATED':   None, # Not supported
                 'QUERY_STRING':      self._req.args,
                 'REMOTE_ADDR':       self._req.connection.remote_ip,

django/core/handlers/wsgi.py

@@ -74 +74 @@
 class WSGIRequest(http.HttpRequest):
     def __init__(self, environ):
         self.environ = environ
-        self.path = force_unicode(environ['PATH_INFO'])
+        self.path = ''.join((force_unicode(environ.get('SCRIPT_NAME') or ''),
+                             force_unicode(environ['PATH_INFO'])))
         self.META = environ
         self.method = environ['REQUEST_METHOD'].upper()