From: Stefan Fritsch <sf@apache.org>
Date: Wed, 3 Aug 2011 21:28:42 +0000 (+0000)
Subject: Adjust some messages for <If> blocks and remove some dead code
X-Git-Tag: 2.3.15~420
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1f50be04f2b37a06234b55bbff41fa7c43b466f;p=thirdparty%2Fapache%2Fhttpd.git

Adjust some messages for <If> blocks and remove some dead code


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1153674 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/server/config.c b/server/config.c
index 3a9a558da0f..22393525764 100644
--- a/server/config.c
+++ b/server/config.c
@@ -2423,10 +2423,10 @@ static void show_overrides(const command_rec *pc, module *pm)
         printf("anywhere");
     }
     else if (pc->req_override & RSRC_CONF) {
-        printf("only outside <Directory>, <Files> or <Location>");
+        printf("only outside <Directory>, <Files>, <Location>, or <If>");
     }
     else {
-        printf("only inside <Directory>, <Files> or <Location>");
+        printf("only inside <Directory>, <Files>, <Location>, or <If>");
     }
 
     /* Warn if the directive is allowed inside <Directory> or .htaccess
diff --git a/server/core.c b/server/core.c
index 7bc96cfe602..71c13da5fc4 100644
--- a/server/core.c
+++ b/server/core.c
@@ -2927,14 +2927,6 @@ static const char *set_loglevel(cmd_parms *cmd, void *config_, const char *arg_)
     struct ap_logconf *log;
     const char *err;
 
-    /* XXX: what check is necessary here? */
-#if 0
-    const char *err = ap_check_cmd_context(cmd, NOT_IN_DIR_LOC_FILE);
-    if (err != NULL) {
-        return err;
-    }
-#endif
-
     if (cmd->path) {
         core_dir_config *dconf = config_;
         if (!dconf->log) {