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 3a9a558da0f3f3f4dd78bebf8384f188215f8729..22393525764e33c02daa29df83bbcff76c86516f 100644 (file)
--- 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 7bc96cfe6025296ee92d844960b2dc8a06d82309..71c13da5fc4e33a66ec77044a99d86d2e3945a32 100644 (file)
--- 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) {