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

[harris41]

harris41		Sat May 18 15:21:54 2002 EDT

  Modified files:              
    /loncom/lonnet/perl	lonnet.pm 
  Log:
  Incorrect. *BOTH* loncapa_apache.conf and loncapa.conf need to be read.
  These were not duplicate sections of code and the need to read BOTH
  files was documented in the program comment line.
  
  
  
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.226 loncom/lonnet/perl/lonnet.pm:1.227
--- loncom/lonnet/perl/lonnet.pm:1.226	Sat May 18 14:54:29 2002
+++ loncom/lonnet/perl/lonnet.pm	Sat May 18 15:21:54 2002
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.226 2002/05/18 18:54:29 www Exp $
+# $Id: lonnet.pm,v 1.227 2002/05/18 19:21:54 harris41 Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2822,6 +2822,17 @@
 }
 {
     my $config=Apache::File->new("/etc/httpd/conf/loncapa.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_apache.conf");
 
     while (my $configline=<$config>) {
         if ($configline =~ /^[^\#]*PerlSetVar/) {