--- loncom/loncapa_apache.conf	2003/04/12 15:58:43	1.44
+++ loncom/loncapa_apache.conf	2003/05/12 21:22:57	1.48
@@ -1,7 +1,7 @@
 ##
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
-## $Id: loncapa_apache.conf,v 1.44 2003/04/12 15:58:43 www Exp $
+## $Id: loncapa_apache.conf,v 1.48 2003/05/12 21:22:57 www Exp $
 ##
 
 #
@@ -18,8 +18,10 @@ Group www
 
 # ======================================================= Shared Object Modules
 
-LoadModule perl_module       modules/libperl.so
+LoadModule perl_module       modules/mod_perl.so
+<IfDefine !MODPERL2>
 AddModule mod_perl.c
+</IfDefine>
 
 # =============================================================== Miscellaneous
 
@@ -39,6 +41,7 @@ ScriptAlias /cgi-bin/ "/home/httpd/cgi-b
 
 PerlTransHandler	Apache::lontrans
 
+#PerlWarn On
 <LocationMatch "^/+res.*">
 PerlAccessHandler       Apache::lonacc
 PerlHeaderParserHandler Apache::lonrep
@@ -178,7 +181,7 @@ SetHandler perl-script
 PerlHandler Apache::lonsequence
 </LocationMatch>
 
-<LocationMatch "\.meta$>
+<LocationMatch "^/(res|\~|public|uploaded|adm).*\.meta$>
 SetHandler perl-script
 PerlHandler Apache::lonmeta
 </LocationMatch>
@@ -188,12 +191,12 @@ SetHandler perl-script
 PerlHandler Apache::lonrights
 </LocationMatch>
 
-<LocationMatch "^/(res|\~).*\.(xml|html|htm|xhtml|xhtm)$">
+<LocationMatch "^/(res|public|uploaded|\~).*\.(xml|html|htm|xhtml|xhtm)$">
 SetHandler perl-script
 PerlHandler Apache::lonxml
 </LocationMatch>
 
-<LocationMatch "^/(res|\~).*\.(problem|exam|quiz|assess|survey|form|library)$">
+<LocationMatch "^/(res|public|uploaded|\~).*\.(problem|exam|quiz|assess|survey|form|library)$">
 SetHandler perl-script
 PerlHandler Apache::lonhomework
 </LocationMatch>
@@ -780,4 +783,6 @@ Include conf/loncapa.conf
 # ================================================== Initiate mod_perl starting
 
 PerlRequire      conf/startup.pl
+<IfDefine !MODPERL2>
 PerlFreshRestart On
+</IfDefine>