mirror of
https://github.com/apache/httpd.git
synced 2025-07-25 17:01:22 +00:00
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. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@645189 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
@ -60,7 +60,7 @@ static const char *set_suexec_ugid(cmd_parms *cmd, void *mconfig,
|
||||
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;
|
||||
|
@ -49,7 +49,7 @@ static int ap_process_http_connection(conn_rec *c);
|
||||
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_timeout(cmd_parms *cmd, void *dummy,
|
||||
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(cmd_parms *cmd, void *dummy,
|
||||
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;
|
||||
}
|
||||
|
@ -243,26 +243,18 @@ static apr_status_t rfc1413_query(apr_socket_t *sock, conn_rec *conn,
|
||||
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)
|
||||
|
@ -1908,8 +1908,7 @@ static const char *proxysection(cmd_parms *cmd, void *mconfig, const char *arg)
|
||||
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);
|
||||
|
||||
|
Reference in New Issue
Block a user