From: André Malo <nd@apache.org>
Date: Fri, 31 Jan 2003 02:25:36 +0000 (+0000)
Subject: (backport from 2.x)
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69477813e4d56c1296d06dd74e8c276c0bc58397;p=thirdparty%2Fapache%2Fhttpd.git

(backport from 2.x)
Fix "Satisfy Any" logic. The access_checker has nothing to do with
auth_type.

PR: 9076


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@98555 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/src/CHANGES b/src/CHANGES
index 39a70158bfd..94d16143107 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -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]
diff --git a/src/main/http_request.c b/src/main/http_request.c
index edbd7c26554..61bec0d60c2 100644
--- a/src/main/http_request.c
+++ b/src/main/http_request.c
@@ -1267,12 +1267,9 @@ static void process_request_internal(request_rec *r)
         }
         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)) {