diff options
author | Bradley Nicholes <bnicholes@apache.org> | 2005-12-30 00:00:31 +0000 |
---|---|---|
committer | Bradley Nicholes <bnicholes@apache.org> | 2005-12-30 00:00:31 +0000 |
commit | 3dd929ba4314e710f79e6ecc8315cab7273a0502 (patch) | |
tree | ac4471b9c15b96acc547fd61ccf79b1058b45b1d | |
parent | 1ede741ac573f805f5185afe1bff935311a43f31 (diff) | |
download | httpd-3dd929ba4314e710f79e6ecc8315cab7273a0502.tar.gz |
Remove all of the Satisfy functionality from the request handing. All the various auth hooks to be called all of the time without restriction
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/authz-dev@359929 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | server/request.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/server/request.c b/server/request.c index e62467a358..de69b3c769 100644 --- a/server/request.c +++ b/server/request.c @@ -183,6 +183,19 @@ AP_DECLARE(int) ap_process_request_internal(request_rec *r) r->ap_auth_type = r->prev->ap_auth_type; } else { + if ((access_status = ap_run_access_checker(r)) != 0) { + return decl_die(access_status, "check access", r); + } + + if ((access_status = ap_run_check_user_id(r)) != 0) { + return decl_die(access_status, "check user", r); + } + + if ((access_status = ap_run_auth_checker(r)) != 0) { + return decl_die(access_status, "check authorization", r); + } + +/* switch (ap_satisfies(r)) { case SATISFY_ALL: case SATISFY_NOSPEC: @@ -228,6 +241,7 @@ AP_DECLARE(int) ap_process_request_internal(request_rec *r) } break; } +*/ } /* XXX Must make certain the ap_run_type_checker short circuits mime * in mod-proxy for r->proxyreq && r->parsed_uri.scheme |