From 0d734757ab7c08827a7090aca1daf120700aad43 Mon Sep 17 00:00:00 2001 From: Stefan Fritsch Date: Wed, 7 Nov 2012 08:29:49 +0000 Subject: Make sections in virtual host context fill in cmd->path so that other directive notice that they are in a config section. This fixes LogLevel not working in sections that are not in Location/Directory/File sections. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1406493 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 5 +++++ server/core.c | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 08dc198309..ba2aef91a0 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,10 @@ -*- coding: utf-8 -*- Changes with Apache 2.5.0 + + *) core: Fix directives like LogLevel that need to know if they are invoked + at virtual host context or in Directory/Files/Location/If sections to + work properly in If sections that are not in a Directory/Files/Location. + [Stefan Fritsch] *) mod_cache_disk: Resolve errors while revalidating disk-cached files on Windows ("...rename tempfile to datafile failed..."). PR 38827 diff --git a/server/core.c b/server/core.c index 82863460b5..818ddbfb51 100644 --- a/server/core.c +++ b/server/core.c @@ -2354,7 +2354,11 @@ static const char *ifsection(cmd_parms *cmd, void *mconfig, const char *arg) arg = apr_pstrndup(cmd->temp_pool, arg, endp - arg); - + /* + * Set a dummy value so that other directives notice that they are inside + * a config section. + */ + cmd->path = "*If"; /* Only if not an .htaccess file */ if (!old_path) { cmd->override = OR_ALL|ACCESS_CONF; -- cgit v1.2.3