--- loncom/loncapa_apache.conf	2009/07/07 19:50:44	1.186
+++ loncom/loncapa_apache.conf	2011/01/27 14:38:40	1.202
@@ -1,7 +1,7 @@
 ##
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
-## $Id: loncapa_apache.conf,v 1.186 2009/07/07 19:50:44 droeschl Exp $
+## $Id: loncapa_apache.conf,v 1.202 2011/01/27 14:38:40 wenzelju Exp $
 ##
 
 #
@@ -55,6 +55,13 @@ 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|/ckeditor)">
+        ExpiresActive On
+        ExpiresDefault "access plus 12 hours"
+        Header set Cache-Control "public, no-transform"
+</LocationMatch>
+
 <LocationMatch "^/+res.*">
 
 AuthType LONCAPA
@@ -99,17 +106,24 @@ 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
@@ -344,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>
@@ -393,7 +407,7 @@ SetHandler perl-script
 PerlHandler Apache::lonhomework
 </LocationMatch>
 
-<LocationMatch "^/+\~.*\.(js|css|txt)$">
+<LocationMatch "^/+\~.*\.(js|css|txt|tex)$">
 SetHandler perl-script
 PerlHandler Apache::lonxml
 </LocationMatch>
@@ -454,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
@@ -497,34 +531,35 @@ ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
-<Location /adm/remote>
+<Location /adm/pickauthor>
 AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
-PerlHandler Apache::lonremote
+PerlHandler Apache::lonpickauthor
 ErrorDocument     403 /adm/login
-ErrorDocument	  500 /adm/errorhandler
+ErrorDocument     500 /adm/errorhandler
 </Location>
 
-<Location /adm/pickauthor>
+<Location /adm/pickstudent>
 AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
-PerlHandler Apache::lonpickauthor
+PerlHandler Apache::lonpickstudent
 ErrorDocument     403 /adm/login
-ErrorDocument     500 /adm/errorhandler
+ErrorDocument	  500 /adm/errorhandler
 </Location>
 
-<Location /adm/pickstudent>
+<Location /adm/pickuser>
 AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
-PerlHandler Apache::lonpickstudent
+PerlHandler Apache::lonpickuser
 ErrorDocument     403 /adm/login
-ErrorDocument	  500 /adm/errorhandler
+ErrorDocument     406 /adm/roles
+ErrorDocument     500 /adm/errorhandler
 </Location>
 
 <Location /adm/pickcourse>
@@ -623,16 +658,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
@@ -733,6 +758,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
@@ -1200,16 +1236,26 @@ ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
-<Location /adm/blockingstatus>
+<Location /adm/wishlist>
 AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
-PerlHandler Apache::lonblockingstatus
+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
@@ -1427,7 +1473,7 @@ PerlSetVar       lonFontsDir     /home/h
 # - 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