--- loncom/auth/lonacc.pm	2020/04/06 22:16:17	1.159.2.5.4.1
+++ loncom/auth/lonacc.pm	2016/02/20 00:12:49	1.163
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Cookie Based Access Handler
 #
-# $Id: lonacc.pm,v 1.159.2.5.4.1 2020/04/06 22:16:17 raeburn Exp $
+# $Id: lonacc.pm,v 1.163 2016/02/20 00:12:49 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -202,6 +202,14 @@ sub get_posted_cgi {
 			$fname='';
 			$fmime='';
 		    }
+                    if ($i<$#lines && $lines[$i+1]=~/^Content\-Type\:\s*([\w\-\/]+)/i) {
+                        # TODO: something with $1 !
+                        $i++;
+                    }
+                    if ($i<$#lines && $lines[$i+1]=~/^Content\-transfer\-encoding\:\s*([\w\-\/]+)/i) {
+                        # TODO: something with $1 !
+                        $i++;
+                    }
 		    $i++;
 		}
 	    } else {
@@ -331,24 +339,10 @@ sub sso_login {
         }
         unless ($hosthere) {
             ($is_balancer,$otherserver) =
-                &Apache::lonnet::check_loadbalancing($user,$domain,'login');
-            if ($is_balancer) {
-                if ($otherserver eq '') {
-                    my $lowest_load;
-                    ($otherserver,undef,undef,undef,$lowest_load) = &Apache::lonnet::choose_server($domain);
-                    if ($lowest_load > 100) {
-                        $otherserver = &Apache::lonnet::spareserver($lowest_load,$lowest_load,1,$domain);
-                    }
-                }
-                if ($otherserver ne '') {
-                    my @hosts = &Apache::lonnet::current_machine_ids();
-                    if (grep(/^\Q$otherserver\E$/,@hosts)) {
-                        $hosthere = $otherserver;
-                    }
-                }
-            }
+                &Apache::lonnet::check_loadbalancing($user,$domain);
         }
-	if (($is_balancer) && (!$hosthere)) {
+
+	if ($is_balancer) {
 	    # login but immediately go to switch server to find us a new 
 	    # machine
 	    &Apache::lonauth::success($r,$user,$domain,$home,'noredirect');
@@ -366,7 +360,14 @@ sub sso_login {
 	} else {
 	    # need to login them in, so generate the need data that
 	    # migrate expects to do login
-            my $ip = $r->get_remote_host();
+	    my $ip;
+	    my $c = $r->connection;
+	    eval {
+	        $ip = $c->remote_ip();
+	    };
+	    if ($@) {
+	        $ip = $c->client_ip();
+	    }
 	    my %info=('ip'        => $ip,
 		      'domain'    => $domain,
 		      'username'  => $user,
@@ -390,9 +391,6 @@ sub sso_login {
                 $info{'sso.reloginserver'} = 
                     $r->dir_config('lonSSOReloginServer'); 
             }
-            if (($is_balancer) && ($hosthere)) {
-                $info{'noloadbalance'} = $hosthere;
-            }
 	    my $token = 
 		&Apache::lonnet::tmpput(\%info,
 					$r->dir_config('lonHostID'));
@@ -517,8 +515,7 @@ sub handler {
             }
         } elsif ($env{'request.course.id'} &&
                  (($requrl =~ m{^/adm/$match_domain/$match_username/aboutme$}) ||
-                  ($requrl =~ m{^/public/$cdom/$cnum/syllabus$}) ||
-                  ($requrl =~ m{^/adm/$cdom/$cnum/\d+/ext\.tool$}))) {
+                  ($requrl =~ m{^/public/$cdom/$cnum/syllabus$}))) {
             my $query = $r->args;
             if ($query) {
                 foreach my $pair (split(/&/,$query)) {
@@ -666,8 +663,7 @@ sub handler {
 		($requrl=~m|\.problem/smpedit$|) ||
 		($requrl=~/^\/public\/.*\/syllabus$/) ||
                 ($requrl=~/^\/adm\/(viewclasslist|navmaps)$/) ||
-                ($requrl=~/^\/adm\/.*\/aboutme\/portfolio(\?|$)/) ||
-                ($requrl=~m{^/adm/$cdom/$cnum/\d+/ext\.tool$})) {
+                ($requrl=~/^\/adm\/.*\/aboutme\/portfolio(\?|$)/)) {
 # ------------------------------------- This is serious stuff, get symb and log
 		my $symb;
 		if ($query) {
@@ -762,7 +758,7 @@ sub handler {
 # ------------------------------------ See if this is a viewable portfolio file
     if (&Apache::lonnet::is_portfolio_url($requrl)) {
         my $clientip = $r->get_remote_host();
-	my $access=&Apache::lonnet::allowed('bre',$requrl,undef,undef,$clientip);
+        my $access=&Apache::lonnet::allowed('bre',$requrl,undef,undef,$clientip);
 	if ($access eq 'A') {
 	    &Apache::restrictedaccess::setup_handler($r);
 	    return OK;