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

[raeburn]

raeburn		Sun Jan  8 23:34:39 2012 EDT

  Modified files:              (Branch: version_2_10_X)
    /loncom/lonnet/perl	lonnet.pm 
  Log:
  - Backport 1.1151.
  
  
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.1056.4.35 loncom/lonnet/perl/lonnet.pm:1.1056.4.36
--- loncom/lonnet/perl/lonnet.pm:1.1056.4.35	Sun Jan  8 22:58:21 2012
+++ loncom/lonnet/perl/lonnet.pm	Sun Jan  8 23:34:38 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.1056.4.35 2012/01/08 22:58:21 raeburn Exp $
+# $Id: lonnet.pm,v 1.1056.4.36 2012/01/08 23:34:38 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -882,7 +882,7 @@
     my %domconfhash = &Apache::loncommon::get_domainconf($udom);
     my %servers = &get_servers($udom);
     my $lowest_load = 30000;
-    my ($login_host,$hostname,$portal_path);
+    my ($login_host,$hostname,$portal_path,$isredirect);
     foreach my $lonhost (keys(%servers)) {
         my $loginvia;
         if ($checkloginvia) {
@@ -893,12 +893,14 @@
                     &compare_server_load($lonhost, $login_host, $lowest_load);
                 if ($login_host eq $server) {
                     $portal_path = $path;
+                    $isredirect = 1;
                 }
             } else {
                 ($login_host, $lowest_load) =
                     &compare_server_load($lonhost, $login_host, $lowest_load);
                 if ($login_host eq $lonhost) {
                     $portal_path = '';
+                    $isredirect = '';
                 }
             }
         } else {
@@ -909,7 +911,7 @@
     if ($login_host ne '') {
         $hostname = &hostname($login_host);
     }
-    return ($login_host,$hostname,$portal_path);
+    return ($login_host,$hostname,$portal_path,$isredirect);
 }
 
 # --------------------------------------------- Try to change a user's password