loncom/lonnet/perl/lonnet.pm - diff

Return to lonnet.pm CVS log

Up to [LON-CAPA] / loncom / lonnet / perl

version 1.1212, 2013/02/05 21:32:49	version 1.1213, 2013/02/07 13:59:14
Line 78 use Image::Magick;	Line 78 use Image::Magick;

use Encode;	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	$_64bit %env %protocol %loncaparevs %serverhomeIDs %needsrelease
%managerstab);	%managerstab);

Line 634 sub check_for_valid_session {	Line 634 sub check_for_valid_session {
\|\| !defined($disk_env{'user.domain'})) {	\|\| !defined($disk_env{'user.domain'})) {
return undef;	return undef;
}	}
if ($r->user() eq '') {	if (($r->user() eq '') && ($apache >= 2.4)) {
if ($disk_env{'user.domain'} eq $r->dir_config('lonDefDomain')) {	if ($disk_env{'user.domain'} eq $r->dir_config('lonDefDomain')) {
$r->user($disk_env{'user.name'});	$r->user($disk_env{'user.name'});
} else {	} else {
Line 12197 $readit=1;	Line 12197 $readit=1;
if ($test != 0) { $_64bit=1; } else { $_64bit=0; }	if ($test != 0) { $_64bit=1; } else { $_64bit=0; }
&logthis(" Detected 64bit platform ($_64bit)");	&logthis(" Detected 64bit platform ($_64bit)");
}	}
	if (open(PIPE,"httpd -V 2>&1 \|")) {
	while (<PIPE>) {
	if (m{Apache/(\d+.\d+)}) {
	$apache = $1;
	last;
	}
	}
	close(PIPE);
	}
}	}
}	}