--- loncom/loncapa_apache.conf	2015/12/03 20:40:16	1.236
+++ loncom/loncapa_apache.conf	2016/07/01 20:00:07	1.247
@@ -2,7 +2,7 @@
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
 
-# $Id: loncapa_apache.conf,v 1.236 2015/12/03 20:40:16 damieng Exp $
+# $Id: loncapa_apache.conf,v 1.247 2016/07/01 20:00:07 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|/adm/jsMath|/res/adm/pages|/ckeditor|/adm/jpicker|/adm/countdown|/adm/spellchecker|/adm/nicescroll|/adm/MathJax|/adm/daxe)">
+<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/.*/exttools?$">
+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,18 +469,37 @@ SetHandler perl-script
 PerlHandler Apache::lonxml
 </LocationMatch>
 
-<LocationMatch "^/daxeopen/priv/.*$">
+<LocationMatch "^/daxe(page|open)/priv/">
 AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::loncacc
-SetHandler perl-script
 ErrorDocument     403 /adm/login
 ErrorDocument     404 /adm/notfound.html
 ErrorDocument     406 /adm/unauthorized
 ErrorDocument     500 /adm/errorhandler
 </LocationMatch>
 
-<LocationMatch "^/daxeopen/priv/.*\.(task|problem|exam|quiz|assess|survey|library)$">
+<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>
@@ -466,10 +509,17 @@ 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
+  RewriteRule /daxeopen/(.*) /$1
 </IfModule>
+</LocationMatch>
 
 <LocationMatch "^/daxesave$">
 AuthType LONCAPA
@@ -477,11 +527,17 @@ Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::daxesave
-ErrorDocument     403 /adm/login
+</LocationMatch>
+
+<Location /adm/coursepub>
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::loncoursepub
 ErrorDocument     404 /adm/notfound.html
-ErrorDocument     406 /adm/unauthorized
 ErrorDocument     500 /adm/errorhandler
-</LocationMatch>
+</Location>
 
 <LocationMatch "^/adm/wrapper/">
 AuthType LONCAPA