--- loncom/loncapa_apache.conf	2020/09/04 19:36:57	1.270
+++ loncom/loncapa_apache.conf	2023/08/28 20:40:00	1.283
@@ -2,7 +2,7 @@
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
 
-# $Id: loncapa_apache.conf,v 1.270 2020/09/04 19:36:57 raeburn Exp $
+# $Id: loncapa_apache.conf,v 1.283 2023/08/28 20:40:00 raeburn Exp $
 
 #
 # LON-CAPA Section (extensions to httpd.conf daemon configuration)
@@ -131,6 +131,7 @@ ErrorDocument     500 /adm/errorhandler
 </Location>
 
 <LocationMatch "^/+userfiles.*">
+Options +FollowSymLinks -Includes
 PerlAccessHandler       Apache::lontokacc
 PerlCleanupHandler	Apache::lontokacc::removefile
 PerlCleanupHandler	Apache::lonacc::cleanup
@@ -149,6 +150,10 @@ ErrorDocument     406 /adm/roles
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
+<LocationMatch "^/+uploaded/.+/.+/(portfolio|feedback|docs|groups|supplemental)/.+">
+   Options +FollowSymLinks -Includes
+</LocationMatch>
+
 <LocationMatch "^/+editupload.*">
 AuthType LONCAPA
 Require valid-user
@@ -275,6 +280,7 @@ AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler        Apache::lonacc
 SetHandler              perl-script
+PerlHandler             Apache::lonslotcheck
 PerlHandler             Apache::londatecheck
 PerlHandler             Apache::lonipcheck
 PerlHandler             Apache::lonexttool
@@ -497,13 +503,33 @@ Require valid-user
 PerlAuthzHandler       Apache::lonacc
 </LocationMatch>
 
+<LocationMatch "^/daxeopen/priv/[^/]+/[^/]+/">
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::loncacc
+</LocationMatch>
+
+<LocationMatch "^/daxeopen/(res/|$)">
+ErrorDocument     403 /adm/login
+ErrorDocument     404 /adm/notfound.html
+ErrorDocument     406 /adm/roles
+ErrorDocument     500 /adm/errorhandler
+</LocationMatch>
+
+<LocationMatch "^/daxeopen/priv/">
+ErrorDocument     403 /adm/login
+ErrorDocument     404 /adm/notfound.html
+ErrorDocument     406 /adm/unauthorized
+ErrorDocument     500 /adm/errorhandler
+</LocationMatch>
+
 <LocationMatch "^/daxe(page|open)/uploaded/">
 AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 ErrorDocument     403 /adm/login
 ErrorDocument     404 /adm/notfound.html
-ErrorDocument     406 /adm/unauthorized
+ErrorDocument     406 /adm/roles
 ErrorDocument     500 /adm/errorhandler
 </LocationMatch>
 
@@ -512,7 +538,7 @@ SetHandler perl-script
 PerlHandler Apache::daxepage
 </LocationMatch>
 
-<LocationMatch "^/daxepage/uploaded/[^/]+/[^/]+/.*html?$">
+<LocationMatch "^/daxepage/uploaded/[^/]+/[^/]+/(docs|supplemental)/.*html?$">
 SetHandler perl-script
 PerlHandler Apache::daxepage
 </LocationMatch>
@@ -527,12 +553,12 @@ SetHandler perl-script
 PerlHandler Apache::daxeopen
 </LocationMatch>
 
-<LocationMatch "^/daxeopen/(res|priv)/(.+/)?$">
+<LocationMatch "^/daxeopen/(res|priv|uploaded)/(.+/)?$">
 SetHandler perl-script
 PerlHandler Apache::daxeopen
 </LocationMatch>
 
-<LocationMatch "^/daxeopen/uploaded/[^/]+/[^/]+/.*html?$">
+<LocationMatch "^/daxeopen/uploaded/[^/]+/[^/]+/(docs|supplemental)/.*html?$">
 SetHandler perl-script
 PerlHandler Apache::daxeopen
 </LocationMatch>
@@ -544,6 +570,13 @@ PerlHandler Apache::daxeopen
 </IfModule>
 </LocationMatch>
 
+<LocationMatch "(?i)^/daxeopen/uploaded/.+\.(?!html$|htm$|xhtml$|xhtm$)[^.]*$">
+<IfModule mod_rewrite.c>
+  RewriteEngine on
+  RewriteRule /daxeopen/(.*) /$1
+</IfModule>
+</LocationMatch>
+
 <LocationMatch "(?i)^/daxeopen/(res/.*\.(jpg|jpeg|gif|png|svg))$">
 <IfModule mod_rewrite.c>
   RewriteEngine on
@@ -760,11 +793,43 @@ ErrorDocument     406 /adm/roles
 ErrorDocument     500 /adm/errorhandler
 </Location>
 
+<Location /adm/courseauthor>
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::loncourseauthor
+ErrorDocument     403 /adm/login
+ErrorDocument     406 /adm/roles
+ErrorDocument     500 /adm/errorhandler
+</Location>
+
+<Location /adm/courseuser>
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::loncourseuser
+ErrorDocument     403 /adm/login
+ErrorDocument     406 /adm/roles
+ErrorDocument     500 /adm/errorhandler
+</Location>
+
 <Location /adm/login>
 SetHandler perl-script
 PerlHandler Apache::lonlogin
 </Location>
 
+<LocationMatch "^/+adm/launch/tiny/[\w.-]+/\w+">
+SetHandler perl-script
+PerlHandler Apache::ltiauth
+</LocationMatch>
+
+<Location /adm/relaunch>
+SetHandler perl-script
+PerlHandler Apache::lonrelaunch
+</Location>
+
 <LocationMatch "^/+adm/lti($|/)">
 SetHandler perl-script
 PerlHandler Apache::ltiauth
@@ -848,6 +913,7 @@ PerlHandler Apache::migrateuser
 </Location>
 
 <Location /adm/sso>
+  Header set Cache-Control "private,no-store,no-cache,max-age=0"
   <IfModule mod_shib>
     AuthType shibboleth
     ShibUseEnvironment On
@@ -856,12 +922,25 @@ PerlHandler Apache::migrateuser
     require valid-user
     PerlAuthzHandler       Apache::lonshibacc
     PerlAuthzHandler       Apache::lonacc
+    ErrorDocument     403 /adm/login
+    ErrorDocument     500 /adm/errorhandler
   </IfModule>
   <IfModule !mod_shib>
     PerlTypeHandler        Apache::lonnoshib
   </IfModule>
 </Location>
 
+<Location /adm/linkexit>
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lonlinkexit
+ErrorDocument     403 /adm/login
+ErrorDocument     409 /adm/preferences?action=lockwarning
+ErrorDocument     500 /adm/errorhandler
+</Location>
+
 <Location /adm/annotations>
 AuthType LONCAPA
 Require valid-user