core: Log a warning if <Limit> or <LimitExcept> are used. They are

deprecated and may go away in 2.4.

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

diff --git a/CHANGES b/CHANGES
index b2d0be8a08ed2c336809b180828990a127b3c56a..18f54250d7aaccbaff6a467559b14d299bfbfdac 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,9 @@ Changes with Apache 2.3.9
      Fix a denial of service attack against mod_reqtimeout.
      [Stefan Fritsch]
 
+  *) core: Log a warning if <Limit> or <LimitExcept> are used. They are
+     deprecated and may go away in 2.4. [Stefan Fritsch]
+
   *) mod_ssl: Log certificate information if client cert verification
      fails. PR 50094. [Lassi Tuura <lat cern ch>, Stefan Fritsch]
 
@@ -63,6 +66,7 @@ Changes with Apache 2.3.9
 
   *) core/mod_unique_id: Add generate_log_id hook to allow to use
      the ID generated by mod_unique_id as error log ID for requests.
+     [Stefan Fritsch]
 
   *) mod_cache: Make sure that we never allow a 304 Not Modified response
      that we asked for to leak to the client should the 304 response be

diff --git a/server/core.c b/server/core.c
index 50f82029f7eb5d4a79abe528c4bb62a0232ec5b0..236067c12a135c281fda517e829a45eaa28099c7 100644 (file)
--- a/server/core.c
+++ b/server/core.c
@@ -1664,6 +1664,12 @@ AP_CORE_DECLARE_NONSTD(const char *) ap_limit_section(cmd_parms *cmd,
         return unclosed_directive(cmd);
     }
 
+    ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL,
+                 "%s:%d: <Limit> and <LimitExcept> are deprecated and "
+                 "will likely be removed in 2.4. Use 'Require method', "
+                 "mod_allow_method, or <If> instead.",
+                 cmd->directive->filename, cmd->directive->line_num);
+
     limited_methods = apr_pstrndup(cmd->pool, arg, endp - arg);
 
     if (!limited_methods[0]) {
@@ -3386,11 +3392,11 @@ AP_INIT_RAW_ARGS("<Files", filesection, NULL, OR_ALL,
   "Container for directives affecting files matching specified patterns"),
 AP_INIT_RAW_ARGS("<Limit", ap_limit_section, NULL, OR_LIMIT | OR_AUTHCFG,
   "Container for authentication directives when accessed using specified HTTP "
-  "methods"),
+  "methods (DEPRECATED)"),
 AP_INIT_RAW_ARGS("<LimitExcept", ap_limit_section, (void*)1,
                  OR_LIMIT | OR_AUTHCFG,
   "Container for authentication directives to be applied when any HTTP "
-  "method other than those specified is used to access the resource"),
+  "method other than those specified is used to access the resource (DEPRECATED)"),
 AP_INIT_TAKE1("<IfModule", start_ifmod, NULL, EXEC_ON_READ | OR_ALL,
   "Container for directives based on existence of specified modules"),
 AP_INIT_TAKE1("<IfDefine", start_ifdefine, NULL, EXEC_ON_READ | OR_ALL,