--- loncom/lonnet/perl/lonnet.pm 1999/11/22 17:23:13 1.5 +++ loncom/lonnet/perl/lonnet.pm 1999/12/22 17:18:04 1.7 @@ -2,7 +2,7 @@ # TCP networking package # 6/1/99,6/2,6/10,6/11,6/12,6/14,6/26,6/28,6/29,6/30, # 7/1,7/2,7/9,7/10,7/12,7/14,7/15,7/19, -# 11/8,11/16,11/18,11/22 Gerd Kortemeyer +# 11/8,11/16,11/18,11/22,11/23,12/22 Gerd Kortemeyer package Apache::lonnet; @@ -101,7 +101,7 @@ sub critical { { my $dfh; if ($dfh=Apache::File->new(">$dfilename")) { - print $dfh "$server:$cmd\n"; + print $dfh "$cmd\n"; } } sleep 2; @@ -113,7 +113,7 @@ sub critical { } } chomp($wcmd); - if ($wcmd eq "$server:$cmd") { + if ($wcmd eq $cmd) { &logthis("Connection buffer $dfilename: $cmd"); &logperm("D:$server:$cmd"); return 'con_delayed'; @@ -130,12 +130,30 @@ sub critical { # ---------------------------------------------------------- Append Environment sub appenv { - my ($name,$value)=@_; - my $fh; - unless ($fh=Apache::File->new(">>$ENV{'user.environment'}")) { + my %newenv=@_; + my @oldenv; + { + my $fh; + unless ($fh=Apache::File->new("$ENV{'user.environment'}")) { return 'error'; + } + @oldenv=<$fh>; + } + for (my $i=0; $i<=$#oldenv; $i++) { + chomp($oldenv[$i]); + my ($name,$value)=split(/=/,$oldenv[$i]); + $newenv{$name}=$value; + } + { + my $fh; + unless ($fh=Apache::File->new(">$ENV{'user.environment'}")) { + return 'error'; + } + my $newname; + foreach $newname (keys %newenv) { + print $fh "$newname=$newenv{$newname}\n"; + } } - print $fh "$name=$value\n"; return 'ok'; }