--- loncom/loncapa_apache.conf	2017/06/22 02:11:23	1.215.2.22.2.1
+++ loncom/loncapa_apache.conf	2016/02/17 00:05:09	1.239
@@ -2,7 +2,7 @@
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
 
-# $Id: loncapa_apache.conf,v 1.215.2.22.2.1 2017/06/22 02:11:23 raeburn Exp $
+# $Id: loncapa_apache.conf,v 1.239 2016/02/17 00:05:09 damieng 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|/adm/jsMath|/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,19 +270,6 @@ 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 "^/+priv/.*">
 AuthType LONCAPA
 Require valid-user
@@ -458,6 +445,55 @@ SetHandler perl-script
 PerlHandler Apache::lonxml
 </LocationMatch>
 
+<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 "^/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>
+
+<LocationMatch "^/daxeopen/priv/.*/$">
+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
+</IfModule>
+
+<LocationMatch "^/daxesave$">
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::daxesave
+</LocationMatch>
+
 <LocationMatch "^/adm/wrapper/">
 AuthType LONCAPA
 Require valid-user
@@ -524,6 +560,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
@@ -567,12 +613,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>
@@ -1315,7 +1361,6 @@ PerlHandler Apache::groupsort
 PerlCleanupHandler Apache::groupsort::cleanup
 PerlCleanupHandler	Apache::lonacc::cleanup
 ErrorDocument     403 /adm/login
-ErrorDocument     406 /adm/roles
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
@@ -1327,7 +1372,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>
@@ -1350,17 +1395,6 @@ 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
@@ -1477,7 +1511,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,10 +1522,24 @@ AllowOverride None
 </IfModule>
 </Directory>
  
+# Allow construction space files to be served
+
+<Directory "/home/*/public_html/" >
+Options Includes FollowSymLinks
+AllowOverride
+<IfModule mod_authz_core.c>
+  Require all granted
+</IfModule>
+<IfModule !mod_authz_core.c>
+  order allow,deny
+  allow from all
+</IfModule>
+</Directory>
+
 # 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
@@ -1519,7 +1567,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
@@ -1533,7 +1581,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
@@ -1547,7 +1595,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
@@ -1598,7 +1646,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