summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/ap_mmn.h3
-rw-r--r--include/httpd.h11
-rw-r--r--modules/mappers/mod_rewrite.c18
-rw-r--r--server/util.c31
4 files changed, 33 insertions, 30 deletions
diff --git a/include/ap_mmn.h b/include/ap_mmn.h
index 4e942ada1d..ad4b77bd33 100644
--- a/include/ap_mmn.h
+++ b/include/ap_mmn.h
@@ -730,6 +730,7 @@
* 20211221.23 (2.5.1-dev) Add ap_set_content_type_ex(), ap_filepath_merge(),
* and AP_REQUEST_TRUSTED_CT BNOTE.
* 20211221.24 (2.5.1-dev) Add ap_proxy_fixup_uds_filename()
+ * 20211221.25 (2.5.1-dev) AP_SLASHES and AP_IS_SLASH
*/
#define MODULE_MAGIC_COOKIE 0x41503235UL /* "AP25" */
@@ -737,7 +738,7 @@
#ifndef MODULE_MAGIC_NUMBER_MAJOR
#define MODULE_MAGIC_NUMBER_MAJOR 20211221
#endif
-#define MODULE_MAGIC_NUMBER_MINOR 24 /* 0...n */
+#define MODULE_MAGIC_NUMBER_MINOR 25 /* 0...n */
/**
* Determine if the server's current MODULE_MAGIC_NUMBER is at least a
diff --git a/include/httpd.h b/include/httpd.h
index 02ad323893..c02b3b7849 100644
--- a/include/httpd.h
+++ b/include/httpd.h
@@ -2879,6 +2879,17 @@ AP_DECLARE(apr_status_t) ap_filepath_merge(char **newpath,
#define apr_filepath_merge ap_filepath_merge
#endif
+/* Win32/NetWare/OS2 need to check for both forward and back slashes
+ * in ap_normalize_path() and ap_escape_url().
+ */
+#ifdef CASE_BLIND_FILESYSTEM
+#define AP_IS_SLASH(s) ((s == '/') || (s == '\\'))
+#define AP_SLASHES "/\\"
+#else
+#define AP_IS_SLASH(s) (s == '/')
+#define AP_SLASHES "/"
+#endif
+
#ifdef __cplusplus
}
#endif
diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c
index 0d4ecbc9dd..2e7d18cc60 100644
--- a/modules/mappers/mod_rewrite.c
+++ b/modules/mappers/mod_rewrite.c
@@ -688,11 +688,8 @@ static int is_absolute_path(const char *path)
#ifndef WIN32
return (path[0] == '/');
#else
-#define IS_SLASH(c) ((c) == '/' || (c) == '\\')
- /* "//", "\\", "x:/" and "x:\" are absolute paths on Windows */
- return ((IS_SLASH(path[0]) && path[1] == path[0])
- || (apr_isalpha(path[0]) && path[1] == ':' && IS_SLASH(path[2])));
-#undef IS_SLASH
+ return ((AP_IS_SLASH(path[0]) && path[1] == path[0])
+ || (apr_isalpha(path[0]) && path[1] == ':' && AP_IS_SLASH(path[2])));
#endif
}
@@ -4413,10 +4410,15 @@ static rule_return_type apply_rewrite_rule(rewriterule_entry *p,
&& !is_absolute_path(newuri)
&& !is_absolute_uri(newuri, NULL)) {
if (ctx->perdir) {
- rewritelog(r, 3, ctx->perdir, "add per-dir prefix: %s -> %s%s",
- newuri, ctx->perdir, newuri);
+ if (!AP_IS_SLASH(*newuri)) {
+ /* perdir, the newuri will be internally redirected, so
+ * leading slash is enough even if it's an ambiguous fs path
+ */
+ rewritelog(r, 3, ctx->perdir, "add per-dir prefix: %s -> %s%s",
+ newuri, ctx->perdir, newuri);
- newuri = apr_pstrcat(r->pool, ctx->perdir, newuri, NULL);
+ newuri = apr_pstrcat(r->pool, ctx->perdir, newuri, NULL);
+ }
}
else if (!(p->flags & (RULEFLAG_PROXY | RULEFLAG_FORCEREDIRECT))) {
/* Not an absolute URI-path and the scheme (if any) is unknown,
diff --git a/server/util.c b/server/util.c
index 04f40a235a..bca2636fd2 100644
--- a/server/util.c
+++ b/server/util.c
@@ -77,17 +77,6 @@
*/
#include "test_char.h"
-/* Win32/NetWare/OS2 need to check for both forward and back slashes
- * in ap_normalize_path() and ap_escape_url().
- */
-#ifdef CASE_BLIND_FILESYSTEM
-#define IS_SLASH(s) ((s == '/') || (s == '\\'))
-#define SLASHES "/\\"
-#else
-#define IS_SLASH(s) (s == '/')
-#define SLASHES "/"
-#endif
-
/* we know core's module_index is 0 */
#undef APLOG_MODULE_INDEX
#define APLOG_MODULE_INDEX AP_CORE_MODULE_INDEX
@@ -494,7 +483,7 @@ AP_DECLARE(apr_status_t) ap_pregsub_ex(apr_pool_t *p, char **result,
/* Forward declare */
static char x2c(const char *what);
-#define IS_SLASH_OR_NUL(s) (s == '\0' || IS_SLASH(s))
+#define IS_SLASH_OR_NUL(s) (s == '\0' || AP_IS_SLASH(s))
/*
* Inspired by mod_jk's jk_servlet_normalize().
@@ -506,7 +495,7 @@ AP_DECLARE(int) ap_normalize_path(char *path, unsigned int flags)
int decode_unreserved = (flags & AP_NORMALIZE_DECODE_UNRESERVED) != 0;
int merge_slashes = (flags & AP_NORMALIZE_MERGE_SLASHES) != 0;
- if (!IS_SLASH(path[0])) {
+ if (!AP_IS_SLASH(path[0])) {
/* Besides "OPTIONS *", a request-target should start with '/'
* per RFC 7230 section 5.3, so anything else is invalid.
*/
@@ -547,12 +536,12 @@ AP_DECLARE(int) ap_normalize_path(char *path, unsigned int flags)
}
}
- if (w == 0 || IS_SLASH(path[w - 1])) {
+ if (w == 0 || AP_IS_SLASH(path[w - 1])) {
/* Collapse ///// sequences to / */
- if (merge_slashes && IS_SLASH(path[l])) {
+ if (merge_slashes && AP_IS_SLASH(path[l])) {
do {
l++;
- } while (IS_SLASH(path[l]));
+ } while (AP_IS_SLASH(path[l]));
continue;
}
@@ -581,7 +570,7 @@ AP_DECLARE(int) ap_normalize_path(char *path, unsigned int flags)
if (w > 1) {
do {
w--;
- } while (w && !IS_SLASH(path[w - 1]));
+ } while (w && !AP_IS_SLASH(path[w - 1]));
}
else {
/* Already at root, ignore and return a failure
@@ -1921,7 +1910,7 @@ static int unescape_url(char *url, const char *forbid, const char *reserved,
char decoded;
decoded = x2c(y + 1);
if ((decoded == '\0')
- || (forbid_slashes && IS_SLASH(decoded))
+ || (forbid_slashes && AP_IS_SLASH(decoded))
|| (forbid && ap_strchr_c(forbid, decoded))) {
badpath = 1;
*x = decoded;
@@ -1929,7 +1918,7 @@ static int unescape_url(char *url, const char *forbid, const char *reserved,
}
else if ((keep_unreserved && TEST_CHAR(decoded,
T_URI_UNRESERVED))
- || (keep_slashes && IS_SLASH(decoded))
+ || (keep_slashes && AP_IS_SLASH(decoded))
|| (reserved && ap_strchr_c(reserved, decoded))) {
*x++ = *y++;
*x++ = *y++;
@@ -1956,7 +1945,7 @@ static int unescape_url(char *url, const char *forbid, const char *reserved,
AP_DECLARE(int) ap_unescape_url(char *url)
{
/* Traditional */
- return unescape_url(url, SLASHES, NULL, 0);
+ return unescape_url(url, AP_SLASHES, NULL, 0);
}
AP_DECLARE(int) ap_unescape_url_keep2f(char *url, int decode_slashes)
{
@@ -1966,7 +1955,7 @@ AP_DECLARE(int) ap_unescape_url_keep2f(char *url, int decode_slashes)
return unescape_url(url, NULL, NULL, 0);
} else {
/* reserve (do not decode) encoded slashes */
- return unescape_url(url, NULL, SLASHES, 0);
+ return unescape_url(url, NULL, AP_SLASHES, 0);
}
}
AP_DECLARE(int) ap_unescape_url_ex(char *url, unsigned int flags)
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-01 20:12:46 +0100