--- loncom/loncapa_apache.conf 2010/12/05 18:27:23 1.190.4.3 +++ loncom/loncapa_apache.conf 2010/08/10 14:30:28 1.197 @@ -1,7 +1,7 @@ ## ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file ## -## $Id: loncapa_apache.conf,v 1.190.4.3 2010/12/05 18:27:23 raeburn Exp $ +## $Id: loncapa_apache.conf,v 1.197 2010/08/10 14:30:28 wenzelju Exp $ ## # @@ -55,6 +55,12 @@ PerlSetVar lonOtherAuthen no PerlAuthenHandler 'sub { return OK }' +# Send proper expires header to avoid unnecessary HTTP request for static content + + ExpiresActive On + ExpiresDefault "access plus 12 hours" + + AuthType LONCAPA @@ -99,17 +105,24 @@ SetHandler perl-script PerlHandler Apache::portfolio + +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 + + PerlAccessHandler Apache::lontokacc PerlCleanupHandler Apache::lontokacc::removefile PerlCleanupHandler Apache::lonacc::cleanup - -SetHandler perl-script -PerlHandler Apache::lonpdfupload - - AuthType LONCAPA Require valid-user @@ -497,16 +510,6 @@ ErrorDocument 403 /adm/login ErrorDocument 500 /adm/errorhandler - -AuthType LONCAPA -Require valid-user -PerlAuthzHandler Apache::lonacc -SetHandler perl-script -PerlHandler Apache::lonremote -ErrorDocument 403 /adm/login -ErrorDocument 500 /adm/errorhandler - - AuthType LONCAPA Require valid-user @@ -558,11 +561,6 @@ ErrorDocument 403 /adm/login ErrorDocument 500 /adm/errorhandler - -SetHandler perl-script -PerlHandler Apache::lonwelcome - - SetHandler perl-script PerlHandler Apache::lonlogin @@ -1227,6 +1225,17 @@ ErrorDocument 403 /adm/login ErrorDocument 500 /adm/errorhandler + +AuthType LONCAPA +Require valid-user +PerlAuthzHandler Apache::lonacc +SetHandler perl-script +PerlHandler Apache::lonwishlist +ErrorDocument 403 /adm/login +ErrorDocument 406 /adm/roles +ErrorDocument 500 /adm/errorhandler + + PerlAccessHandler Apache::publiccheck AuthType LONCAPA @@ -1453,7 +1462,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 @@ -1537,7 +1546,8 @@ PerlSetVar SSLCAFile /usr/share/ssl/l PerlSetVar SSLEmail certificate@lon-capa.org #------------------------------------------------------------------------- -PerlSetVar AnonymousSalt + + # ====================================== Include machine-specific configuration