[LON-CAPA-cvs] cvs: loncom(version_2_9_X) / lond

[raeburn]

raeburn		Fri Sep  2 13:10:38 2011 EDT

  Modified files:              (Branch: version_2_9_X)
    /loncom	lond 
  Log:
  - Backport 1.476
  
  
Index: loncom/lond
diff -u loncom/lond:1.446.2.1 loncom/lond:1.446.2.2
--- loncom/lond:1.446.2.1	Sat Nov 13 02:21:06 2010
+++ loncom/lond	Fri Sep  2 13:10:38 2011
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.446.2.1 2010/11/13 02:21:06 raeburn Exp $
+# $Id: lond,v 1.446.2.2 2011/09/02 13:10:38 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -58,7 +58,7 @@
 my $status='';
 my $lastlog='';
 
-my $VERSION='$Revision: 1.446.2.1 $'; #' stupid emacs
+my $VERSION='$Revision: 1.446.2.2 $'; #' stupid emacs
 my $remoteVERSION;
 my $currenthostid="default";
 my $currentdomainid;
@@ -2197,7 +2197,9 @@
 
 	my $destname=$udir.'/'.$ufile;
 	my $transname=$udir.'/'.$ufile.'.in.transit';
-	my $remoteurl='http://'.$clientip.'/userfiles/'.$fname;
+        my $clientprotocol=$Apache::lonnet::protocol{$clientname};
+        $clientprotocol = 'http' if ($clientprotocol ne 'https');
+        my $remoteurl=$clientprotocol.'://'.$clientip.'/userfiles/'.$fname;
 	my $response;
 	Debug("Remote URL : $remoteurl Transfername $transname Destname: $destname");
 	alarm(120);
@@ -7039,7 +7041,9 @@
                 # the metadata
 		unless ($fname=~/\.meta$/) { &unsub("$fname.meta",$clientip); }
 		$fname=~s/\/home\/httpd\/html\/res/raw/;
-		$fname="http://".&Apache::lonnet::hostname($perlvar{'lonHostID'})."/".$fname;
+                my $protocol = $Apache::lonnet::protocol{$perlvar{'lonHostID'}};
+                $protocol = 'http' if ($protocol ne 'https');
+                $fname=$protocol.'://'.&Apache::lonnet::hostname($perlvar{'lonHostID'})."/".$fname;
 		$result="$fname\n";
 	    }
 	} else {