httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0/server request.c
Date Mon, 06 Aug 2001 05:07:34 GMT
wrowe       01/08/05 22:07:34

  Modified:    server   request.c
  Log:
    Just a little cleaner.
  
  Revision  Changes    Path
  1.20      +19 -10    httpd-2.0/server/request.c
  
  Index: request.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/request.c,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- request.c	2001/08/06 02:27:26	1.19
  +++ request.c	2001/08/06 05:07:34	1.20
  @@ -1236,7 +1236,6 @@
   static int sub_req_common_validation(request_rec *rnew)
   {
       int res;
  -
       if (((   ap_satisfies(rnew) == SATISFY_ALL
                || ap_satisfies(rnew) == SATISFY_NOSPEC)
               ? ((res = ap_run_access_checker(rnew))
  @@ -1453,12 +1452,17 @@
            * do a file_walk, if it doesn't change the per_dir_config then
            * we know that we don't have to redo all the access checks
            */
  -        if ((res = file_walk(rnew) == OK)
  -            && (rnew->per_dir_config == r->per_dir_config)
  -            && (res = ap_run_type_checker(rnew)) == OK 
  -            && (res = ap_run_fixups(rnew)) == OK) {
  +        if ((res = file_walk(rnew))) {
  +            rnew->status = res;
               return rnew;
           }
  +        if (rnew->per_dir_config == r->per_dir_config) {
  +            if ((res = ap_run_type_checker(rnew)) 
  +                    || (res = ap_run_fixups(rnew))) {
  +                rnew->status = res;
  +            }
  +            return rnew;
  +        }  
       }
       else {
           ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, rnew,
  @@ -1555,12 +1559,17 @@
                * do a file_walk, if it doesn't change the per_dir_config then
                * we know that we don't have to redo all the access checks
                */
  -            if ((res = file_walk(rnew) == OK)
  -                && (rnew->per_dir_config == r->per_dir_config)
  -                && (res = ap_run_type_checker(rnew)) == OK 
  -                && (res = ap_run_fixups(rnew)) == OK) {
  -                return rnew;
  +        if ((res = file_walk(rnew))) {
  +            rnew->status = res;
  +            return rnew;
  +        }
  +        if (rnew->per_dir_config == r->per_dir_config) {
  +            if ((res = ap_run_type_checker(rnew)) 
  +                    || (res = ap_run_fixups(rnew))) {
  +                rnew->status = res;
               }
  +            return rnew;
  +        }  
           }
           else {
               ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, rnew,
  
  
  

Mime
View raw message