diff options
| author | Yann Ylavic <ylavic@apache.org> | 2021-10-09 17:22:00 +0200 |
|---|---|---|
| committer | Yann Ylavic <ylavic@apache.org> | 2021-10-09 17:22:00 +0200 |
| commit | fa7f3753066ce9f323a217252b3a7798c9324fb7 (patch) | |
| tree | 66b15147981462e226ca739ba3aa1ef03e63ef1a /modules/proxy | |
| parent | * Good catch by Yann: This is dead code (diff) | |
| download | apache2-fa7f3753066ce9f323a217252b3a7798c9324fb7.tar.xz apache2-fa7f3753066ce9f323a217252b3a7798c9324fb7.zip | |
mod_proxy_uwsgi: Remove duplicate slashes at the beginning of PATH_INFO.
To accommodate for configs like:
ProxyPass /uwsgi-pp uwsgi://localhost:8001/
which before r1892805 did not produce a leading double-slash in PATH_INFO.
Submitted by: rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1894074 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/proxy')
| -rw-r--r-- | modules/proxy/mod_proxy_uwsgi.c | 12 |
1 files changed, 10 insertions, 2 deletions
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); |