svn commit: r359929 - /httpd/httpd/branches/authz-dev/server/request.c

[bn...@apache.org]

Author: bnicholes
Date: Thu Dec 29 16:00:31 2005
New Revision: 359929

URL: http://svn.apache.org/viewcvs?rev=359929&view=rev
Log:
Remove all of the Satisfy functionality from the request handing.  All the various auth hooks to be called all of the time without restriction

Modified:
    httpd/httpd/branches/authz-dev/server/request.c

Modified: httpd/httpd/branches/authz-dev/server/request.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/authz-dev/server/request.c?rev=359929&r1=359928&r2=359929&view=diff
==============================================================================
--- httpd/httpd/branches/authz-dev/server/request.c (original)
+++ httpd/httpd/branches/authz-dev/server/request.c Thu Dec 29 16:00:31 2005
@@ -183,6 +183,19 @@
         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 @@
             }
             break;
         }
+*/        
     }
     /* XXX Must make certain the ap_run_type_checker short circuits mime
      * in mod-proxy for r->proxyreq && r->parsed_uri.scheme