httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Ed Korthof ...@organic.com>
Subject Re: [PATCH] fix for satisfy merging
Date Mon, 03 Feb 1997 01:14:38 GMT
Eh, yeah.  See below for patch.  <snicker self>

     -- Ed Korthof        |  Web Server Engineer --
     -- ed@organic.com    |  Organic Online, Inc --
     -- (415) 278-5676    |  Fax: (415) 284-6891 --

On Sun, 2 Feb 1997, Dean Gaudet wrote:

> You're not missing anything, that's my fault for doing too many things at
> once last night.  My message should have said "here's where this should be
> fixed I'm doing something else right now though" :)  You forgot to include
> your patch.
> 
> Dean

*** http_core.c.t	Sun Feb  2 16:19:02 1997
--- http_core.c	Sun Feb  2 16:22:04 1997
***************
*** 92,98 ****
  
      conf->hostname_lookups = 2;/* binary, but will use 2 as an "unset = on" */
      conf->do_rfc1413 = DEFAULT_RFC1413 | 2;  /* set bit 1 to indicate default */
!     conf->satisfy = SATISFY_ALL;
  
  #ifdef RLIMIT_CPU
      conf->limit_cpu = NULL;
--- 92,98 ----
  
      conf->hostname_lookups = 2;/* binary, but will use 2 as an "unset = on" */
      conf->do_rfc1413 = DEFAULT_RFC1413 | 2;  /* set bit 1 to indicate default */
!     conf->satisfy = SATISFY_NOSPEC;
  
  #ifdef RLIMIT_CPU
      conf->limit_cpu = NULL;
***************
*** 153,159 ****
  
      conf->sec = append_arrays (a, base->sec, new->sec);
  
!     conf->satisfy = new->satisfy;
      return (void*)conf;
  }
  
--- 153,159 ----
  
      conf->sec = append_arrays (a, base->sec, new->sec);
  
!     if (new->satisfy != SATISFY_NOSPEC) conf->satisfy = new->satisfy;
      return (void*)conf;
  }
  
*** http_request.c.t	Sun Feb  2 16:18:21 1997
--- http_request.c	Sun Feb  2 16:16:25 1997
***************
*** 658,664 ****
      if ((res = directory_walk (rnew))
  	|| (res = file_walk (rnew))
  	|| (res = location_walk (rnew))
!         || (satisfies(rnew) == SATISFY_ALL?
  	    ((res = check_access (rnew))
  	     || (some_auth_required (rnew) &&
  		 ((res = check_user_id (rnew)) || (res = check_auth (rnew))))):
--- 658,664 ----
      if ((res = directory_walk (rnew))
  	|| (res = file_walk (rnew))
  	|| (res = location_walk (rnew))
!         || ((satisfies(rnew)==SATISFY_ALL || satisfies(rnew)==SATISFY_NOSPEC)?
  	    ((res = check_access (rnew))
  	     || (some_auth_required (rnew) &&
  		 ((res = check_user_id (rnew)) || (res = check_auth (rnew))))):
***************
*** 706,712 ****
  	
      if ((res = directory_walk (rnew))
  	|| (res = file_walk (rnew))
! 	|| (satisfies(rnew) == SATISFY_ALL?
  	    ((res = check_access (rnew))
  	     || (some_auth_required (rnew) &&
  		 ((res = check_user_id (rnew)) || (res = check_auth (rnew))))):
--- 706,712 ----
  	
      if ((res = directory_walk (rnew))
  	|| (res = file_walk (rnew))
!         || ((satisfies(rnew)==SATISFY_ALL || satisfies(rnew)==SATISFY_NOSPEC)?
  	    ((res = check_access (rnew))
  	     || (some_auth_required (rnew) &&
  		 ((res = check_user_id (rnew)) || (res = check_auth (rnew))))):
***************
*** 915,921 ****
      }
      
      switch (satisfies(r)) {
!     case SATISFY_ALL:
  	if ((access_status = check_access (r)) != 0) {
  	    decl_die (access_status, "check access", r);
  	    return;
--- 915,921 ----
      }
      
      switch (satisfies(r)) {
!     case SATISFY_ALL: case SATISFY_NOSPEC:
  	if ((access_status = check_access (r)) != 0) {
  	    decl_die (access_status, "check access", r);
  	    return;
*** http_core.h.t	Sun Feb  2 16:11:50 1997
--- http_core.h	Sun Feb  2 16:12:53 1997
***************
*** 80,85 ****
--- 80,86 ----
  
  #define SATISFY_ALL 0
  #define SATISFY_ANY 1
+ #define SATISFY_NOSPEC 2
  
  int allow_options (request_rec *);
  int allow_overrides (request_rec *);


Mime
View raw message