--- loncom/lonnet/perl/lonnet.pm 2005/03/31 15:55:47 1.618 +++ loncom/lonnet/perl/lonnet.pm 2005/04/05 20:43:27 1.619 @@ -1,7 +1,7 @@ # The LearningOnline Network # TCP networking package # -# $Id: lonnet.pm,v 1.618 2005/03/31 15:55:47 albertel Exp $ +# $Id: lonnet.pm,v 1.619 2005/04/05 20:43:27 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -40,7 +40,8 @@ qw(%perlvar %hostname %badServerCache %i %courselogs %accesshash %userrolehash $processmarker $dumpcount %coursedombuf %coursenumbuf %coursehombuf %coursedescrbuf %courseinstcodebuf %courseownerbuf %domaindescription %domain_auth_def %domain_auth_arg_def - %domain_lang_def %domain_city %domain_longi %domain_lati $tmpdir $_64bit); + %domain_lang_def %domain_city %domain_longi %domain_lati $tmpdir $_64bit + %env); use IO::Socket; use GDBM_File; @@ -54,6 +55,11 @@ use Cache::Memcached; my $readit; my $max_connection_retries = 10; # Or some such value. +require Exporter; + +our @ISA = qw (Exporter); +our @EXPORT = qw(%env); + =pod =head1 Package Variables @@ -279,6 +285,7 @@ sub transfer_profile_to_env { chomp($profile[$envi]); my ($envname,$envvalue)=split(/=/,$profile[$envi]); $ENV{$envname} = $envvalue; + $env{$envname} = $envvalue; if (my ($key,$time) = ($envname =~ /^(cgi\.(\d+)_\d+\.)/)) { if ($time < time-300) { $Remove{$key}++; @@ -286,6 +293,7 @@ sub transfer_profile_to_env { } } $ENV{'user.environment'} = "$lonidsdir/$handle.id"; + $env{'user.environment'} = "$lonidsdir/$handle.id"; foreach my $expired_key (keys(%Remove)) { &delenv($expired_key); } @@ -303,6 +311,7 @@ sub appenv { delete($newenv{$_}); } else { $ENV{$_}=$newenv{$_}; + $env{$_}=$newenv{$_}; } } @@ -390,6 +399,7 @@ sub delenv { if ($_=~/^$delthis/) { my ($key,undef) = split('=',$_); delete($ENV{$key}); + delete($env{$key}); } else { print $fh $_; } @@ -5653,6 +5663,8 @@ BEGIN { } } close($config); + # FIXME: dev server don't want this, production servers _do_ want this + #&get_iphost(); } sub get_iphost {