(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 39a70158bfd8212c8afb46bca8cc8a3f7b3006b2..94d16143107549febc7d682f8b9bd8523445fc1b 100644 (file)
--- 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 edbd7c26554b726affdde580d4d195684d529fd1..61bec0d60c247b169502fb1cd8903ac10dbb39de 100644 (file)
--- 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)) {