--- loncom/loncapa_apache.conf	2010/08/12 21:06:47	1.192.2.2
+++ loncom/loncapa_apache.conf	2011/10/21 16:03:06	1.205
@@ -1,7 +1,7 @@
 ##
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
-## $Id: loncapa_apache.conf,v 1.192.2.2 2010/08/12 21:06:47 raeburn Exp $
+## $Id: loncapa_apache.conf,v 1.205 2011/10/21 16:03:06 www 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.*">
@@ -257,12 +258,11 @@ ErrorDocument     406 /adm/notinit.html
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
-<LocationMatch "^/+priv.*">
+<LocationMatch "^/+priv/.*">
 AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler Apache::loncacc
 SetHandler        perl-script
-PerlHandler       Apache::lonconstruct
 ErrorDocument     403 /adm/login
 ErrorDocument     404 /adm/notfound.html
 ErrorDocument     406 /adm/unauthorized
@@ -273,16 +273,6 @@ ErrorDocument	  500 /adm/errorhandler
 PerlAccessHandler Apache::lonracc
 </LocationMatch>
 
-<LocationMatch "^/+\~.*">
-AuthType LONCAPA
-Require valid-user
-PerlAuthzHandler Apache::loncacc
-ErrorDocument     403 /adm/login
-ErrorDocument     404 /adm/notfound.html
-ErrorDocument     406 /adm/unauthorized
-ErrorDocument	  500 /adm/errorhandler
-</LocationMatch>
-
 <LocationMatch "^/adm/helper/.*\.helper$">
 AuthType LONCAPA
 Require valid-user
@@ -318,22 +308,22 @@ ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 # ------------------------------------------------------------------------- RAT
 
-<LocationMatch "^/\~.*\.sequence$">
+<LocationMatch "^/+priv/.*\.sequence$">
 SetHandler perl-script
 PerlHandler Apache::lonratedt
 </LocationMatch>
 
-<LocationMatch "^/\~.*\.page$">
+<LocationMatch "^/+priv/.*\.page$">
 SetHandler perl-script
 PerlHandler Apache::lonratedt
 </LocationMatch>
 
-<LocationMatch "^/\~.*\/ratserver$">
+<LocationMatch "^/+priv/.*\/ratserver$">
 SetHandler perl-script
 PerlHandler Apache::lonratsrv
 </LocationMatch>
 
-<LocationMatch "^/\~.*\/adveditmenu$">
+<LocationMatch "^/+priv/.*\/adveditmenu$">
 SetHandler perl-script
 PerlHandler Apache::lonratmenu
 </LocationMatch>
@@ -372,7 +362,7 @@ SetHandler perl-script
 PerlHandler Apache::lonsequence
 </LocationMatch>
 
-<LocationMatch "^/+(res|\~|public|uploaded|editupload|adm).*\.meta$">
+<LocationMatch "^/+(res|priv|public|uploaded|editupload|adm)/.*\.meta$">
 PerlAccessHandler      Apache::publiccheck
 SetHandler perl-script
 PerlHandler Apache::lonmeta
@@ -389,24 +379,24 @@ PerlHandler Apache::lonmeta
 
 
 
-<LocationMatch "^/+(res|\~).*\.rights$">
+<LocationMatch "^/+(res|priv)/.*\.rights$">
 SetHandler perl-script
 PerlHandler Apache::lonrights
 </LocationMatch>
 
-<LocationMatch "^/+(uploaded|res|\~).*\.(xml|html|htm|xhtml|xhtm|sty)$">
+<LocationMatch "^/+(uploaded|res|priv)/.*\.(xml|html|htm|xhtml|xhtm|sty)$">
 SetHandler perl-script
 PerlHandler Apache::londatecheck
 PerlHandler Apache::lonipcheck
 PerlHandler Apache::lonxml
 </LocationMatch>
 
-<LocationMatch "^/+(res|\~).*\.(task|problem|exam|quiz|assess|survey|form|library)$">
+<LocationMatch "^/+(res|priv).*\.(task|problem|exam|quiz|assess|survey|form|library)$">
 SetHandler perl-script
 PerlHandler Apache::lonhomework
 </LocationMatch>
 
-<LocationMatch "^/+\~.*\.(js|css|txt|tex)$">
+<LocationMatch "^/+priv/.*\.(js|css|txt|tex)$">
 SetHandler perl-script
 PerlHandler Apache::lonxml
 </LocationMatch>
@@ -467,6 +457,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,14 +520,14 @@ ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
-<Location /adm/remote>
+<Location /adm/pickresource>
 AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
-PerlHandler Apache::lonremote
+PerlHandler Apache::lonpickresource
 ErrorDocument     403 /adm/login
-ErrorDocument	  500 /adm/errorhandler
+ErrorDocument     500 /adm/errorhandler
 </Location>
 
 <Location /adm/pickauthor>
@@ -647,16 +657,6 @@ ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
-<Location /adm/bookmarks>
-AuthType LONCAPA
-Require valid-user
-PerlAuthzHandler       Apache::lonacc
-SetHandler perl-script
-PerlHandler Apache::admbookmarks
-ErrorDocument     403 /adm/login
-ErrorDocument	  500 /adm/errorhandler
-</Location>
-
 <Location /adm/flip>
 AuthType LONCAPA
 Require valid-user
@@ -833,7 +833,7 @@ ErrorDocument     406 /adm/unauthorized
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
-<LocationMatch "^/+\~.*/$">
+<LocationMatch "^/+priv/.*/$">
 AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::loncacc
@@ -1235,6 +1235,17 @@ ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
+<Location /adm/wishlist>
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lonwishlistdisplay
+ErrorDocument     403 /adm/login
+ErrorDocument     406 /adm/roles
+ErrorDocument	  500 /adm/errorhandler
+</Location>
+
 <Location /adm/blockingstatus>
 PerlAccessHandler      Apache::publiccheck
 AuthType LONCAPA
@@ -1547,6 +1558,9 @@ PerlSetVar SSLEmail     certificate@lon-
 #-------------------------------------------------------------------------
 
 
+# ====================================== Include support for SSL rewrites
+
+Include conf/loncapa_rewrite.conf
 
 
 # ====================================== Include machine-specific configuration