loncom/lond - diff

Return to lond CVS log

Up to [LON-CAPA] / loncom

version 1.445, 2010/06/25 04:37:44	version 1.446.2.1, 2010/11/13 02:21:06
Line 3127 sub dump_with_regexp {	Line 3127 sub dump_with_regexp {
my $count=0;	my $count=0;
while (my ($key,$value) = each(%$hashref)) {	while (my ($key,$value) = each(%$hashref)) {
if ($namespace eq 'roles') {	if ($namespace eq 'roles') {
if ($key =~ /^($LONCAPA::match_domain)_($LONCAPA::match_community)_(cc\|co\|in\|ta\|ep\|ad\|st\|cr)/) {	if ($key =~ m{^/($LONCAPA::match_domain)/($LONCAPA::match_community)_(cc\|co\|in\|ta\|ep\|ad\|st\|cr)}) {
if ($clientversion =~ /^(\d+)\.(\d+)$/) {	my $cdom = $1;
	my $cnum = $2;
	if ($clientversion =~ /^['"]?(\d+)\.(\d+)[.\d\-]+['"]?$/) {
my $major = $1;	my $major = $1;
my $minor = $2;	my $minor = $2;
next if (($major < 2) \|\| (($major == 2) && ($minor < 9)));	next if (($major < 2) \|\| (($major == 2) && ($minor < 9)));
	} else {
	my $homeserver = &Apache::lonnet::homeserver($cnum,$cdom);
	next unless ($currenthostid eq $homeserver);
}	}
}	}
}	}
Line 6305 sub make_new_child {	Line 6310 sub make_new_child {
or die "Can't unblock SIGINT for fork: $!\n";	or die "Can't unblock SIGINT for fork: $!\n";
$children{$pid} = $clientip;	$children{$pid} = $clientip;
&status('Started child '.$pid);	&status('Started child '.$pid);
	close($client);
return;	return;
} else {	} else {
# Child can not return from this subroutine.	# Child can not return from this subroutine.