Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 41324 invoked from network); 2 Jan 2004 23:45:07 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 2 Jan 2004 23:45:07 -0000 Received: (qmail 93768 invoked by uid 500); 2 Jan 2004 23:44:53 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 93734 invoked by uid 500); 2 Jan 2004 23:44:52 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 93721 invoked by uid 500); 2 Jan 2004 23:44:52 -0000 Delivered-To: apmail-httpd-2.0-cvs@apache.org Received: (qmail 93717 invoked from network); 2 Jan 2004 23:44:52 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 2 Jan 2004 23:44:52 -0000 Received: (qmail 41301 invoked by uid 1569); 2 Jan 2004 23:45:06 -0000 Date: 2 Jan 2004 23:45:06 -0000 Message-ID: <20040102234506.41299.qmail@minotaur.apache.org> From: nd@apache.org To: httpd-2.0-cvs@apache.org Subject: cvs commit: httpd-2.0/modules/filters mod_include.c X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N nd 2004/01/02 15:45:06 Modified: modules/filters mod_include.c Log: fix a rewrite mistake: restore the ability to expand variables within . Revision Changes Path 1.295 +1 -1 httpd-2.0/modules/filters/mod_include.c Index: mod_include.c =================================================================== RCS file: /home/cvs/httpd-2.0/modules/filters/mod_include.c,v retrieving revision 1.294 retrieving revision 1.295 diff -u -u -r1.294 -r1.295 --- mod_include.c 2 Jan 2004 23:35:05 -0000 1.294 +++ mod_include.c 2 Jan 2004 23:45:06 -0000 1.295 @@ -1704,7 +1704,7 @@ apr_status_t rv; /* be safe; only files in this directory or below allowed */ - rv = apr_filepath_merge(&newpath, NULL, tag_val, + rv = apr_filepath_merge(&newpath, NULL, parsed_string, APR_FILEPATH_NOTABOVEROOT | APR_FILEPATH_SECUREROOTTEST | APR_FILEPATH_NOTABSOLUTE, ctx->dpool);