Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Date: 29 Oct 2001 19:25:08 -0000
Message-ID: <20011029192508.82067.qmail@icarus.apache.org>
From: aaron@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0/modules/aaa mod_access.c

aaron       01/10/29 11:25:08

  Modified:    modules/aaa mod_access.c
  Log:
  Mixed tabs and spaces within many nexted {}-less if-else expressions
  can be very difficult to read. No logic was changed.
  
  Revision  Changes    Path
  1.36      +20 -21    httpd-2.0/modules/aaa/mod_access.c
  
  Index: mod_access.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/aaa/mod_access.c,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- mod_access.c	2001/10/23 21:02:03	1.35
  +++ mod_access.c	2001/10/29 19:25:08	1.36
  @@ -294,37 +294,36 @@
   static int check_dir_access(request_rec *r)
   {
       int method = r->method_number;
  -    access_dir_conf *a =
  -    (access_dir_conf *)
  -    ap_get_module_config(r->per_dir_config, &access_module);
       int ret = OK;
  +    access_dir_conf *a = (access_dir_conf *)
  +        ap_get_module_config(r->per_dir_config, &access_module);
   
       if (a->order[method] == ALLOW_THEN_DENY) {
  -	ret = HTTP_FORBIDDEN;
  -	if (find_allowdeny(r, a->allows, method))
  -	    ret = OK;
  -	if (find_allowdeny(r, a->denys, method))
  -	    ret = HTTP_FORBIDDEN;
  +        ret = HTTP_FORBIDDEN;
  +        if (find_allowdeny(r, a->allows, method))
  +            ret = OK;
  +        if (find_allowdeny(r, a->denys, method))
  +            ret = HTTP_FORBIDDEN;
       }
       else if (a->order[method] == DENY_THEN_ALLOW) {
  -	if (find_allowdeny(r, a->denys, method))
  -	    ret = HTTP_FORBIDDEN;
  -	if (find_allowdeny(r, a->allows, method))
  -	    ret = OK;
  +        if (find_allowdeny(r, a->denys, method))
  +            ret = HTTP_FORBIDDEN;
  +        if (find_allowdeny(r, a->allows, method))
  +            ret = OK;
       }
       else {
  -	if (find_allowdeny(r, a->allows, method)
  -	    && !find_allowdeny(r, a->denys, method))
  -	    ret = OK;
  -	else
  -	    ret = HTTP_FORBIDDEN;
  +        if (find_allowdeny(r, a->allows, method)
  +            && !find_allowdeny(r, a->denys, method))
  +            ret = OK;
  +        else
  +            ret = HTTP_FORBIDDEN;
       }
   
       if (ret == HTTP_FORBIDDEN
  -	&& (ap_satisfies(r) != SATISFY_ANY || !ap_some_auth_required(r))) {
  -	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  -		  "client denied by server configuration: %s",
  -		  r->filename);
  +        && (ap_satisfies(r) != SATISFY_ANY || !ap_some_auth_required(r))) {
  +        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +            "client denied by server configuration: %s",
  +            r->filename);
       }
   
       return ret;