This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git
The following commit(s) were added to refs/heads/master by this push:
new 6294a87 Fix BZ 63214 JkAutoAlias with files with names containing
spaces
6294a87 is described below
commit 6294a87de3747fd6ca2fc462e7e171a155d31c7c
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jan 29 17:20:43 2020 +0000
Fix BZ 63214 JkAutoAlias with files with names containing spaces
https://bz.apache.org/bugzilla/show_bug.cgi?id=63214
---
native/apache-2.0/mod_jk.c | 16 +++-------------
xdocs/miscellaneous/changelog.xml | 4 ++++
2 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/native/apache-2.0/mod_jk.c b/native/apache-2.0/mod_jk.c
index 6017751..4047b69 100644
--- a/native/apache-2.0/mod_jk.c
+++ b/native/apache-2.0/mod_jk.c
@@ -3834,10 +3834,7 @@ static int jk_translate(request_rec * r)
if (strlen(clean_uri) > 1) {
char *context_path = NULL;
- context_path = apr_pstrcat(r->pool, conf->alias_dir,
- ap_os_escape_path(r->pool,
- clean_uri,
- 1), NULL);
+ context_path = apr_pstrcat(r->pool, conf->alias_dir,
clean_uri, NULL);
if (context_path != NULL) {
apr_stat(&finfo, context_path, APR_FINFO_TYPE,
r->pool);
@@ -3933,21 +3930,14 @@ static int jk_translate(request_rec * r)
context_dir = apr_pstrdup(r->pool, index);
}
- context_path = apr_pstrcat(r->pool, conf->alias_dir,
- ap_os_escape_path(r->pool,
- context_dir,
- 1), NULL);
+ context_path = apr_pstrcat(r->pool, conf->alias_dir,
context_dir, NULL);
if (context_path != NULL) {
apr_finfo_t finfo;
finfo.filetype = APR_NOFILE;
apr_stat(&finfo, context_path, APR_FINFO_TYPE,
r->pool);
if (finfo.filetype == APR_DIR) {
- char *escurl =
- ap_os_escape_path(r->pool, clean_uri, 1);
- char *ret =
- apr_pstrcat(r->pool, conf->alias_dir, escurl,
- NULL);
+ char *ret = apr_pstrcat(r->pool, conf->alias_dir,
clean_uri, NULL);
/* Add code to verify real path
ap_os_canonical_name */
if (ret != NULL) {
if (JK_IS_DEBUG_LEVEL(conf->log))
diff --git a/xdocs/miscellaneous/changelog.xml
b/xdocs/miscellaneous/changelog.xml
index 5a798f4..c2e46ac 100644
--- a/xdocs/miscellaneous/changelog.xml
+++ b/xdocs/miscellaneous/changelog.xml
@@ -51,6 +51,10 @@
Apache: Fix a bug in the normalization checks that prevented file based
requests, such as SSI file includes, from being processed. (markt)
</fix>
+ <fix>
+ <bug>63214</bug>: Apache: When using <code>JkAutoAlias</code>, ensure
+ that files that include spaces in their name are accessible. (markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
