httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n.@apache.org
Subject cvs commit: apache-1.3/src/main http_request.c
Date Fri, 31 Jan 2003 02:25:37 GMT
nd          2003/01/30 18:25:37

  Modified:    src      CHANGES
               src/main http_request.c
  Log:
  (backport from 2.x)
  Fix "Satisfy Any" logic. The access_checker has nothing to do with
  auth_type.
  
  PR: 9076
  
  Revision  Changes    Path
  1.1874    +3 -0      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1873
  retrieving revision 1.1874
  diff -u -r1.1873 -r1.1874
  --- CHANGES	26 Jan 2003 22:46:30 -0000	1.1873
  +++ CHANGES	31 Jan 2003 02:25:36 -0000	1.1874
  @@ -1,5 +1,8 @@
   Changes with Apache 1.3.28
   
  +  *) Fix bug where 'Satisfy Any' without an AuthType resulted in an
  +     "Internal Server Error" response. PR 9076.  [André Malo]
  +
     *) mod_rewrite: Allow "RewriteEngine Off" even if no
        "Options FollowSymlinks" (or SymlinksIfOwnermatch) is set.
        PR 12395.  [André Malo]
  
  
  
  1.167     +2 -5      apache-1.3/src/main/http_request.c
  
  Index: http_request.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/main/http_request.c,v
  retrieving revision 1.166
  retrieving revision 1.167
  diff -u -r1.166 -r1.167
  --- http_request.c	21 May 2002 12:50:09 -0000	1.166
  +++ http_request.c	31 Jan 2003 02:25:36 -0000	1.167
  @@ -1267,12 +1267,9 @@
           }
           break;
       case SATISFY_ANY:
  -        if (((access_status = ap_check_access(r)) != 0) || !ap_auth_type(r)) {
  +        if (((access_status = ap_check_access(r)) != 0)) {
               if (!ap_some_auth_required(r)) {
  -                decl_die(access_status ? access_status :
  -			 HTTP_INTERNAL_SERVER_ERROR,
  -			 ap_auth_type(r) ? "check access"
  -		    : "perform authentication. AuthType not set!", r);
  +                decl_die(access_status, "check access", r);
                   return;
               }
               if (((access_status = ap_check_user_id(r)) != 0) || !ap_auth_type(r)) {
  
  
  

Mime
View raw message