You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by sf...@apache.org on 2010/10/19 19:44:36 UTC
svn commit: r1024337 - in /httpd/httpd/trunk: CHANGES server/core.c
Author: sf
Date: Tue Oct 19 17:44:36 2010
New Revision: 1024337
URL: http://svn.apache.org/viewvc?rev=1024337&view=rev
Log:
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.
Modified:
httpd/httpd/trunk/CHANGES
httpd/httpd/trunk/server/core.c
Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1024337&r1=1024336&r2=1024337&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Tue Oct 19 17:44:36 2010
@@ -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]
Modified: httpd/httpd/trunk/server/core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/core.c?rev=1024337&r1=1024336&r2=1024337&view=diff
==============================================================================
--- httpd/httpd/trunk/server/core.c (original)
+++ httpd/httpd/trunk/server/core.c Tue Oct 19 17:44:36 2010
@@ -1664,12 +1664,6 @@ AP_CORE_DECLARE_NONSTD(const char *) ap_
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,
"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,