From: Stefan Fritsch <sf@apache.org>
Date: Tue, 19 Oct 2010 17:44:36 +0000 (+0000)
Subject: revert r1023227 as discussed on httpd-dev:
X-Git-Tag: 2.3.9~270
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d5770e3da9c0c9020cdb518f9bd1d3859dd19183;p=apache

revert r1023227 as discussed on httpd-dev:

    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@1024337 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index cef43ef3f1..c5212cf398 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,9 +10,6 @@ Changes with Apache 2.3.9
      interfering with authentication/authorization. [Paul Querna,
      Igor Galić, 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]
 
diff --git a/server/core.c b/server/core.c
index 236067c12a..50f82029f7 100644
--- a/server/core.c
+++ b/server/core.c
@@ -1664,12 +1664,6 @@ 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]) {
@@ -3392,11 +3386,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 (DEPRECATED)"),
+  "methods"),
 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 (DEPRECATED)"),
+  "method other than those specified is used to access the resource"),
 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,