--- loncom/loncapa_apache.conf	2003/09/16 18:29:23	1.59.2.2
+++ loncom/loncapa_apache.conf	2003/08/25 17:20:09	1.60
@@ -1,7 +1,7 @@
 ##
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
-## $Id: loncapa_apache.conf,v 1.59.2.2 2003/09/16 18:29:23 albertel Exp $
+## $Id: loncapa_apache.conf,v 1.60 2003/08/25 17:20:09 albertel Exp $
 ##
 
 #
@@ -40,6 +40,9 @@ ScriptAlias /cgi-bin/ "/home/httpd/cgi-b
 # ------------------------------------------------------------- Access Handlers
 
 PerlTransHandler	Apache::lontrans
+<IfDefine MODPERL2>
+PerlCleanupHandler	Apache::lonnet::cleanenv
+</IfDefine>
 
 #PerlWarn On
 <LocationMatch "^/+res.*">
@@ -173,43 +176,43 @@ ErrorDocument	  500 /adm/errorhandler
 
 # --------------------------------------------- Resource Space Content Handlers
 
-<LocationMatch "^/+res.*/$">
+<LocationMatch "^/res.*/$">
 SetHandler perl-script
 PerlHandler Apache::lonindexer
 PerlCleanupHandler Apache::lonindexer::cleanup
 </LocationMatch>
 
-<LocationMatch "^/+(res|\~).*\.tex$">
+<LocationMatch "^/(res|\~).*\.tex$">
 SetHandler perl-script
 PerlHandler Apache::lontex
 </LocationMatch>
 
-<LocationMatch "^/+res/.*\.page$>
+<LocationMatch "^/res/.*\.page$>
 SetHandler perl-script
 PerlHandler Apache::lonpage
 </LocationMatch>
 
-<LocationMatch "^/+res/.*\.sequence$>
+<LocationMatch "^/res/.*\.sequence$>
 SetHandler perl-script
 PerlHandler Apache::lonsequence
 </LocationMatch>
 
-<LocationMatch "^/+(res|\~|public|uploaded|adm).*\.meta$>
+<LocationMatch "^/(res|\~|public|uploaded|adm).*\.meta$>
 SetHandler perl-script
 PerlHandler Apache::lonmeta
 </LocationMatch>
 
-<LocationMatch "^/+(res|\~).*\.rights$>
+<LocationMatch "^/(res|\~).*\.rights$>
 SetHandler perl-script
 PerlHandler Apache::lonrights
 </LocationMatch>
 
-<LocationMatch "^/+(res|\~).*\.(xml|html|htm|xhtml|xhtm|sty)$">
+<LocationMatch "^/(res|\~).*\.(xml|html|htm|xhtml|xhtm|sty)$">
 SetHandler perl-script
 PerlHandler Apache::lonxml
 </LocationMatch>
 
-<LocationMatch "^/+(res|\~).*\.(problem|exam|quiz|assess|survey|form|library)$">
+<LocationMatch "^/(res|\~).*\.(problem|exam|quiz|assess|survey|form|library)$">
 SetHandler perl-script
 PerlHandler Apache::lonhomework
 </LocationMatch>
@@ -396,7 +399,7 @@ ErrorDocument     406 /adm/unauthorized
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
-<LocationMatch "^/+\~.*/$">
+<LocationMatch "^/\~.*/$">
 PerlAccessHandler       Apache::loncacc
 SetHandler perl-script
 PerlHandler Apache::lonpubdir
@@ -794,10 +797,6 @@ PerlSetVar       lonhttpdPort  8080
 
 Include conf/loncapa.conf
 
-# ================================================= Include local configuration
-
-Include conf/loncapa_apache_local*.conf
-
 # ================================================== Initiate mod_perl starting
 
 PerlRequire      conf/startup.pl