--- loncom/lonnet/perl/lonnet.pm 2002/05/18 18:54:29 1.226 +++ loncom/lonnet/perl/lonnet.pm 2002/05/18 19:59:07 1.228 @@ -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.228 2002/05/18 19:59:07 harris41 Exp $ # # Copyright Michigan State University Board of Trustees # @@ -2805,12 +2805,10 @@ sub goodbye { } 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"); + my $config=Apache::File->new("/etc/httpd/conf/loncapa.conf"); while (my $configline=<$config>) { if ($configline =~ /^[^\#]*PerlSetVar/) { @@ -2821,7 +2819,7 @@ BEGIN { } } { - my $config=Apache::File->new("/etc/httpd/conf/loncapa.conf"); + my $config=Apache::File->new("/etc/httpd/conf/loncapa_apache.conf"); while (my $configline=<$config>) { if ($configline =~ /^[^\#]*PerlSetVar/) {