[LON-CAPA-cvs] cvs: loncom(version_2_9_X) / loncapa_apache.conf

[raeburn]

raeburn		Fri Mar 19 22:11:46 2010 EDT

  Modified files:              (Branch: version_2_9_X)
    /loncom	loncapa_apache.conf 
  Log:
  - Backport 1.191, 1.192, 1.195 
  
  
Index: loncom/loncapa_apache.conf
diff -u loncom/loncapa_apache.conf:1.185.8.1 loncom/loncapa_apache.conf:1.185.8.2
--- loncom/loncapa_apache.conf:1.185.8.1	Wed Aug 12 19:07:18 2009
+++ loncom/loncapa_apache.conf	Fri Mar 19 22:11:46 2010
@@ -1,7 +1,7 @@
 ##
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
-## $Id: loncapa_apache.conf,v 1.185.8.1 2009/08/12 19:07:18 raeburn Exp $
+## $Id: loncapa_apache.conf,v 1.185.8.2 2010/03/19 22:11:46 raeburn Exp $
 ##
 
 #
@@ -55,6 +55,12 @@
 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.*">
 
 AuthType LONCAPA
@@ -99,17 +105,24 @@
 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