You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by nd...@apache.org on 2003/01/28 16:57:39 UTC
cvs commit: httpd-2.0/server request.c
nd 2003/01/28 07:57:39
Modified: . CHANGES
server request.c
Log:
Fix "Satisfy Any" logic. The access_checker has nothing to do with
auth_type.
Related PR: 9076
Revision Changes Path
1.1041 +3 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.1040
retrieving revision 1.1041
diff -u -r1.1040 -r1.1041
--- CHANGES 28 Jan 2003 03:16:04 -0000 1.1040
+++ CHANGES 28 Jan 2003 15:57:36 -0000 1.1041
@@ -2,6 +2,9 @@
[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]
1.124 +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.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- request.c 23 Jan 2003 21:34:13 -0000 1.123
+++ request.c 28 Jan 2003 15:57:38 -0000 1.124
@@ -251,13 +251,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)