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

[raeburn]

raeburn		Fri Dec 13 02:28:45 2013 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/lonnet/perl	lonnet.pm 
  Log:
  - For 2.11
    - Backport 1.1244, 1.1245
  
  
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.1172.2.35 loncom/lonnet/perl/lonnet.pm:1.1172.2.36
--- loncom/lonnet/perl/lonnet.pm:1.1172.2.35	Wed Oct 16 19:06:28 2013
+++ loncom/lonnet/perl/lonnet.pm	Fri Dec 13 02:28:45 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.1172.2.35 2013/10/16 19:06:28 raeburn Exp $
+# $Id: lonnet.pm,v 1.1172.2.36 2013/12/13 02:28:45 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -75,7 +75,7 @@
 use HTTP::Date;
 use Image::Magick;
 
-use vars qw(%perlvar %spareid %pr %prp $memcache %packagetab $tmpdir $apache
+use vars qw(%perlvar %spareid %pr %prp $memcache %packagetab $tmpdir
             $_64bit %env %protocol %loncaparevs %serverhomeIDs %needsrelease
             %managerstab);
 
@@ -601,7 +601,7 @@
 
 # ---------------------------------------------------- Check for valid session 
 sub check_for_valid_session {
-    my ($r,$name) = @_;
+    my ($r,$name,$userhashref) = @_;
     my %cookies=CGI::Cookie->parse($r->header_in('Cookie'));
     if ($name eq '') {
         $name = 'lonID';
@@ -633,12 +633,9 @@
 	return undef;
     }
 
-    if (($r->user() eq '') && ($apache >= 2.4)) {
-        if ($disk_env{'user.domain'} eq $r->dir_config('lonDefDomain')) {
-            $r->user($disk_env{'user.name'});
-        } else {
-            $r->user($disk_env{'user.name'}.':'.$disk_env{'user.domain'});
-        }
+    if (ref($userhashref) eq 'HASH') {
+        $userhashref->{'name'} = $disk_env{'user.name'};
+        $userhashref->{'domain'} = $disk_env{'user.domain'};
     }
 
     return $handle;
@@ -12379,17 +12376,6 @@
 	if ($test != 0) { $_64bit=1; } else { $_64bit=0; }
 	&logthis(" Detected 64bit platform ($_64bit)");
     }
-
-    {
-        eval {
-            ($apache) =
-                (Apache2::ServerUtil::get_server_version() =~ m{Apache/(\d+\.\d+)});
-        };
-        if ($@) {
-           $apache = 1.3;
-        }
-    }
-
 }
 }