--- loncom/loncapa_apache.conf	2016/10/23 18:43:33	1.250
+++ loncom/loncapa_apache.conf	2017/02/24 17:35:01	1.253
@@ -2,7 +2,7 @@
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
 
-# $Id: loncapa_apache.conf,v 1.250 2016/10/23 18:43:33 raeburn Exp $
+# $Id: loncapa_apache.conf,v 1.253 2017/02/24 17:35:01 damieng Exp $
 
 #
 # LON-CAPA Section (extensions to httpd.conf daemon configuration)
@@ -469,7 +469,7 @@ SetHandler perl-script
 PerlHandler Apache::lonxml
 </LocationMatch>
 
-<LocationMatch "^/daxe(page|open)/priv/">
+<LocationMatch "^/daxepage/priv/">
 AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::loncacc
@@ -479,6 +479,12 @@ 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
@@ -504,7 +510,12 @@ SetHandler perl-script
 PerlHandler Apache::daxeopen
 </LocationMatch>
 
-<LocationMatch "^/daxeopen/priv/.*/$">
+<LocationMatch "^/daxeopen/$">
+SetHandler perl-script
+PerlHandler Apache::daxeopen
+</LocationMatch>
+
+<LocationMatch "^/daxeopen/(res|priv)/(.+/)?$">
 SetHandler perl-script
 PerlHandler Apache::daxeopen
 </LocationMatch>
@@ -521,6 +532,13 @@ PerlHandler Apache::daxeopen
 </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
@@ -1406,6 +1424,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>