--- loncom/loncapa_apache.conf	2003/03/14 02:26:12	1.39
+++ loncom/loncapa_apache.conf	2003/08/01 17:25:40	1.58
@@ -1,7 +1,7 @@
 ##
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
-## $Id: loncapa_apache.conf,v 1.39 2003/03/14 02:26:12 www Exp $
+## $Id: loncapa_apache.conf,v 1.58 2003/08/01 17:25:40 www Exp $
 ##
 
 #
@@ -19,13 +19,14 @@ Group www
 # ======================================================= Shared Object Modules
 
 LoadModule perl_module       modules/libperl.so
+<IfDefine !MODPERL2>
 AddModule mod_perl.c
+</IfDefine>
 
 # =============================================================== Miscellaneous
 
 ServerAdmin korte@lite.msu.edu
 ExtendedStatus On
-
 #
 # LON-CAPA Section (extensions to srm.conf name space servicing)
 #
@@ -40,6 +41,7 @@ ScriptAlias /cgi-bin/ "/home/httpd/cgi-b
 
 PerlTransHandler	Apache::lontrans
 
+#PerlWarn On
 <LocationMatch "^/+res.*">
 PerlAccessHandler       Apache::lonacc
 PerlHeaderParserHandler Apache::lonrep
@@ -51,6 +53,7 @@ ErrorDocument	  500 /adm/errorhandler
 
 <LocationMatch "^/+userfiles.*">
 PerlAccessHandler       Apache::lontokacc
+PerlCleanupHandler	Apache::lontokacc::removefile
 </LocationMatch>
 
 <LocationMatch "^/+uploaded.*">
@@ -59,7 +62,7 @@ ErrorDocument     404 /adm/notfound.html
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
-<LocationMatch "^/+public/.*/syllabus">
+<LocationMatch "^/+public/.*/syllabus$">
 PerlAccessHandler	Apache::lonacc
 SetHandler              perl-script
 PerlHandler             Apache::lonsyllabus
@@ -67,27 +70,39 @@ ErrorDocument     404 /adm/notfound.html
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
-<LocationMatch "^/adm/.*/aboutme">
+<LocationMatch "^/adm/.*/aboutme$">
 PerlAccessHandler	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/.*/smppg">
+<LocationMatch "^/adm/.*/smppg$">
 PerlAccessHandler	Apache::lonacc
 SetHandler              perl-script
 PerlHandler             Apache::lonsimplepage
 ErrorDocument     404 /adm/notfound.html
+ErrorDocument     406 /adm/notinit.html
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
-<LocationMatch "^/adm/.*/bulletinboard">
+<LocationMatch "^/adm/.*/bulletinboard$">
 PerlAccessHandler	Apache::lonacc
 SetHandler              perl-script
 PerlHandler             Apache::lonbulletin
 ErrorDocument     404 /adm/notfound.html
+ErrorDocument     406 /adm/notinit.html
+ErrorDocument	  500 /adm/errorhandler
+</LocationMatch>
+
+<LocationMatch "\.problem/smpedit$">
+PerlAccessHandler	Apache::lonacc
+SetHandler              perl-script
+PerlHandler             Apache::lonsimpleproblemedit
+ErrorDocument     404 /adm/notfound.html
+ErrorDocument     406 /adm/notinit.html
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
@@ -114,6 +129,16 @@ ErrorDocument	  500 /adm/errorhandler
 AllowOverride None
 </LocationMatch>
 
+<LocationMatch "^/adm/helper/.*\.helper$">
+PerlAccessHandler Apache::lonacc
+SetHandler        perl-script
+PerlHandler       Apache::lonhelper
+ErrorDocument     403 /adm/login
+ErrorDocument     404 /adm/notfound.html
+ErrorDocument     406 /adm/unauthorized
+ErrorDocument     500 /adm/errorhandler
+</LocationMatch>
+
 <LocationMatch "/prtspool">
 PerlAccessHandler Apache::lonacc
 ErrorDocument     403 /adm/login
@@ -169,7 +194,7 @@ SetHandler perl-script
 PerlHandler Apache::lonsequence
 </LocationMatch>
 
-<LocationMatch "^/(res|\~).*\.meta$>
+<LocationMatch "^/(res|\~|public|uploaded|adm).*\.meta$>
 SetHandler perl-script
 PerlHandler Apache::lonmeta
 </LocationMatch>
@@ -179,7 +204,7 @@ SetHandler perl-script
 PerlHandler Apache::lonrights
 </LocationMatch>
 
-<LocationMatch "^/(res|\~).*\.(xml|html|htm|xhtml|xhtm)$">
+<LocationMatch "^/(res|\~).*\.(xml|html|htm|xhtml|xhtm|sty)$">
 SetHandler perl-script
 PerlHandler Apache::lonxml
 </LocationMatch>
@@ -232,6 +257,14 @@ ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
+<Location /adm/remote>
+PerlAccessHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lonremote
+ErrorDocument     403 /adm/login
+ErrorDocument	  500 /adm/errorhandler
+</Location>
+
 <Location /adm/pickstudent>
 PerlAccessHandler       Apache::lonacc
 SetHandler perl-script
@@ -240,6 +273,14 @@ ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
+<Location /adm/pickcourse>
+PerlAccessHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lonpickcourse
+ErrorDocument     403 /adm/login
+ErrorDocument	  500 /adm/errorhandler
+</Location>
+
 <Location /adm/login>
 SetHandler perl-script
 PerlHandler Apache::lonlogin
@@ -463,6 +504,15 @@ ErrorDocument     406 /adm/roles
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
+<Location /adm/managekeys>
+PerlAccessHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lonmanagekeys
+ErrorDocument     403 /adm/login
+ErrorDocument     406 /adm/roles
+ErrorDocument	  500 /adm/errorhandler
+</Location>
+
 <Location /adm/printout>
 PerlAccessHandler       Apache::lonacc
 SetHandler perl-script
@@ -483,7 +533,7 @@ ErrorDocument	  500 /adm/errorhandler
 <Location /adm/coursedocs>
 PerlAccessHandler       Apache::lonacc
 SetHandler perl-script
-PerlCleanupHandler Apache::coursedocs::untiehash
+PerlCleanupHandler Apache::londocs::untiehash
 PerlHandler Apache::londocs
 ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
@@ -559,7 +609,6 @@ ErrorDocument	  500 /adm/errorhandler
 PerlAccessHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonnavmaps
-PerlCleanupHandler Apache::lonnavmaps::cleanup
 ErrorDocument     403 /adm/login
 ErrorDocument     406 /adm/roles
 ErrorDocument	  500 /adm/errorhandler
@@ -722,7 +771,8 @@ PerlSetVar       lonDocRoot   /home/http
 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       lonScansDir  /home/httpd/scantron
+PerlSetVar       lonScriptTimeout 10
 # -----------------------------------------------------------------------------
 # NOTE: lonSqlAccess key is the password for the MySQL user
 # www@localhost.  This value must always be "localhostkey".
@@ -746,4 +796,6 @@ Include conf/loncapa.conf
 # ================================================== Initiate mod_perl starting
 
 PerlRequire      conf/startup.pl
+<IfDefine !MODPERL2>
 PerlFreshRestart On
+</IfDefine>