From 613f55d8493e091470789ea81d2cd22ea4ba2b33 Mon Sep 17 00:00:00 2001 From: "William A. Rowe Jr" Date: Wed, 1 Mar 2006 20:40:25 +0000 Subject: [PATCH] APR_FILEPATH_NOTABOVEROOT was undefined with a left-hand NULL or empty path. The SECUREROOTPATH and NOTABSOLUTE tests were sufficient for this application. Adjusts for a bug in earlier versions of APR with this undefined value. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@382147 13f79535-47bb-0310-9956-ffa450edef68 --- modules/filters/mod_include.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c index 757bad3c9b..c28fb82f77 100644 --- a/modules/filters/mod_include.c +++ b/modules/filters/mod_include.c @@ -1539,7 +1539,6 @@ static int find_file(request_rec *r, const char *directive, const char *tag, /* be safe; only files in this directory or below allowed */ rv = apr_filepath_merge(&newpath, NULL, tag_val, - APR_FILEPATH_NOTABOVEROOT | APR_FILEPATH_SECUREROOTTEST | APR_FILEPATH_NOTABSOLUTE, r->pool); @@ -1655,7 +1654,6 @@ static apr_status_t handle_include(include_ctx_t *ctx, ap_filter_t *f, /* be safe; only files in this directory or below allowed */ rv = apr_filepath_merge(&newpath, NULL, parsed_string, - APR_FILEPATH_NOTABOVEROOT | APR_FILEPATH_SECUREROOTTEST | APR_FILEPATH_NOTABSOLUTE, ctx->dpool); -- 2.40.0