--- loncom/auth/switchserver.pm	2013/09/29 00:49:24	1.32
+++ loncom/auth/switchserver.pm	2015/01/08 21:18:29	1.33
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Switch Servers Handler
 #
-# $Id: switchserver.pm,v 1.32 2013/09/29 00:49:24 raeburn Exp $
+# $Id: switchserver.pm,v 1.33 2015/01/08 21:18:29 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -96,9 +96,16 @@ sub handler {
 
     if (!defined($switch_to)) { return FORBIDDEN; }
 
+    my $protocol = 'http';
+    if ($env{'form.otherserver'}) {
+        if ($Apache::lonnet::protocol{$env{'form.otherserver'}} eq 'https') {
+            $protocol = $Apache::lonnet::protocol{$env{'form.otherserver'}};
+        }
+    } 
+
     if ($env{'user.name'} eq 'public'
 	&& $env{'user.domain'} eq 'public') {
-	my $url = 'http://'.$switch_to.$r->uri;
+	my $url = $protocol.'://'.$switch_to.$r->uri;
 	return &do_redirect($r,$url,1)
     }
 
@@ -193,7 +200,7 @@ sub handler {
         $info{'sso.reloginserver'} = $env{'request.sso.reloginserver'};
     }
     my $token = &Apache::lonnet::tmpput(\%info,$env{'form.otherserver'});
-    my $url ='http://'.$switch_to.'/adm/login?'.
+    my $url =$protocol.'://'.$switch_to.'/adm/login?'.
 	'domain='.$env{'user.domain'}.
 	'&username='.$env{'user.name'}.
 	'&token='.$token;