httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s.@apache.org
Subject svn commit: r1153674 - in /httpd/httpd/trunk/server: config.c core.c
Date Wed, 03 Aug 2011 21:28:43 GMT
Author: sf
Date: Wed Aug  3 21:28:42 2011
New Revision: 1153674

URL: http://svn.apache.org/viewvc?rev=1153674&view=rev
Log:
Adjust some messages for <If> blocks and remove some dead code

Modified:
    httpd/httpd/trunk/server/config.c
    httpd/httpd/trunk/server/core.c

Modified: httpd/httpd/trunk/server/config.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/config.c?rev=1153674&r1=1153673&r2=1153674&view=diff
==============================================================================
--- httpd/httpd/trunk/server/config.c (original)
+++ httpd/httpd/trunk/server/config.c Wed Aug  3 21:28:42 2011
@@ -2423,10 +2423,10 @@ static void show_overrides(const command
         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

Modified: httpd/httpd/trunk/server/core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/core.c?rev=1153674&r1=1153673&r2=1153674&view=diff
==============================================================================
--- httpd/httpd/trunk/server/core.c (original)
+++ httpd/httpd/trunk/server/core.c Wed Aug  3 21:28:42 2011
@@ -2927,14 +2927,6 @@ static const char *set_loglevel(cmd_parm
     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) {



Mime
View raw message