--- loncom/loncapa_apache.conf	2016/06/24 19:36:31	1.245
+++ loncom/loncapa_apache.conf	2017/02/23 21:32:15	1.252
@@ -2,7 +2,7 @@
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
 
-# $Id: loncapa_apache.conf,v 1.245 2016/06/24 19:36:31 raeburn Exp $
+# $Id: loncapa_apache.conf,v 1.252 2017/02/23 21:32:15 damieng Exp $
 
 #
 # LON-CAPA Section (extensions to httpd.conf daemon configuration)
@@ -504,6 +504,16 @@ SetHandler perl-script
 PerlHandler Apache::daxeopen
 </LocationMatch>
 
+<LocationMatch "^/daxeopen/$">
+SetHandler perl-script
+PerlHandler Apache::daxeopen
+</LocationMatch>
+
+<LocationMatch "^/daxeopen/res/(.+/)?$">
+SetHandler perl-script
+PerlHandler Apache::daxeopen
+</LocationMatch>
+
 <LocationMatch "^/daxeopen/priv/.*/$">
 SetHandler perl-script
 PerlHandler Apache::daxeopen
@@ -514,7 +524,14 @@ SetHandler perl-script
 PerlHandler Apache::daxeopen
 </LocationMatch>
 
-<LocationMatch "(?i)^/daxeopen/priv/.*\.(?!task|problem|exam|quiz|assess|survey|library|xml|html|htm|xhtml|xhtm)$">
+<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
@@ -529,6 +546,16 @@ 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
@@ -1396,6 +1423,7 @@ PerlHandler Apache::groupsort
 PerlCleanupHandler Apache::groupsort::cleanup
 PerlCleanupHandler	Apache::lonacc::cleanup
 ErrorDocument     403 /adm/login
+ErrorDocument     406 /adm/roles
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
@@ -1430,6 +1458,17 @@ SetHandler             perl-script
 PerlHandler            Apache::lonblockingstatus
 </Location>
 
+<Location /adm/accesstimes>
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+SetHandler             perl-script
+PerlHandler            Apache::lonaccesstimes
+ErrorDocument     403 /adm/login
+ErrorDocument     406 /adm/roles
+ErrorDocument     500 /adm/errorhandler
+</Location>
+
 <Location /adm/errorhandler>
 SetHandler perl-script
 PerlHandler Apache::lonerrorhandler
@@ -1753,6 +1792,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