--- loncom/loncapa_apache.conf	2009/10/26 18:58:47	1.189
+++ loncom/loncapa_apache.conf	2010/03/17 19:41:06	1.194
@@ -1,7 +1,7 @@
 ##
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
-## $Id: loncapa_apache.conf,v 1.189 2009/10/26 18:58:47 droeschl Exp $
+## $Id: loncapa_apache.conf,v 1.194 2010/03/17 19:41:06 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
@@ -344,7 +350,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 +399,7 @@ SetHandler perl-script
 PerlHandler Apache::lonhomework
 </LocationMatch>
 
-<LocationMatch "^/+\~.*\.(js|css|txt)$">
+<LocationMatch "^/+\~.*\.(js|css|txt|tex)$">
 SetHandler perl-script
 PerlHandler Apache::lonxml
 </LocationMatch>
@@ -497,16 +503,6 @@ ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
-<Location /adm/remote>
-AuthType LONCAPA
-Require valid-user
-PerlAuthzHandler       Apache::lonacc
-SetHandler perl-script
-PerlHandler Apache::lonremote
-ErrorDocument     403 /adm/login
-ErrorDocument	  500 /adm/errorhandler
-</Location>
-
 <Location /adm/pickauthor>
 AuthType LONCAPA
 Require valid-user
@@ -1279,7 +1275,6 @@ ErrorDocument	  500 /adm/errorhandler
 <LocationMatch "^/adm/coursecatalog">
 SetHandler perl-script
 PerlHandler Apache::coursecatalog
-PerlAccessHandler      Apache::publiccheck
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>