diff options
| -rw-r--r-- | changes-entries/uwsgi-path_info.txt | 2 | ||||
| -rw-r--r-- | modules/proxy/mod_proxy_uwsgi.c | 12 |
2 files changed, 12 insertions, 2 deletions
diff --git a/changes-entries/uwsgi-path_info.txt b/changes-entries/uwsgi-path_info.txt new file mode 100644 index 0000000000..beb0a67434 --- /dev/null +++ b/changes-entries/uwsgi-path_info.txt @@ -0,0 +1,2 @@ + *) mod_proxy_uwsgi: Remove duplicate slashes at the beginning of PATH_INFO. + PR 65616. [Ruediger Pluem] diff --git a/modules/proxy/mod_proxy_uwsgi.c b/modules/proxy/mod_proxy_uwsgi.c index 2c493cdab4..e8ce6c710e 100644 --- a/modules/proxy/mod_proxy_uwsgi.c +++ b/modules/proxy/mod_proxy_uwsgi.c @@ -476,14 +476,22 @@ static int uwsgi_handler(request_rec *r, proxy_worker * worker, /* ADD PATH_INFO (unescaped) */ u_path_info = ap_strchr(url + sizeof(UWSGI_SCHEME) + 2, '/'); - if (!u_path_info || ap_unescape_url(u_path_info) != OK) { + if (!u_path_info) { + u_path_info = apr_pstrdup(r->pool, "/"); + } + else if (ap_unescape_url(u_path_info) != OK) { ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(10100) "unable to decode uwsgi uri: %s", url); return HTTP_INTERNAL_SERVER_ERROR; } + else { + /* Remove duplicate slashes at the beginning of PATH_INFO */ + while (u_path_info[1] == '/') { + u_path_info++; + } + } apr_table_add(r->subprocess_env, "PATH_INFO", u_path_info); - /* Create space for state information */ status = ap_proxy_acquire_connection(UWSGI_SCHEME, &backend, worker, r->server); |