httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Alexei Kosut <ako...@nueva.pvt.k12.ca.us>
Subject Re: auto-updated apache docs on wbesite
Date Sun, 22 Dec 1996 08:49:58 GMT
On Sat, 21 Dec 1996, Brian Behlendorf wrote:

> > <Files /export/pub/apache/manual/*.pl>
> > deny from all
> > </Directory>
> 
> Presuming you meant "</Files>" here, I got

Um... yeah.

>   Syntax error on line 55 of /usr/local/www.tools/apache/conf/access.conf:
>   deny not allowed here
> 
> When I tried to start the server.  I thought deny was allowed inside of
> <Files>?

Darnit... I thought we had fixed that. Guess we never got around to
it. The problem is that since <Files> can be in both .htaccess files
and server conf files, I had it just inherit the overrides semantics
of its owner. The problem here is that server conf files can't have
order, allow, deny, etc... so they can't exist in <Files>. Which doesn't
make sense.

Here's a fix:

Index: http_core.c
===================================================================
RCS file: /export/home/cvs/apache/src/http_core.c,v
retrieving revision 1.53
diff -c -r1.53 http_core.c
*** http_core.c	1996/12/17 20:30:46	1.53
--- http_core.c	1996/12/22 08:49:07
***************
*** 681,686 ****
--- 681,687 ----
  {
      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;
***************
*** 692,697 ****
--- 693,701 ----
      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);
***************
*** 712,717 ****
--- 716,722 ----
      add_file_conf (c, new_file_conf);
      
      cmd->path = old_path;
+     cmd->override = old_overrides;
  
      return NULL;
  }


-- 
________________________________________________________________________
Alexei Kosut <akosut@nueva.pvt.k12.ca.us>      The Apache HTTP Server
URL: http://www.nueva.pvt.k12.ca.us/~akosut/   http://www.apache.org/


Mime
View raw message