web_server: Properly set SCRIPT_NAME and PATH_INFO.

Reviewed-by: Matthieu Patou <mat@matws.net>

diff --git a/source4/web_server/wsgi.c b/source4/web_server/wsgi.c
index 4d2b36358b8663b4b27faa8b994e1b1e1a60e2aa..e3e5a0fa3195a2e6a36bb6d36007ce38f3103fa4 100644 (file)
--- a/source4/web_server/wsgi.c
+++ b/source4/web_server/wsgi.c
@@ -292,12 +292,15 @@ static PyObject *create_environ(bool tls, int content_length, struct http_header
        }
        PyDict_SetItemString(env, "REQUEST_METHOD", PyString_FromString(request_method));
 
+       /* There is always a single wsgi app to which all requests are redirected,
+        * so SCRIPT_NAME will be / */
+       PyDict_SetItemString(env, "SCRIPT_NAME", PyString_FromString("/"));
        questionmark = strchr(request_string, '?');
        if (questionmark == NULL) {
-               PyDict_SetItemString(env, "SCRIPT_NAME", PyString_FromString(request_string));
+               PyDict_SetItemString(env, "PATH_INFO", PyString_FromString(request_string));
        } else {
                PyDict_SetItemString(env, "QUERY_STRING", PyString_FromString(questionmark+1));
-               PyDict_SetItemString(env, "SCRIPT_NAME", PyString_FromStringAndSize(request_string, questionmark-request_string));
+               PyDict_SetItemString(env, "PATH_INFO", PyString_FromStringAndSize(request_string, questionmark-request_string));
        }
        
        PyDict_SetItemString(env, "SERVER_NAME", PyString_FromString(servername));