--- loncom/loncapa_apache.conf	2004/09/22 16:56:23	1.96
+++ loncom/loncapa_apache.conf	2010/08/20 20:33:24	1.185.8.3
@@ -1,7 +1,7 @@
 ##
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
-## $Id: loncapa_apache.conf,v 1.96 2004/09/22 16:56:23 albertel Exp $
+## $Id: loncapa_apache.conf,v 1.185.8.3 2010/08/20 20:33:24 raeburn Exp $
 ##
 
 #
@@ -35,7 +35,9 @@ ExtendedStatus On
 #
 # ===================================================================== Aliases
 
+Alias /zipspool/ /home/httpd/zipspool/
 Alias /prtspool/ /home/httpd/prtspool/
+Alias /captchaspool/ /home/httpd/captchaspool/
 ScriptAlias /cgi-bin/ "/home/httpd/cgi-bin/"
 
 # ================================================================= Directories
@@ -43,11 +45,29 @@ ScriptAlias /cgi-bin/ "/home/httpd/cgi-b
 # ------------------------------------------------------------- Access Handlers
 
 PerlTransHandler	Apache::lontrans
-PerlCleanupHandler	Apache::lonnet::save_cache
+PerlCleanupHandler	Apache::lonacc::cleanup
+
+PerlAuthenHandler Apache::checkauthen
+PerlSetVar lonOtherAuthen no
 
 #PerlWarn On
+<LocationMatch "^/+res/adm/pages/[^/]+\.(gif|png)$">
+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.*">
-PerlAccessHandler       Apache::lonacc
+
+AuthType LONCAPA
+Require valid-user
+
+PerlAccessHandler      Apache::publiccheck
+PerlAuthzHandler       Apache::lonacc
 PerlHeaderParserHandler Apache::lonrep
 ErrorDocument     403 /adm/login
 ErrorDocument     404 /adm/notfound.html
@@ -55,8 +75,14 @@ ErrorDocument     406 /adm/roles
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
+
+<LocationMatch "/.*">
+</LocationMatch>
+
+
 <LocationMatch "^/+enc.*">
-PerlAccessHandler       Apache::lonenc
+SetHandler perl-script
+PerlHandler       Apache::lonencurl
 ErrorDocument     403 /adm/login
 ErrorDocument     404 /adm/notfound.html
 ErrorDocument     406 /adm/roles
@@ -64,25 +90,45 @@ ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
 <Location /adm/portfolio>
-PerlAccessHandler Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::portfolio
 </Location>
 
-<LocationMatch "\.portfolio$">
+<Location /adm/coursegrp_portfolio>
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::portfolio
-</LocationMatch>
-
+</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 "^/+uploaded.*">
-PerlAccessHandler	Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler	Apache::lonacc
+PerlHandler 		Apache::londatecheck
+PerlHandler  		Apache::lonipcheck
 PerlHeaderParserHandler Apache::lonuploadrep
 ErrorDocument     403 /adm/login
 ErrorDocument     404 /adm/notfound.html
@@ -90,6 +136,35 @@ ErrorDocument     406 /adm/roles
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
+<LocationMatch "^/+editupload.*">
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler	Apache::lonacc
+ErrorDocument     403 /adm/login
+ErrorDocument     406 /adm/roles
+ErrorDocument	  500 /adm/errorhandler
+</LocationMatch>
+
+<LocationMatch "^/+uploaded/.*/.*/internal/.*">
+PerlAuthenHandler	Apache::lonuploadedacc
+PerlAuthzHandler	Apache::lonuploadedacc::skip_phase
+PerlAccessHandler	Apache::lonuploadedacc::skip_phase
+</LocationMatch>
+
+<LocationMatch "^/+uploaded/.*/.*/portfolio/.*">
+PerlAccessHandler      Apache::publiccheck
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+</LocationMatch>
+
+<LocationMatch "^/+uploaded/.*/.*/groups/.*/portfolio/.*">
+PerlAccessHandler      Apache::publiccheck
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+</LocationMatch>
+
 <LocationMatch "^/+uploaded/.*\.page$">
 SetHandler perl-script
 PerlHandler Apache::lonpage
@@ -101,15 +176,43 @@ PerlHandler Apache::lonsequence
 </LocationMatch>
 
 <LocationMatch "^/+public/.*/syllabus$">
-PerlAccessHandler	Apache::lonacc
+PerlAccessHandler      Apache::publiccheck
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler	Apache::lonacc
 SetHandler              perl-script
 PerlHandler             Apache::lonsyllabus
 ErrorDocument     404 /adm/notfound.html
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
+<LocationMatch "^/+(public|adm)/.*(\.rss|_rss\.html)$">
+PerlAccessHandler      Apache::publiccheck
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler	Apache::lonacc
+SetHandler              perl-script
+PerlHandler             Apache::lonrss
+ErrorDocument     404 /adm/notfound.html
+ErrorDocument	  500 /adm/errorhandler
+</LocationMatch>
+
 <LocationMatch "^/adm/.*/aboutme$">
-PerlAccessHandler	Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler	Apache::lonacc
+SetHandler              perl-script
+PerlHandler             Apache::lonaboutme
+ErrorDocument     404 /adm/notfound.html
+ErrorDocument     406 /adm/notinit.html
+ErrorDocument	  500 /adm/errorhandler
+</LocationMatch>
+
+<LocationMatch "^/adm/.*/aboutme/portfolio$">
+PerlAccessHandler       Apache::publiccheck
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler	Apache::lonacc
 SetHandler              perl-script
 PerlHandler             Apache::lonaboutme
 ErrorDocument     404 /adm/notfound.html
@@ -118,8 +221,12 @@ ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
 <LocationMatch "^/adm/.*/smppg$">
-PerlAccessHandler	Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler	Apache::lonacc
 SetHandler              perl-script
+PerlHandler             Apache::londatecheck
+PerlHandler		Apache::lonipcheck
 PerlHandler             Apache::lonsimplepage
 ErrorDocument     404 /adm/notfound.html
 ErrorDocument     406 /adm/notinit.html
@@ -127,9 +234,12 @@ ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
 <LocationMatch "^/adm/.*/bulletinboard$">
-PerlAccessHandler	Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler	Apache::lonacc
 SetHandler              perl-script
 PerlHandler             Apache::londatecheck
+PerlHandler		Apache::lonipcheck
 PerlHandler             Apache::lonbulletin
 ErrorDocument     404 /adm/notfound.html
 ErrorDocument     406 /adm/notinit.html
@@ -137,7 +247,9 @@ ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
 <LocationMatch "\.problem/smpedit$">
-PerlAccessHandler	Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler	Apache::lonacc
 SetHandler              perl-script
 PerlHandler             Apache::lonsimpleproblemedit
 ErrorDocument     404 /adm/notfound.html
@@ -146,7 +258,9 @@ ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
 <LocationMatch "^/+priv.*">
-PerlAccessHandler Apache::loncacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler Apache::loncacc
 SetHandler        perl-script
 PerlHandler       Apache::lonconstruct
 ErrorDocument     403 /adm/login
@@ -160,16 +274,19 @@ PerlAccessHandler Apache::lonracc
 </LocationMatch>
 
 <LocationMatch "^/+\~.*">
-PerlAccessHandler Apache::loncacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler Apache::loncacc
 ErrorDocument     403 /adm/login
 ErrorDocument     404 /adm/notfound.html
 ErrorDocument     406 /adm/unauthorized
 ErrorDocument	  500 /adm/errorhandler
-AllowOverride None
 </LocationMatch>
 
 <LocationMatch "^/adm/helper/.*\.helper$">
-PerlAccessHandler Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler  Apache::lonacc
 SetHandler        perl-script
 PerlHandler       Apache::lonhelper
 ErrorDocument     403 /adm/login
@@ -179,10 +296,24 @@ ErrorDocument     500 /adm/errorhandler
 </LocationMatch>
 
 <LocationMatch "/prtspool">
-PerlAccessHandler Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler Apache::lonacc
 ErrorDocument     403 /adm/login
 ErrorDocument     404 /adm/notfound.html
 ErrorDocument     406 /adm/roles
+ErrorDocument     413 /adm/overloaded.txt
+ErrorDocument	  500 /adm/errorhandler
+</LocationMatch>
+
+<LocationMatch "/zipspool">
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler Apache::lonacc
+ErrorDocument     403 /adm/login
+ErrorDocument     404 /adm/notfound.html
+ErrorDocument     406 /adm/roles
+ErrorDocument     413 /adm/overloaded.txt
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 # ------------------------------------------------------------------------- RAT
@@ -202,8 +333,15 @@ SetHandler perl-script
 PerlHandler Apache::lonratsrv
 </LocationMatch>
 
+<LocationMatch "^/\~.*\/adveditmenu$">
+SetHandler perl-script
+PerlHandler Apache::lonratmenu
+</LocationMatch>
+
 <Location /adm/ratparms>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonratparms
 ErrorDocument     403 /adm/login
@@ -216,6 +354,7 @@ ErrorDocument	  500 /adm/errorhandler
 SetHandler perl-script
 PerlHandler Apache::lonindexer
 PerlCleanupHandler Apache::lonindexer::cleanup
+PerlCleanupHandler	Apache::lonacc::cleanup
 </LocationMatch>
 
 <LocationMatch "^/+(res|\~).*\.tex$">
@@ -233,14 +372,18 @@ SetHandler perl-script
 PerlHandler Apache::lonsequence
 </LocationMatch>
 
-<LocationMatch "^/+(res|\~|public|uploaded|adm).*\.meta$">
+<LocationMatch "^/+(res|\~|public|uploaded|editupload|adm).*\.meta$">
+PerlAccessHandler      Apache::publiccheck
 SetHandler perl-script
 PerlHandler Apache::lonmeta
+ErrorDocument     413 /adm/overloaded.txt
 </LocationMatch>
 
 <LocationMatch "^/adm/bombs/">
+AuthType LONCAPA
+Require valid-user
 SetHandler perl-script
-PerlAccessHandler Apache::lonacc
+PerlAuthzHandler Apache::lonacc
 PerlHandler Apache::lonmeta
 </LocationMatch>
 
@@ -254,24 +397,36 @@ PerlHandler Apache::lonrights
 <LocationMatch "^/+(uploaded|res|\~).*\.(xml|html|htm|xhtml|xhtm|sty)$">
 SetHandler perl-script
 PerlHandler Apache::londatecheck
+PerlHandler Apache::lonipcheck
 PerlHandler Apache::lonxml
 </LocationMatch>
 
-<LocationMatch "^/+(res|\~).*\.(problem|exam|quiz|assess|survey|form|library)$">
+<LocationMatch "^/+(res|\~).*\.(task|problem|exam|quiz|assess|survey|form|library)$">
 SetHandler perl-script
 PerlHandler Apache::lonhomework
 </LocationMatch>
 
+<LocationMatch "^/+\~.*\.(js|css|txt)$">
+SetHandler perl-script
+PerlHandler Apache::lonxml
+</LocationMatch>
+
 <LocationMatch "^/adm/wrapper/">
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+PerlHandler Apache::londatecheck
+PerlHandler Apache::lonipcheck
 SetHandler perl-script
 PerlHandler Apache::lonwrapper
 ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
-<LocationMatch "^/adm/source/">
-PerlAccessHandler       Apache::lonacc
+<LocationMatch "^/adm/source">
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonsource
 ErrorDocument     403 /adm/login
@@ -281,9 +436,11 @@ ErrorDocument	  500 /adm/errorhandler
 
 
 <LocationMatch "^/adm/localize/">
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
-PerlHandler Apache::lonlocal
+PerlHandler Apache::lonlocalize
 ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
@@ -291,7 +448,9 @@ ErrorDocument	  500 /adm/errorhandler
 # -------------------------------------------------------------- Admin Programs
 
 <Location /adm/randomlabel.png>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::randomlylabel
 ErrorDocument     403 /adm/login
@@ -299,7 +458,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/imagechoice>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::imagechoice
 ErrorDocument     403 /adm/login
@@ -307,7 +468,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/statistics>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonstatistics
 ErrorDocument     403 /adm/login
@@ -316,7 +479,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/trackstudent>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lontrackstudent
 ErrorDocument     403 /adm/login
@@ -325,39 +490,71 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/roles>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonroles
 ErrorDocument     403 /adm/login
+ErrorDocument     409 /adm/preferences?action=lockwarning
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/menu>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
-PerlHandler Apache::lonmenu
+PerlHandler Apache::lonmainmenu
 ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/remote>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonremote
 ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
+<Location /adm/pickauthor>
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lonpickauthor
+ErrorDocument     403 /adm/login
+ErrorDocument     500 /adm/errorhandler
+</Location>
+
 <Location /adm/pickstudent>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonpickstudent
 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>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonpickcourse
 ErrorDocument     403 /adm/login
@@ -365,7 +562,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/pickcode>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonpickcode
 ErrorDocument     403 /adm/login
@@ -377,11 +576,45 @@ SetHandler perl-script
 PerlHandler Apache::lonlogin
 </Location>
 
+<Location /adm/restrictedaccess>
+PerlAccessHandler      Apache::publiccheck
+AuthType LONCAPA
+Require valid-user
+SetHandler perl-script
+PerlAuthzHandler       Apache::lonacc
+PerlHandler Apache::restrictedaccess
+ErrorDocument	  500 /adm/errorhandler
+</Location>
+
+<Location /adm/blockedaccess>
+PerlAccessHandler      Apache::publiccheck
+AuthType LONCAPA
+Require valid-user
+SetHandler perl-script
+PerlAuthzHandler       Apache::lonacc
+PerlHandler Apache::blockedaccess
+ErrorDocument     500 /adm/errorhandler
+</Location>
+
 <Location /adm/logout>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonlogout
 ErrorDocument     403 /adm/login
+ErrorDocument     409 /adm/preferences?action=lockwarning
+ErrorDocument	  500 /adm/errorhandler
+</Location>
+
+<Location /adm/switchserver>
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::switchserver
+ErrorDocument     403 /adm/login
+ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/authenticate>
@@ -389,8 +622,15 @@ SetHandler perl-script
 PerlHandler Apache::lonauth
 </Location>
 
+<Location /adm/migrateuser>
+SetHandler perl-script
+PerlHandler Apache::migrateuser
+</Location>
+
 <Location /adm/annotations>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::admannotations
 ErrorDocument     403 /adm/login
@@ -398,7 +638,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/spellcheck>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonspeller
 ErrorDocument     403 /adm/login
@@ -406,7 +648,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/bookmarks>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::admbookmarks
 ErrorDocument     403 /adm/login
@@ -414,34 +658,54 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/flip>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonpageflip
 PerlCleanupHandler Apache::lonpageflip::cleanup
+PerlCleanupHandler	Apache::lonacc::cleanup
 ErrorDocument     406 /adm/roles
 ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/ambiguous>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonambiguous
 PerlCleanupHandler Apache::lonambiguous::cleanup
+PerlCleanupHandler	Apache::lonacc::cleanup
 ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/email>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
-PerlHandler Apache::lonmsg
+PerlHandler Apache::lonmsgdisplay
 ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
+<Location /adm/notify>
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lonnotify
+ErrorDocument     403 /adm/login
+ErrorDocument     500 /adm/errorhandler
+</Location>
+
 <Location /adm/parmset>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonparmset
 ErrorDocument     403 /adm/login
@@ -449,8 +713,32 @@ ErrorDocument     406 /adm/roles
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
+<Location /adm/courseprefs>
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::courseprefs
+ErrorDocument     403 /adm/login
+ErrorDocument     406 /adm/roles
+ErrorDocument     500 /adm/errorhandler
+</Location>
+
+<Location /adm/slotrequest>
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::slotrequest
+ErrorDocument     403 /adm/login
+ErrorDocument     406 /adm/roles
+ErrorDocument	  500 /adm/errorhandler
+</Location>
+
 <Location /adm/wizard>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonwizard
 ErrorDocument     403 /adm/login
@@ -459,7 +747,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/grades>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::grades
 ErrorDocument     403 /adm/login
@@ -467,8 +757,21 @@ 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>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::loncreatecourse
 ErrorDocument     403 /adm/login
@@ -477,7 +780,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/modifycourse>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonmodifycourse
 ErrorDocument     403 /adm/login
@@ -485,8 +790,30 @@ ErrorDocument     406 /adm/roles
 ErrorDocument     500 /adm/errorhandler
 </Location>
 
+<Location /adm/domainprefs>
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::domainprefs
+ErrorDocument     403 /adm/login
+ErrorDocument     406 /adm/roles
+ErrorDocument     500 /adm/errorhandler
+</Location>
+
+<Location /adm/domainstatus>
+PerlAccessHandler       Apache::lonstatusacc
+SetHandler perl-script
+PerlHandler Apache::domainstatus
+ErrorDocument     403 /adm/login
+ErrorDocument     406 /adm/roles
+ErrorDocument     500 /adm/errorhandler
+</Location>
+
 <Location /adm/createuser>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::loncreateuser
 ErrorDocument     403 /adm/login
@@ -495,7 +822,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/publish>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonpublisher
 ErrorDocument     403 /adm/login
@@ -505,7 +834,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <LocationMatch "^/+\~.*/$">
-PerlAccessHandler       Apache::loncacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::loncacc
 SetHandler perl-script
 PerlHandler Apache::lonpubdir
 ErrorDocument     403 /adm/login
@@ -515,7 +846,9 @@ ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
 <Location /adm/pubdir>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonpubdir
 ErrorDocument     403 /adm/login
@@ -525,7 +858,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/unauthorized>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonunauthorized
 ErrorDocument     403 /adm/login
@@ -534,7 +869,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/retrieve>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonretrieve
 ErrorDocument     403 /adm/login
@@ -543,8 +880,22 @@ ErrorDocument     406 /adm/unauthorized
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
+<Location /adm/cleanup>
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::loncleanup
+ErrorDocument     403 /adm/login
+ErrorDocument     404 /adm/notfound.html
+ErrorDocument     406 /adm/unauthorized
+ErrorDocument	  500 /adm/errorhandler
+</Location>
+
 <Location /adm/cfile>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::loncfile
 ErrorDocument     403 /adm/login
@@ -554,7 +905,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/diff>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::londiff
 ErrorDocument     403 /adm/login
@@ -564,7 +917,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/upload>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonupload
 ErrorDocument     403 /adm/login
@@ -574,7 +929,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/imsimport>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::imsimport
 ErrorDocument     403 /adm/login
@@ -584,7 +941,9 @@ ErrorDocument     500 /adm/errorhandler
 </Location>
 
 <Location /adm/testbank>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::testbankimport
 ErrorDocument     403 /adm/login
@@ -594,7 +953,9 @@ ErrorDocument     500 /adm/errorhandler
 </Location>
 
 <Location /adm/assesscalc>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonspreadsheet
 ErrorDocument     403 /adm/login
@@ -604,7 +965,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/studentcalc>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonspreadsheet
 ErrorDocument     403 /adm/login
@@ -614,7 +977,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/classcalc>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonspreadsheet
 ErrorDocument     403 /adm/login
@@ -624,7 +989,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/dropadd>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::londropadd
 ErrorDocument     403 /adm/login
@@ -633,7 +1000,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/viewclasslist>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonviewclasslist
 ErrorDocument     403 /adm/login
@@ -641,8 +1010,54 @@ ErrorDocument     406 /adm/roles
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
+<Location /adm/coursegroups>
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::loncoursegroups
+ErrorDocument     403 /adm/login
+ErrorDocument     406 /adm/roles
+ErrorDocument     500 /adm/errorhandler
+</Location>
+
+<Location /adm/groupboards>
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::groupboards
+ErrorDocument     403 /adm/login
+ErrorDocument     406 /adm/roles
+ErrorDocument     500 /adm/errorhandler
+</Location>
+
+<Location /adm/grouproster>
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::grouproster
+ErrorDocument     403 /adm/login
+ErrorDocument     406 /adm/roles
+ErrorDocument     500 /adm/errorhandler
+</Location>
+
+<Location /adm/whatsnew>
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lonwhatsnew
+ErrorDocument     403 /adm/login
+ErrorDocument     406 /adm/roles
+ErrorDocument     500 /adm/errorhandler
+</Location>
+
 <Location /adm/populate>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonpopulate
 ErrorDocument     403 /adm/login
@@ -651,7 +1066,9 @@ ErrorDocument     500 /adm/errorhandler
 </Location>
 
 <Location /adm/managekeys>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonmanagekeys
 ErrorDocument     403 /adm/login
@@ -660,7 +1077,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/printout>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonprintout
 ErrorDocument     403 /adm/login
@@ -669,7 +1088,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/feedback>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonfeedback
 ErrorDocument     403 /adm/login
@@ -677,72 +1098,90 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/coursedocs>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::londocs
- PerlCleanupHandler Apache::londocs::untiehash
+PerlCleanupHandler Apache::londocs::untiehash
+PerlCleanupHandler	Apache::lonacc::cleanup
 ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/imsimportdocs>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::imsimportdocs
 ErrorDocument     403 /adm/login
 ErrorDocument     500 /adm/errorhandler
 </Location>
 
-<Location /adm/announcements>
-PerlAccessHandler       Apache::lonacc
+<LocationMatch "^/adm/announcements">
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonannounce
 ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
-</Location>
+</LocationMatch>
 
 <Location /adm/chat>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonchat
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/chatfetch>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonchatfetch
 ErrorDocument     413 /adm/overloaded.txt
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
-<Location /adm/evaluate>
-PerlAccessHandler       Apache::lonacc
+<Location /adm/groupchat>
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
-PerlHandler Apache::lonevaluate
+PerlHandler Apache::longroupchat
 ErrorDocument     403 /adm/login
-ErrorDocument	  500 /adm/errorhandler
+ErrorDocument     500 /adm/errorhandler
 </Location>
 
-<Location /adm/preferences>
-PerlAccessHandler       Apache::lonacc
+<Location /adm/evaluate>
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
-PerlHandler Apache::lonpreferences
+PerlHandler Apache::lonevaluate
 ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
-<Location /adm/assignments>
-PerlAccessHandler       Apache::lonacc
+<Location /adm/preferences>
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
-PerlHandler Apache::lonassignments
+PerlHandler Apache::lonpreferences
 ErrorDocument     403 /adm/login
-ErrorDocument     406 /adm/roles
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/communicate>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::loncommunicate
 ErrorDocument     403 /adm/login
@@ -750,26 +1189,33 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/searchcat>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonsearchcat
 PerlCleanupHandler Apache::lonsearchcat::cleanup
+PerlCleanupHandler	Apache::lonacc::cleanup
 ErrorDocument     403 /adm/login
 ErrorDocument     413 /adm/overloaded.txt
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/navmaps>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
-PerlHandler Apache::lonnavmaps
+PerlHandler Apache::lonnavdisplay
 ErrorDocument     403 /adm/login
 ErrorDocument     406 /adm/roles
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/quickgrades>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonquickgrades
 ErrorDocument     403 /adm/login
@@ -778,10 +1224,13 @@ ErrorDocument     500 /adm/errorhandler
 </Location>
 
 <Location /adm/groupsort>
-PerlAccessHandler	Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler	Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::groupsort
 PerlCleanupHandler Apache::groupsort::cleanup
+PerlCleanupHandler	Apache::lonacc::cleanup
 ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
@@ -792,94 +1241,86 @@ PerlHandler Apache::lonerrorhandler
 </Location>
 
 <LocationMatch "^/adm/help/.*\.hlp$">
-PerlAccessHandler	Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAccessHandler      Apache::publiccheck
+PerlAuthzHandler	Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonhelp
+ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
 <LocationMatch "^/adm/helpmenu">
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonhelpmenu
+ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
 <LocationMatch "^/adm/support">
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonsupportreq
+ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
-# ------------------------------------------------- Backdoor Adm Tests/Programs
-
-<Location /cgi-bin/loncron.pl>
-AuthName "LON-CAPA Network Administration"
-AuthType Basic
-AuthUserFile /home/httpd/lonTabs/htpasswd
-require user lonadm
-</Location>
+<LocationMatch "^/adm/helpdesk">
+SetHandler perl-script
+PerlHandler Apache::lonsupportreq
+ErrorDocument	  500 /adm/errorhandler
+</LocationMatch>
 
-<Location /cgi-bin/userstatus.pl>
-AuthName "LON-CAPA Network Administration"
-AuthType Basic
-AuthUserFile /home/httpd/lonTabs/htpasswd
-require user lonadm
-</Location>
+<LocationMatch "^/adm/css">
+SetHandler perl-script
+PerlHandler Apache::loncss
+ErrorDocument	  500 /adm/errorhandler
+</LocationMatch>
 
-<Location /cgi-bin/lonversions.pl>
-AuthName "LON-CAPA Network Administration"
-AuthType Basic
-AuthUserFile /home/httpd/lonTabs/htpasswd
-require user lonadm
-</Location>
+<LocationMatch "^/adm/coursecatalog">
+SetHandler perl-script
+PerlHandler Apache::coursecatalog
+ErrorDocument	  500 /adm/errorhandler
+</LocationMatch>
 
-<Location /cgi-bin/clusterstatus.pl>
-AuthName "LON-CAPA Network Administration"
-AuthType Basic
-AuthUserFile /home/httpd/lonTabs/htpasswd
-require user lonadm
-</Location>
+<LocationMatch "^/adm/resetpw">
+SetHandler perl-script
+PerlHandler Apache::resetpw
+ErrorDocument     500 /adm/errorhandler
+</LocationMatch>
 
-<Location /cgi-bin/metadata_keywords.pl>
-AuthName "LON-CAPA Network Administration"
-AuthType Basic
-AuthUserFile /home/httpd/lonTabs/htpasswd
-require user lonadm
-</Location>
+<LocationMatch "^/adm/selfenroll">
+SetHandler perl-script
+PerlHandler Apache::selfenroll
+ErrorDocument     500 /adm/errorhandler
+</LocationMatch>
 
-<Location /cgi-bin/metadata_harvest.pl>
-AuthName "harvest"
-AuthType Basic
-AuthUserFile /home/httpd/lonTabs/htpasswd
-require user  reaper
-</Location>
+<LocationMatch "^/adm/createaccount">
+SetHandler perl-script
+PerlHandler Apache::createaccount
+ErrorDocument     500 /adm/errorhandler
+</LocationMatch>
 
-<Location /cgi-bin/takeoffline.pl>
-AuthName "Offline"
-AuthType Basic
-AuthUserFile /home/httpd/lonTabs/htpasswd
-require user  offline
-</Location>
+<LocationMatch "^/adm/dns">
+SetHandler perl-script
+PerlHandler Apache::londns
+ErrorDocument     500 /adm/errorhandler
+</LocationMatch>
 
-<Location /cgi-bin/takeonline.pl>
-AuthName "Offline"
-AuthType Basic
-AuthUserFile /home/httpd/lonTabs/htpasswd
-require user  offline
-</Location>
+# ------------------------------------------------- Backdoor Adm Tests/Programs
 
 <Location /adm/test>
-AuthName "LON-CAPA Network Administration"
-AuthType Basic
-AuthUserFile /home/httpd/lonTabs/htpasswd
-require user lonadm
+PerlAccessHandler Apache::lonstatusacc
 SetHandler perl-script
-PerlAccessHandler Apache::lonacc
 PerlHandler Apache::lontest
 </Location>
 
 # ------------------------------------------------------- Shutting down a child
 
-PerlChildExitHandler Apache::lonnet::goodbye
+PerlChildExitHandler Apache::lonacc::goodbye
 
 #
 # LON-CAPA Section (extensions to access.conf permission configuration)
@@ -891,6 +1332,26 @@ PerlChildExitHandler Apache::lonnet::goo
 <Directory />
 Options None
 AllowOverride None
+order deny,allow
+deny from all
+</Directory>
+
+# Allow uploaded files to be served
+
+<Directory "/home/httpd/lonUsers">
+Options Includes FollowSymLinks
+AllowOverride None
+order allow,deny
+allow from all
+</Directory>
+ 
+# Allow construction space files to be served
+
+<Directory "/home/*/public_html/" >
+Options Includes FollowSymLinks
+AllowOverride
+order allow,deny
+allow from all
 </Directory>
 
 # Yes to symbolic links and server-side includes
@@ -906,27 +1367,52 @@ allow from all
 
 <Directory /home/httpd/cgi-bin>
 AllowOverride None
-Options ExecCGI
+Options ExecCGI FollowSymLinks
+order allow,deny
+allow from all
+</Directory>
+
+# Allow serving of files in prtspool
+
+<Directory "/home/httpd/prtspool/">
+Options Includes FollowSymLinks
+AllowOverride None
+order allow,deny
+allow from all
+</Directory>
+
+# Allow serving of files in zipspool
+
+<Directory "/home/httpd/zipspool/">
+Options Includes FollowSymLinks
+AllowOverride None
+order allow,deny
+allow from all
+</Directory>
+
+# Allow serving of files in captchaspool
+
+<Directory "/home/httpd/captchaspool/">
+Options Includes FollowSymLinks
+AllowOverride None
+order allow,deny
+allow from all
 </Directory>
 
 # ============================================================= Access Handlers
 
 # ------------------------------------------------- Allow server-status reports
 <Location /server-status>
+PerlAccessHandler Apache::lonstatusacc
 SetHandler server-status
-AuthName "LON-CAPA Network Administration"
-AuthType Basic
-AuthUserFile /home/httpd/lonTabs/htpasswd
-require user lonadm
 </Location>
 
 # ------------------------ Allow LON-CAPA "low-level" connection status reports
-<Location /lon-status>
-AuthName "LON-CAPA Network Administration"
-AuthType Basic
-AuthUserFile /home/httpd/lonTabs/htpasswd
-require user lonadm
-</Location>
+<LocationMatch "^/+lon-status/.*">
+PerlAccessHandler Apache::lonstatusacc
+ErrorDocument     406 /adm/roles
+ErrorDocument     500 /adm/errorhandler
+</LocationMatch>
 
 # ------------------- Allow access to local system documentation from localhost
 Alias /doc /usr/doc
@@ -948,11 +1434,27 @@ PerlSetVar       lonIconsURL  /adm/lonIc
 PerlSetVar       londPort     5663
 PerlSetVar       lonSysEMail  korte@lite.msu.edu
 PerlSetVar       lonDaemons   /home/httpd/perl
+PerlSetVar       lonLib       /home/httpd/lib
 PerlSetVar       lonSockDir   /home/httpd/sockets
+PerlSetVar       lonSockCreate   /home/httpd/sockets/common
 PerlSetVar       lonDocRoot   /home/httpd/html
+PerlSetVar       lonPrtDir    /home/httpd/prtspool
 PerlSetVar       lonIncludes  /home/httpd/html/res/adm/includes
-PerlSetVar       lonBrowsDet  netscape:mozilla:msie:mozilla\/(\d+\.\d+)\s:9999:9999&explorer:msie:netscape:msie\s(\d+\.\d+)\;:9999:9999&mozilla:mozilla\/[5-9]:msie:mozilla\/(\d+\.\d+)\s:9999:1&amaya:amaya:mozilla:V(\d+\.\d+)\s:1:1
-PerlSetVar       lonTextBrowsers opera:windows\s+ce:lynx
+PerlSetVar       lonZipDir    /home/httpd/zipspool
+PerlSetVar       lonCaptchaDir     /home/httpd/captchaspool
+PerlSetVar       lonCaptchaDb     /home/httpd/captchadb 
+PerlSetVar       lonFontsDir     /home/httpd/html/adm/fonts
+# & separated list of : separated fields in order of
+# - internal name to call it, 
+# - regexp that it should match (done case-insensitively)
+# - regexp that is should not match (done case-insensitively)
+# - regexp that will pull out the version number into $1
+# - a number that describes the minimum version that has mathml support
+# - a number that describes the minimum number version that has unicode support
+
+PerlSetVar       lonBrowsDet  explorer:msie:netscape:msie\s(\d+\.\d+)\;:9999:5&mozilla:mozilla\/[5-9]:msie:mozilla\/(\d+\.\d+)\s:9999:1&netscape:netscape:msie:netscape\/(\d+\.\d+):9999:7&netscape:netscape\/[7-9]:shouldnotmatch:netscape\/(\d+\.\d+):9999:7&amaya:amaya:mozilla:V(\d+\.\d+)\s:1:1&safari:safari:msie:safari\/([\d\.]+):9999:84
+
+PerlSetVar       lonTextBrowsers windows\s+ce:lynx
 PerlSetVar       lonScansDir  /home/httpd/scantron
 PerlSetVar       lonScriptTimeout 10
 PerlSetVar	 BugzillaHost	http://bugs.lon-capa.org/
@@ -966,12 +1468,6 @@ PerlSetVar	 FAQHost	http://help.lon-capa
 
 PerlSetVar       lonSqlAccess   localhostkey
 
-# -----------------------------------------------------------------------------
-# lonttpdPort is the port used by the lightweight graphics httpd server
-# not the main Apache server
-PerlSetVar       lonhttpdPort  8080
-
-
 #----------------------------------------------------------------------------
 #
 #   Parameters used by secure lond/lonc