httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n.@apache.org
Subject cvs commit: httpd-2.0/server request.c
Date Fri, 31 Jan 2003 02:17:30 GMT
nd          2003/01/30 18:17:30

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES STATUS
               server   Tag: APACHE_2_0_BRANCH request.c
  Log:
  (backport from 2.1)
  Fix "Satisfy Any" logic. The access_checker has nothing to do with
  auth_type.
  
  Related PR: 9076
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.988.2.31 +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.30
  retrieving revision 1.988.2.31
  diff -u -r1.988.2.30 -r1.988.2.31
  --- CHANGES	30 Jan 2003 15:13:29 -0000	1.988.2.30
  +++ CHANGES	31 Jan 2003 02:17:28 -0000	1.988.2.31
  @@ -1,4 +1,8 @@
   Changes with Apache 2.0.45
  +
  +  *) Fix bug where 'Satisfy Any' without an AuthType lost all MIME
  +     information (and more). Related to PR 9076.  [André Malo]
  +
     *) mod_file_cache: fix segfault serving mmaped cached files.
        [Bill Stoddard]
   
  
  
  
  1.751.2.75 +1 -7      httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.74
  retrieving revision 1.751.2.75
  diff -u -r1.751.2.74 -r1.751.2.75
  --- STATUS	30 Jan 2003 18:07:17 -0000	1.751.2.74
  +++ STATUS	31 Jan 2003 02:17:29 -0000	1.751.2.75
  @@ -77,12 +77,6 @@
         modules/mappers/mod_negotiation.c r1.110
         +1: nd
   
  -    * Satisfy Any without an AuthType doesn't run type_checker and fixups
  -      in 2.x or causes a weird 500 in 1.3.x. (PR 9076)
  -      Please vote for 1.3 series, too. The patch is the essentially the same.
  -      server/request.c r1.124
  -      +1: nd, jerenkrantz, trawick
  -
       * Fix If header handling to ignore non-mod_dav locks. (PR 16452)
         modules/dav/main/util.c: r1.44
         +1: jerenkrantz, trawick
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.121.2.2 +2 -6      httpd-2.0/server/request.c
  
  Index: request.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/request.c,v
  retrieving revision 1.121.2.1
  retrieving revision 1.121.2.2
  diff -u -r1.121.2.1 -r1.121.2.2
  --- request.c	23 Dec 2002 09:03:55 -0000	1.121.2.1
  +++ request.c	31 Jan 2003 02:17:30 -0000	1.121.2.2
  @@ -242,13 +242,9 @@
               break;
   
           case SATISFY_ANY:
  -            if (((access_status = ap_run_access_checker(r)) != 0)
  -                || !ap_auth_type(r)) {
  +            if (((access_status = ap_run_access_checker(r)) != 0)) {
                   if (!ap_some_auth_required(r)) {
  -                    return decl_die(access_status, ap_auth_type(r)
  -                                  ? "check access"
  -                                  : "perform authentication. AuthType not set!",
  -                                  r);
  +                    return decl_die(access_status, "check access", r);
                   }
   
                   if (((access_status = ap_run_check_user_id(r)) != 0)
  
  
  

Mime
View raw message