--- loncom/lonnet/perl/lonnet.pm 2013/02/02 03:29:33 1.1211 +++ loncom/lonnet/perl/lonnet.pm 2013/02/07 13:59:14 1.1213 @@ -1,7 +1,7 @@ # The LearningOnline Network # TCP networking package # -# $Id: lonnet.pm,v 1.1211 2013/02/02 03:29:33 raeburn Exp $ +# $Id: lonnet.pm,v 1.1213 2013/02/07 13:59:14 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -78,7 +78,7 @@ use Image::Magick; use Encode; -use vars qw(%perlvar %spareid %pr %prp $memcache %packagetab $tmpdir +use vars qw(%perlvar %spareid %pr %prp $memcache %packagetab $tmpdir $apache $_64bit %env %protocol %loncaparevs %serverhomeIDs %needsrelease %managerstab); @@ -634,6 +634,13 @@ sub check_for_valid_session { || !defined($disk_env{'user.domain'})) { 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'}); + } + } return $handle; } @@ -12190,6 +12197,15 @@ $readit=1; if ($test != 0) { $_64bit=1; } else { $_64bit=0; } &logthis(" Detected 64bit platform ($_64bit)"); } + if (open(PIPE,"httpd -V 2>&1 |")) { + while (<PIPE>) { + if (m{Apache/(\d+.\d+)}) { + $apache = $1; + last; + } + } + close(PIPE); + } } }