diff options
Diffstat (limited to 'server/core.c')
| -rw-r--r-- | server/core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/server/core.c b/server/core.c index 0e479b0c..3b1b01b7 100644 --- a/server/core.c +++ b/server/core.c @@ -1356,8 +1356,8 @@ static const char *set_override(cmd_parms *cmd, void *d_, const char *l) /* Throw a warning if we're in <Location> or <Files> */ if (ap_check_cmd_context(cmd, NOT_IN_LOCATION | NOT_IN_FILES)) { ap_log_error(APLOG_MARK, APLOG_WARNING, 0, cmd->server, - "Useless use of AllowOverride in line %d.", - cmd->directive->line_num); + "Useless use of AllowOverride in line %d of %s.", + cmd->directive->line_num, cmd->directive->filename); } d->override = OR_NONE; @@ -1458,7 +1458,7 @@ static const char *set_options(cmd_parms *cmd, void *d_, const char *l) return apr_pstrcat(cmd->pool, "Illegal option ", w, NULL); } - if (!(cmd->override_opts & opt) && opt != OPT_NONE) { + if ( (cmd->override_opts & opt) != opt ) { return apr_pstrcat(cmd->pool, "Option ", w, " not allowed here", NULL); } else if (action == '-') { |