[LON-CAPA-cvs] cvs: loncom /lonnet/perl lonnet.pm

[harris41]

harris41		Sat May 18 15:59:07 2002 EDT

  Modified files:              
    /loncom/lonnet/perl	lonnet.pm 
  Log:
  okay. no more duplication.  access.conf was intentionally
  still being read prior to version 1.223.  But given all the
  confusion, there will be no access.conf.  Thus only two
  files are read now (loncapa.conf and loncapa_apache.conf)...
  and umm.. they are only read once now (oops).
  
  
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.227 loncom/lonnet/perl/lonnet.pm:1.228
--- loncom/lonnet/perl/lonnet.pm:1.227	Sat May 18 15:21:54 2002
+++ loncom/lonnet/perl/lonnet.pm	Sat May 18 15:59:07 2002
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.227 2002/05/18 19:21:54 harris41 Exp $
+# $Id: lonnet.pm,v 1.228 2002/05/18 19:59:07 harris41 Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2805,21 +2805,8 @@
 }
 
 BEGIN {
-# ---------------------------------- Read loncapa_apache.conf and loncapa.conf
-# (eventually access.conf will become deprecated)
+# ----------------------------------- Read loncapa.conf and loncapa_apache.conf
     unless ($readit) {
-
-{
-    my $config=Apache::File->new("/etc/httpd/conf/loncapa_apache.conf");
-
-    while (my $configline=<$config>) {
-        if ($configline =~ /^[^\#]*PerlSetVar/) {
-	   my ($dummy,$varname,$varvalue)=split(/\s+/,$configline);
-           chomp($varvalue);
-           $perlvar{$varname}=$varvalue;
-        }
-    }
-}
 {
     my $config=Apache::File->new("/etc/httpd/conf/loncapa.conf");