From: André Malo <nd@apache.org>
Date: Tue, 28 Jan 2003 15:57:38 +0000 (+0000)
Subject: Fix "Satisfy Any" logic. The access_checker has nothing to do with
X-Git-Tag: pre_ajp_proxy~2204
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=53b508b387c45f1d1689546335ee673cfaf43083;p=apache

Fix "Satisfy Any" logic. The access_checker has nothing to do with
auth_type.

Related PR: 9076


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98516 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 4dd2886797..e61895fe60 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) Fix bug where 'Satisfy Any' without an AuthType lost all MIME
+     information (and more). Related to PR 9076.  [André Malo]
+
   *) mod_negotiation: Introduce "prefer-language" environment variable,
      which allows to influence the negotiation process on request basis
      to prefer a certain language.  [André Malo]
diff --git a/server/request.c b/server/request.c
index b255e8b828..66ead012cd 100644
--- a/server/request.c
+++ b/server/request.c
@@ -251,13 +251,9 @@ AP_DECLARE(int) ap_process_request_internal(request_rec *r)
             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)