--- loncom/lonnet/perl/lonnet.pm	2012/05/30 16:57:06	1.1172.2.4
+++ loncom/lonnet/perl/lonnet.pm	2012/05/28 12:28:14	1.1174
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.1172.2.4 2012/05/30 16:57:06 raeburn Exp $
+# $Id: lonnet.pm,v 1.1174 2012/05/28 12:28:14 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -75,6 +75,8 @@ use LWP::UserAgent();
 use HTTP::Date;
 use Image::Magick;
 
+use Encode;
+
 use vars qw(%perlvar %spareid %pr %prp $memcache %packagetab $tmpdir
             $_64bit %env %protocol %loncaparevs %serverhomeIDs %needsrelease
             %managerstab);
@@ -97,6 +99,7 @@ use File::MMagic;
 use LONCAPA qw(:DEFAULT :match);
 use LONCAPA::Configuration;
 use LONCAPA::lonmetadata;
+use LONCAPA::Lond;
 
 use File::Copy;
 
@@ -1236,7 +1239,6 @@ sub check_loadbalancing {
     my ($is_balancer,$dom_in_use,$homeintdom,$rule_in_effect,
         $offloadto,$otherserver);
     my $lonhost = $perlvar{'lonHostID'};
-    my @hosts = &current_machine_ids();
     my $uprimary_id = &Apache::lonnet::domain($udom,'primary');
     my $uintdom = &Apache::lonnet::internet_dom($uprimary_id);
     my $intdom = &Apache::lonnet::internet_dom($lonhost);
@@ -1263,6 +1265,7 @@ sub check_loadbalancing {
         my $currtargets = $result->{'targets'};
         my $currrules = $result->{'rules'};
         if ($currbalancer ne '') {
+            my @hosts = &current_machine_ids();
             if (grep(/^\Q$currbalancer\E$/,@hosts)) {
                 $is_balancer = 1;
             }
@@ -1378,18 +1381,13 @@ sub check_loadbalancing {
             }
         }
     }
-    if (($otherserver ne '') && (grep(/^\Q$otherserver\E$/,@hosts))) {
-        $is_balancer = 0;
-    }
     return ($is_balancer,$otherserver);
 }
 
 sub get_loadbalancer_targets {
     my ($rule_in_effect,$currtargets,$uname,$udom) = @_;
     my $offloadto;
-    if ($rule_in_effect eq 'none') {
-        return [$perlvar{'lonHostID'}];
-    } elsif ($rule_in_effect eq '') {
+    if ($rule_in_effect eq '') {
         $offloadto = $currtargets;
     } else {
         if ($rule_in_effect eq 'homeserver') {
@@ -2573,10 +2571,11 @@ sub ssi {
 
     $request->header(Cookie => $ENV{'HTTP_COOKIE'});
     my $response= $ua->request($request);
+    my $content = Encode::decode_utf8($response->content);
     if (wantarray) {
-	return ($response->content, $response);
+	return ($content, $response);
     } else {
-	return $response->content;
+	return $content;
     }
 }