--- loncom/loncapa_apache.conf	2019/07/28 15:26:07	1.215.2.23
+++ loncom/loncapa_apache.conf	2017/05/08 14:20:14	1.255
@@ -2,7 +2,7 @@
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
 
-# $Id: loncapa_apache.conf,v 1.215.2.23 2019/07/28 15:26:07 raeburn Exp $
+# $Id: loncapa_apache.conf,v 1.255 2017/05/08 14:20:14 raeburn Exp $
 
 #
 # LON-CAPA Section (extensions to httpd.conf daemon configuration)
@@ -68,7 +68,7 @@ PerlAuthzHandler	'sub { return OK }'
 </LocationMatch>
 
 # Send proper expires header to avoid unnecessary HTTP request for static content
-<LocationMatch "^(/adm/lonIcons|/adm/jQuery|/res/adm/pages|/ckeditor|/adm/jpicker|/adm/countdown|/adm/spellchecker|/adm/nicescroll|/adm/MathJax)">
+<LocationMatch "^(/adm/lonIcons|/adm/jQuery|/res/adm/pages|/ckeditor|/adm/jpicker|/adm/countdown|/adm/spellchecker|/adm/nicescroll|/adm/MathJax|/adm/daxe)">
         ExpiresActive On
         ExpiresDefault "access plus 12 hours"
         Header set Cache-Control "public, no-transform"
@@ -270,6 +270,30 @@ ErrorDocument     406 /adm/notinit.html
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
+<LocationMatch "^/adm/.*/ext\.tool$">
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler        Apache::lonacc
+SetHandler              perl-script
+PerlHandler             Apache::londatecheck
+PerlHandler             Apache::lonipcheck
+PerlHandler             Apache::lonexttool
+ErrorDocument     404 /adm/notfound.html
+ErrorDocument     406 /adm/notinit.html
+ErrorDocument     500 /adm/errorhandler
+</LocationMatch>
+
+<LocationMatch "^/adm/placement$">
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler        Apache::lonacc
+SetHandler              perl-script
+PerlHandler             Apache::lonplacementtest
+ErrorDocument     404 /adm/notfound.html
+ErrorDocument     406 /adm/notinit.html
+ErrorDocument     500 /adm/errorhandler
+</LocationMatch>
+
 <LocationMatch "^/+priv/.*">
 AuthType LONCAPA
 Require valid-user
@@ -445,6 +469,94 @@ SetHandler perl-script
 PerlHandler Apache::lonxml
 </LocationMatch>
 
+<LocationMatch "^/daxepage/priv/">
+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 "^/daxeopen/">
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+</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     500 /adm/errorhandler
+</LocationMatch>
+
+<LocationMatch "^/daxepage/priv/.*\.(task|problem|exam|quiz|assess|survey|library|xml|html|htm|xhtml|xhtm)$">
+SetHandler perl-script
+PerlHandler Apache::daxepage
+</LocationMatch>
+
+<LocationMatch "^/daxepage/uploaded/[^/]+/[^/]+/.*html?$">
+SetHandler perl-script
+PerlHandler Apache::daxepage
+</LocationMatch>
+
+<LocationMatch "^/daxeopen/priv/.*\.(task|problem|exam|quiz|assess|survey|library|xml|html|htm|xhtml|xhtm)$">
+SetHandler perl-script
+PerlHandler Apache::daxeopen
+</LocationMatch>
+
+<LocationMatch "^/daxeopen/$">
+SetHandler perl-script
+PerlHandler Apache::daxeopen
+</LocationMatch>
+
+<LocationMatch "^/daxeopen/(res|priv)/(.+/)?$">
+SetHandler perl-script
+PerlHandler Apache::daxeopen
+</LocationMatch>
+
+<LocationMatch "^/daxeopen/uploaded/[^/]+/[^/]+/.*html?$">
+SetHandler perl-script
+PerlHandler Apache::daxeopen
+</LocationMatch>
+
+<LocationMatch "(?i)^/daxeopen/priv/.+\.(?!task$|problem$|exam$|quiz$|assess$|survey$|library$|xml$|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
+  RewriteRule /daxeopen/(.*) /$1
+</IfModule>
+</LocationMatch>
+
+<LocationMatch "^/daxesave$">
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::daxesave
+</LocationMatch>
+
+<Location /adm/coursepub>
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::loncoursepub
+ErrorDocument     404 /adm/notfound.html
+ErrorDocument     500 /adm/errorhandler
+</Location>
+
 <LocationMatch "^/adm/wrapper/">
 AuthType LONCAPA
 Require valid-user
@@ -511,6 +623,16 @@ 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
@@ -554,12 +676,12 @@ 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
 </Location>
@@ -707,16 +829,6 @@ ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
-<Location /adm/annotation>
-AuthType LONCAPA
-Require valid-user
-PerlAuthzHandler       Apache::lonacc
-SetHandler perl-script
-PerlHandler Apache::admannotations
-ErrorDocument     403 /adm/login
-ErrorDocument     500 /adm/errorhandler
-</Location>
-
 <Location /adm/spellcheck>
 AuthType LONCAPA
 Require valid-user
@@ -1324,7 +1436,7 @@ SetHandler perl-script
 PerlHandler Apache::lonwishlistdisplay
 ErrorDocument     403 /adm/login
 ErrorDocument     406 /adm/roles
-ErrorDocument     500 /adm/errorhandler
+ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/setblock>
@@ -1474,7 +1586,7 @@ AllowOverride None
 # Allow uploaded files to be served
 
 <Directory "/home/httpd/lonUsers">
-Options FollowSymLinks
+Options Includes FollowSymLinks
 AllowOverride None
 <IfModule mod_authz_core.c>
   Require all granted
@@ -1488,7 +1600,7 @@ AllowOverride None
 # Yes to symbolic links and server-side includes
 
 <Directory /home/httpd/html>
-Options FollowSymLinks
+Options Includes FollowSymLinks
 AllowOverride None
 <IfModule mod_authz_core.c>
   Require all granted
@@ -1516,7 +1628,7 @@ Options ExecCGI FollowSymLinks
 # Allow serving of files in prtspool
 
 <Directory "/home/httpd/prtspool/">
-Options FollowSymLinks
+Options Includes FollowSymLinks
 AllowOverride None
 <IfModule mod_authz_core.c>
   Require all granted
@@ -1530,7 +1642,7 @@ AllowOverride None
 # Allow serving of files in zipspool
 
 <Directory "/home/httpd/zipspool/">
-Options FollowSymLinks
+Options Includes FollowSymLinks
 AllowOverride None
 <IfModule mod_authz_core.c>
   Require all granted
@@ -1544,7 +1656,7 @@ AllowOverride None
 # Allow serving of files in captchaspool
 
 <Directory "/home/httpd/captchaspool/">
-Options FollowSymLinks
+Options Includes FollowSymLinks
 AllowOverride None
 <IfModule mod_authz_core.c>
   Require all granted
@@ -1595,7 +1707,7 @@ Options Indexes FollowSymLinks
 # ******** THESE "SHOULD" NEVER BE ALTERED BY THE USER ************************
 # ====================================== Internal Settings / Perl Configuration
 
-PerlSetVar	 lonVersion   '<!-- VERSION -->'
+PerlSetVar	 lonVersion  '<!-- VERSION -->'
 PerlSetVar       lonIDsDir    /home/httpd/lonIDs
 PerlSetVar       lonDAVsessDir /home/httpd/webdav/sessionIDs
 PerlSetVar       lonTabDir    /home/httpd/lonTabs
@@ -1667,6 +1779,7 @@ PerlSetVar lonCertificateDirectory /home
 
 PerlSetVar lonnetCertificateAuthority loncapaCA.pem
 PerlSetVar lonnetCertificate          lonhostcert.pem
+PerlSetVar lonnetHostnameCertificate  lonhostnamecert.pem
 
 #
 #  To generate the request for a certificate, and to negotiate the