You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2008/04/06 02:42:24 UTC
svn commit: r645189 - in /httpd/httpd/trunk/modules: generators/mod_suexec.c
http/http_core.c metadata/mod_ident.c proxy/mod_proxy.c
Author: wrowe
Date: Sat Apr 5 17:42:21 2008
New Revision: 645189
URL: http://svn.apache.org/viewvc?rev=645189&view=rev
Log:
If you study all of the directive implementations, you'll note
that we get less than 20% of the NOT_IN_LIMIT rules correct.
<Limit > works in about 4 directive contexts and yet, we ignore
this fact for 100's of directives. Simply eliminate this
nonsense in anticipation of a 100% solution.
Modified:
httpd/httpd/trunk/modules/generators/mod_suexec.c
httpd/httpd/trunk/modules/http/http_core.c
httpd/httpd/trunk/modules/metadata/mod_ident.c
httpd/httpd/trunk/modules/proxy/mod_proxy.c
Modified: httpd/httpd/trunk/modules/generators/mod_suexec.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/generators/mod_suexec.c?rev=645189&r1=645188&r2=645189&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/generators/mod_suexec.c (original)
+++ httpd/httpd/trunk/modules/generators/mod_suexec.c Sat Apr 5 17:42:21 2008
@@ -60,7 +60,7 @@
const char *uid, const char *gid)
{
suexec_config_t *cfg = (suexec_config_t *) mconfig;
- const char *err = ap_check_cmd_context(cmd, NOT_IN_DIR_LOC_FILE|NOT_IN_LIMIT);
+ const char *err = ap_check_cmd_context(cmd, NOT_IN_DIR_LOC_FILE);
if (err != NULL) {
return err;
Modified: httpd/httpd/trunk/modules/http/http_core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http/http_core.c?rev=645189&r1=645188&r2=645189&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http/http_core.c (original)
+++ httpd/httpd/trunk/modules/http/http_core.c Sat Apr 5 17:42:21 2008
@@ -49,7 +49,7 @@
static const char *set_keep_alive_timeout(cmd_parms *cmd, void *dummy,
const char *arg)
{
- const char *err = ap_check_cmd_context(cmd, NOT_IN_DIR_LOC_FILE|NOT_IN_LIMIT);
+ const char *err = ap_check_cmd_context(cmd, NOT_IN_DIR_LOC_FILE);
if (err != NULL) {
return err;
}
@@ -61,7 +61,7 @@
static const char *set_keep_alive(cmd_parms *cmd, void *dummy,
const char *arg)
{
- const char *err = ap_check_cmd_context(cmd, NOT_IN_DIR_LOC_FILE|NOT_IN_LIMIT);
+ const char *err = ap_check_cmd_context(cmd, NOT_IN_DIR_LOC_FILE);
if (err != NULL) {
return err;
}
@@ -81,7 +81,7 @@
static const char *set_keep_alive_max(cmd_parms *cmd, void *dummy,
const char *arg)
{
- const char *err = ap_check_cmd_context(cmd, NOT_IN_DIR_LOC_FILE|NOT_IN_LIMIT);
+ const char *err = ap_check_cmd_context(cmd, NOT_IN_DIR_LOC_FILE);
if (err != NULL) {
return err;
}
Modified: httpd/httpd/trunk/modules/metadata/mod_ident.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/metadata/mod_ident.c?rev=645189&r1=645188&r2=645189&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/metadata/mod_ident.c (original)
+++ httpd/httpd/trunk/modules/metadata/mod_ident.c Sat Apr 5 17:42:21 2008
@@ -243,26 +243,18 @@
static const char *set_idcheck(cmd_parms *cmd, void *d_, int arg)
{
ident_config_rec *d = d_;
- const char *err = ap_check_cmd_context(cmd, NOT_IN_LIMIT);
- if (!err) {
- d->do_rfc1413 = arg ? 1 : 0;
- }
-
- return err;
+ d->do_rfc1413 = arg ? 1 : 0;
+ return NULL;
}
static const char *set_timeout(cmd_parms *cmd, void *d_, const char *arg)
{
ident_config_rec *d = d_;
- const char *err = ap_check_cmd_context(cmd, NOT_IN_LIMIT);
-
- if (!err) {
- d->timeout = apr_time_from_sec(atoi(arg));
- d->timeout_unset = 0;
- }
- return err;
+ d->timeout = apr_time_from_sec(atoi(arg));
+ d->timeout_unset = 0;
+ return NULL;
}
static void *create_ident_dir_config(apr_pool_t *p, char *d)
Modified: httpd/httpd/trunk/modules/proxy/mod_proxy.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy.c?rev=645189&r1=645188&r2=645189&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy.c Sat Apr 5 17:42:21 2008
@@ -1908,8 +1908,7 @@
proxy_balancer *balancer = NULL;
proxy_worker *worker = NULL;
- const char *err = ap_check_cmd_context(cmd,
- NOT_IN_DIR_LOC_FILE|NOT_IN_LIMIT);
+ const char *err = ap_check_cmd_context(cmd, NOT_IN_DIR_LOC_FILE);
proxy_server_conf *sconf =
(proxy_server_conf *) ap_get_module_config(cmd->server->module_config, &proxy_module);