--- loncom/loncapa_apache.conf	2010/03/19 22:11:46	1.185.8.2
+++ loncom/loncapa_apache.conf	2009/07/07 19:50:44	1.186
@@ -1,7 +1,7 @@
 ##
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
-## $Id: loncapa_apache.conf,v 1.185.8.2 2010/03/19 22:11:46 raeburn Exp $
+## $Id: loncapa_apache.conf,v 1.186 2009/07/07 19:50:44 droeschl Exp $
 ##
 
 #
@@ -55,12 +55,6 @@ PerlSetVar lonOtherAuthen no
 PerlAuthenHandler	'sub { return OK }' 
 </LocationMatch>
 
-# Send proper expires header to avoid unnecessary HTTP request for static content
-<LocationMatch "^(/adm/lonIcons|/adm/jQuery|/adm/jsMath|/res/adm/pages|/fckeditor)">
-        ExpiresActive On
-        ExpiresDefault "access plus 12 hours"
-</LocationMatch>
-
 <LocationMatch "^/+res.*">
 
 AuthType LONCAPA
@@ -105,24 +99,17 @@ SetHandler perl-script
 PerlHandler Apache::portfolio
 </Location>
 
-<Location /adm/pdfupload>
-AuthType LONCAPA
-Require valid-user
-PerlAuthzHandler Apache::lonacc
-SetHandler perl-script
-PerlHandler             Apache::lonpdfupload
-ErrorDocument     403 /adm/login
-ErrorDocument     404 /adm/notfound.html
-ErrorDocument     406 /adm/roles
-ErrorDocument     500 /adm/errorhandler
-</Location>
-
 <LocationMatch "^/+userfiles.*">
 PerlAccessHandler       Apache::lontokacc
 PerlCleanupHandler	Apache::lontokacc::removefile
 PerlCleanupHandler	Apache::lonacc::cleanup
 </LocationMatch>
 
+<LocationMatch "^/pdfupload.*">
+SetHandler perl-script
+PerlHandler             Apache::lonpdfupload
+</LocationMatch>
+
 <LocationMatch "^/+uploaded.*">
 AuthType LONCAPA
 Require valid-user
@@ -540,17 +527,6 @@ ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
-<Location /adm/pickuser>
-AuthType LONCAPA
-Require valid-user
-PerlAuthzHandler       Apache::lonacc
-SetHandler perl-script
-PerlHandler Apache::lonpickuser
-ErrorDocument     403 /adm/login
-ErrorDocument     406 /adm/roles
-ErrorDocument     500 /adm/errorhandler
-</Location>
-
 <Location /adm/pickcourse>
 AuthType LONCAPA
 Require valid-user
@@ -757,17 +733,6 @@ ErrorDocument     406 /adm/roles
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
-<Location /adm/requestcourse>
-AuthType LONCAPA
-Require valid-user
-PerlAuthzHandler       Apache::lonacc
-SetHandler perl-script
-PerlHandler Apache::lonrequestcourse
-ErrorDocument     403 /adm/login
-ErrorDocument     406 /adm/roles
-ErrorDocument     500 /adm/errorhandler
-</Location>
-
 <Location /adm/createcourse>
 AuthType LONCAPA
 Require valid-user
@@ -1234,6 +1199,16 @@ PerlCleanupHandler	Apache::lonacc::clean
 ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
+
+<Location /adm/blockingstatus>
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lonblockingstatus
+ErrorDocument     403 /adm/login
+ErrorDocument	  500 /adm/errorhandler
+</Location>
 
 <Location /adm/errorhandler>
 SetHandler perl-script