--- loncom/loncapa_apache.conf	2010/12/05 18:27:23	1.190.4.3
+++ loncom/loncapa_apache.conf	2010/05/17 20:29:02	1.192.2.1
@@ -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.192.2.1 2010/05/17 20:29:02 raeburn Exp $
 ##
 
 #
@@ -55,6 +55,12 @@ 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"
+</LocationMatch>
+
 <LocationMatch "^/+res.*">
 
 AuthType LONCAPA
@@ -99,17 +105,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
@@ -558,11 +571,6 @@ ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
-<Location /adm/welcome>
-SetHandler perl-script
-PerlHandler Apache::lonwelcome
-</Location>
-
 <Location /adm/login>
 SetHandler perl-script
 PerlHandler Apache::lonlogin
@@ -1537,7 +1545,8 @@ PerlSetVar SSLCAFile    /usr/share/ssl/l
 PerlSetVar SSLEmail     certificate@lon-capa.org
 
 #-------------------------------------------------------------------------
-PerlSetVar AnonymousSalt <Salt Placeholder>
+
+
 
 
 # ====================================== Include machine-specific configuration