--- loncom/loncapa_apache.conf	2015/12/03 20:40:16	1.236
+++ loncom/loncapa_apache.conf	2016/02/22 12:39:51	1.241
@@ -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.241 2016/02/22 12:39:51 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"
@@ -445,18 +445,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/[^/]+/[^/]+/supplemental/.*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,6 +485,11 @@ SetHandler perl-script
 PerlHandler Apache::daxeopen
 </LocationMatch>
 
+<LocationMatch "^/daxeopen/uploaded/[^/]+/[^/]+/supplemental/.*html?$">
+SetHandler perl-script
+PerlHandler Apache::daxeopen
+</LocationMatch>
+
 <IfModule mod_rewrite.c>
   RewriteEngine on
   RewriteRule ^/daxeopen/(.*) /$1
@@ -477,10 +501,6 @@ Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::daxesave
-ErrorDocument     403 /adm/login
-ErrorDocument     404 /adm/notfound.html
-ErrorDocument     406 /adm/unauthorized
-ErrorDocument     500 /adm/errorhandler
 </LocationMatch>
 
 <LocationMatch "^/adm/wrapper/">