Mailing List Archive

akosut 96/12/30 21:48:02

Modified: src CHANGES http_core.c
Log:
Correctly set overrides for <Files> sections.

Reviewed by: Randy Terbush, Chuck Murcko

Revision Changes Path
1.110 +3 -0 apache/src/CHANGES

Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.109
retrieving revision 1.110
diff -C3 -r1.109 -r1.110
*** CHANGES 1996/12/31 05:38:47 1.109
--- CHANGES 1996/12/31 05:48:00 1.110
***************
*** 1,5 ****
--- 1,8 ----
Changes with Apache 1.2b5

+ *) Correctly allow access and auth directives in <Files> sections in
+ server config files. [Alexei Kosut]
+
*) Fix bug with ServerPath that could cause certaub files to be not
found by the server. [Alexei Kosut]




1.56 +5 -0 apache/src/http_core.c

Index: http_core.c
===================================================================
RCS file: /export/home/cvs/apache/src/http_core.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -C3 -r1.55 -r1.56
*** http_core.c 1996/12/31 05:38:48 1.55
--- http_core.c 1996/12/31 05:48:01 1.56
***************
*** 685,690 ****
--- 685,691 ----
{
const char *errmsg;
char *endp = strrchr (arg, '>');
+ int old_overrides = cmd->override;
char *old_path = cmd->path;
core_dir_config *conf;
regex_t *r = NULL;
***************
*** 696,701 ****
--- 697,705 ----
if (cmd->limited != -1) return "Can't have <Files> within <Limit>";

cmd->path = getword_conf (cmd->pool, &arg);
+ /* Only if not an .htaccess file */
+ if (cmd->path)
+ cmd->override = OR_ALL|ACCESS_CONF;

if (!strcmp(cmd->path, "~")) {
cmd->path = getword_conf (cmd->pool, &arg);
***************
*** 716,721 ****
--- 720,726 ----
add_file_conf (c, new_file_conf);

cmd->path = old_path;
+ cmd->override = old_overrides;

return NULL;
}