Ticket #3414: wsgi_path_from_many_params_2.diff.txt

Index: django/core/handlers/wsgi.py
===================================================================
--- django/core/handlers/wsgi.py        (revision 7995)
+++ django/core/handlers/wsgi.py        (working copy)
@@ -74,9 +74,15 @@

 class WSGIRequest(http.HttpRequest):
     def __init__(self, environ):
-        self.environ = environ
-        self.path = force_unicode(environ['PATH_INFO'])
-        self.META = environ
+        if environ['PATH_INFO']:
+            self.path = force_unicode(environ['PATH_INFO'])
+        elif environ.has_key('REDIRECT_URL') and environ['REDIRECT_URL']:
+            self.path = force_unicode(environ['REDIRECT_URL'])
+        else:
+            self.path = force_unicode(environ.get('REQUEST_URI', '/').partition('?')[0])
+        if environ.get('QUERY_STRING', '') == '':
+            environ['QUERY_STRING'] = environ.get('REQUEST_URI', '').partition('?')[2]
+        self.environ = self.META = environ
         self.method = environ['REQUEST_METHOD'].upper()

     def __repr__(self):