--- loncom/loncapa_apache.conf	2007/03/28 00:12:48	1.165
+++ loncom/loncapa_apache.conf	2011/04/23 16:02:27	1.203
@@ -1,7 +1,7 @@
 ##
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
-## $Id: loncapa_apache.conf,v 1.165 2007/03/28 00:12:48 albertel Exp $
+## $Id: loncapa_apache.conf,v 1.203 2011/04/23 16:02:27 www 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
@@ -49,6 +51,17 @@ 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|/ckeditor)">
+        ExpiresActive On
+        ExpiresDefault "access plus 12 hours"
+        Header set Cache-Control "public, no-transform"
+</LocationMatch>
+
 <LocationMatch "^/+res.*">
 
 AuthType LONCAPA
@@ -93,6 +106,18 @@ 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
@@ -103,6 +128,8 @@ PerlCleanupHandler	Apache::lonacc::clean
 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
@@ -199,6 +226,8 @@ 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
@@ -211,6 +240,7 @@ 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
@@ -276,6 +306,17 @@ 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
 
 <LocationMatch "^/\~.*\.sequence$">
@@ -317,7 +358,7 @@ PerlCleanupHandler Apache::lonindexer::c
 PerlCleanupHandler	Apache::lonacc::cleanup
 </LocationMatch>
 
-<LocationMatch "^/+(res|\~).*\.tex$">
+<LocationMatch "^/+res.*\.tex$">
 SetHandler perl-script
 PerlHandler Apache::lontex
 </LocationMatch>
@@ -357,6 +398,7 @@ 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>
 
@@ -365,10 +407,17 @@ SetHandler perl-script
 PerlHandler Apache::lonhomework
 </LocationMatch>
 
+<LocationMatch "^/+\~.*\.(js|css|txt|tex)$">
+SetHandler perl-script
+PerlHandler Apache::lonxml
+</LocationMatch>
+
 <LocationMatch "^/adm/wrapper/">
 AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
+PerlHandler Apache::londatecheck
+PerlHandler Apache::lonipcheck
 SetHandler perl-script
 PerlHandler Apache::lonwrapper
 ErrorDocument     403 /adm/login
@@ -419,6 +468,26 @@ ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
+<Location /adm/searchcourse>
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lonsearchcourse
+ErrorDocument     403 /adm/login
+ErrorDocument     500 /adm/errorhandler
+</Location>
+
+<Location /adm/indexcourse>
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lonindexcourse
+ErrorDocument     403 /adm/login
+ErrorDocument     500 /adm/errorhandler
+</Location>
+
 <Location /adm/statistics>
 AuthType LONCAPA
 Require valid-user
@@ -448,6 +517,7 @@ PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonroles
 ErrorDocument     403 /adm/login
+ErrorDocument     409 /adm/preferences?action=lockwarning
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
@@ -461,14 +531,24 @@ ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
-<Location /adm/remote>
+<Location /adm/pickresource>
 AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
-PerlHandler Apache::lonremote
+PerlHandler Apache::lonpickresource
 ErrorDocument     403 /adm/login
-ErrorDocument	  500 /adm/errorhandler
+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>
@@ -481,6 +561,17 @@ 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
@@ -533,6 +624,7 @@ PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonlogout
 ErrorDocument     403 /adm/login
+ErrorDocument     409 /adm/preferences?action=lockwarning
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
@@ -576,16 +668,6 @@ ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
-<Location /adm/bookmarks>
-AuthType LONCAPA
-Require valid-user
-PerlAuthzHandler       Apache::lonacc
-SetHandler perl-script
-PerlHandler Apache::admbookmarks
-ErrorDocument     403 /adm/login
-ErrorDocument	  500 /adm/errorhandler
-</Location>
-
 <Location /adm/flip>
 AuthType LONCAPA
 Require valid-user
@@ -642,6 +724,17 @@ 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
@@ -675,6 +768,17 @@ 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
@@ -708,6 +812,15 @@ 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>
 AuthType LONCAPA
 Require valid-user
@@ -1133,6 +1246,26 @@ ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
+<Location /adm/wishlist>
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lonwishlistdisplay
+ErrorDocument     403 /adm/login
+ErrorDocument     406 /adm/roles
+ErrorDocument	  500 /adm/errorhandler
+</Location>
+
+<Location /adm/blockingstatus>
+PerlAccessHandler      Apache::publiccheck
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+SetHandler             perl-script
+PerlHandler            Apache::lonblockingstatus
+</Location>
+
 <Location /adm/errorhandler>
 SetHandler perl-script
 PerlHandler Apache::lonerrorhandler
@@ -1190,6 +1323,18 @@ PerlHandler Apache::resetpw
 ErrorDocument     500 /adm/errorhandler
 </LocationMatch>
 
+<LocationMatch "^/adm/selfenroll">
+SetHandler perl-script
+PerlHandler Apache::selfenroll
+ErrorDocument     500 /adm/errorhandler
+</LocationMatch>
+
+<LocationMatch "^/adm/createaccount">
+SetHandler perl-script
+PerlHandler Apache::createaccount
+ErrorDocument     500 /adm/errorhandler
+</LocationMatch>
+
 <LocationMatch "^/adm/dns">
 SetHandler perl-script
 PerlHandler Apache::londns
@@ -1198,69 +1343,9 @@ ErrorDocument     500 /adm/errorhandler
 
 # ------------------------------------------------- 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>
-
-<Location /cgi-bin/userstatus.pl>
-AuthName "LON-CAPA Network Administration"
-AuthType Basic
-AuthUserFile /home/httpd/lonTabs/htpasswd
-require user lonadm
-</Location>
-
-<Location /cgi-bin/lonversions.pl>
-AuthName "LON-CAPA Network Administration"
-AuthType Basic
-AuthUserFile /home/httpd/lonTabs/htpasswd
-require user lonadm
-</Location>
-
-<Location /cgi-bin/clusterstatus.pl>
-AuthName "LON-CAPA Network Administration"
-AuthType Basic
-AuthUserFile /home/httpd/lonTabs/htpasswd
-require user lonadm
-</Location>
-
-<Location /cgi-bin/metadata_keywords.pl>
-AuthName "LON-CAPA Network Administration"
-AuthType Basic
-AuthUserFile /home/httpd/lonTabs/htpasswd
-require user lonadm
-</Location>
-
-<Location /cgi-bin/metadata_harvest.pl>
-AuthName "harvest"
-AuthType Basic
-AuthUserFile /home/httpd/lonTabs/htpasswd
-require user  reaper
-</Location>
-
-<Location /cgi-bin/takeoffline.pl>
-AuthName "Offline"
-AuthType Basic
-AuthUserFile /home/httpd/lonTabs/htpasswd
-require user  offline
-</Location>
-
-<Location /cgi-bin/takeonline.pl>
-AuthName "Offline"
-AuthType Basic
-AuthUserFile /home/httpd/lonTabs/htpasswd
-require user  offline
-</Location>
-
 <Location /adm/test>
-AuthName "LON-CAPA Network Administration"
-AuthType Basic
-AuthUserFile /home/httpd/lonTabs/htpasswd
-require user lonadm
+PerlAccessHandler Apache::lonstatusacc
 SetHandler perl-script
-PerlAuthzHandler Apache::lonacc
 PerlHandler Apache::lontest
 </Location>
 
@@ -1327,24 +1412,38 @@ 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
@@ -1366,12 +1465,17 @@ 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
-# & sepeareted list of : seperated fileds inorder of
+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)
@@ -1379,7 +1483,7 @@ PerlSetVar       lonIncludes  /home/http
 # - 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:9999&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       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
@@ -1395,12 +1499,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