--- loncom/auth/lonacc.pm	2016/08/16 20:36:45	1.159.2.4
+++ loncom/auth/lonacc.pm	2015/12/03 20:40:21	1.162
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Cookie Based Access Handler
 #
-# $Id: lonacc.pm,v 1.159.2.4 2016/08/16 20:36:45 raeburn Exp $
+# $Id: lonacc.pm,v 1.162 2015/12/03 20:40:21 damieng Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -109,6 +109,7 @@ sub cleanup {
     my ($r)=@_;
     if (! $r->is_initial_req()) { return DECLINED; }
     &Apache::lonnet::save_cache();
+    &Apache::lontexconvert::jsMath_reset();
     return OK;
 }
 
@@ -202,6 +203,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 {
@@ -352,7 +361,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,
@@ -743,7 +759,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;