--- loncom/loncapa_apache.conf	2010/08/24 09:11:35	1.198
+++ loncom/loncapa_apache.conf	2011/05/26 01:05:47	1.204
@@ -1,7 +1,7 @@
 ##
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
-## $Id: loncapa_apache.conf,v 1.198 2010/08/24 09:11:35 wenzelju Exp $
+## $Id: loncapa_apache.conf,v 1.204 2011/05/26 01:05:47 raeburn Exp $
 ##
 
 #
@@ -59,6 +59,7 @@ PerlAuthenHandler	'sub { return OK }'
 <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.*">
@@ -467,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
@@ -510,6 +531,16 @@ ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
+<Location /adm/pickresource>
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lonpickresource
+ErrorDocument     403 /adm/login
+ErrorDocument     500 /adm/errorhandler
+</Location>
+
 <Location /adm/pickauthor>
 AuthType LONCAPA
 Require valid-user
@@ -1220,7 +1251,7 @@ AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
-PerlHandler Apache::lonwishlist
+PerlHandler Apache::lonwishlistdisplay
 ErrorDocument     403 /adm/login
 ErrorDocument     406 /adm/roles
 ErrorDocument	  500 /adm/errorhandler
@@ -1538,6 +1569,9 @@ PerlSetVar SSLEmail     certificate@lon-
 #-------------------------------------------------------------------------
 
 
+# ====================================== Include support for SSL rewrites
+
+Include conf/loncapa_rewrite.conf
 
 
 # ====================================== Include machine-specific configuration