loncom/lonhttpd - diff

Return to lonhttpd CVS log

Up to [LON-CAPA] / loncom

version 1.7, 2003/05/02 21:03:19	version 1.10, 2005/02/14 00:18:03
Line 61 $pidfile="/home/httpd/perl/logs/lonhttpd	Line 61 $pidfile="/home/httpd/perl/logs/lonhttpd

if (-e $pidfile) {	if (-e $pidfile) {
open(LFH,"$pidfile");	open(LFH,"$pidfile");
my $pide=<$LFH>;	my $pide=<LFH>;
chomp($pide);	chomp($pide);
close(LFH);	close(LFH);
if (kill 0 => $pide) { die "already running"; }	if (kill 0 => $pide) { die "already running"; }
Line 260 EOF	Line 260 EOF
}	}


sub bye { unlink($pidfile); exit; }	sub bye { exit; }

	sub goodbye { unlink($pidfile); exit; }

sub dead {	sub dead {
&htsponse(500, "Server Error");	&htsponse(500, "Server Error");
Line 276 EOF	Line 278 EOF
}	}

$SIG{'__DIE__'} = \&dead;	$SIG{'__DIE__'} = \&dead;
$SIG{'ALRM'} = $SIG{'TERM'} = $SIG{'INT'} = \&bye;	$SIG{'ALRM'} = \&bye;
	$SIG{'TERM'} = $SIG{'INT'} = \&goodbye;

sub master {	sub master {
$0 = "lonhttpd: (dhttpi) handling request";	$0 = "lonhttpd: (dhttpi) handling request";
Line 296 $date = "$dt/$mon/$yr:$tm +0000";	Line 299 $date = "$dt/$mon/$yr:$tm +0000";
select(STDOUT); $\|=1; $address = 0;	select(STDOUT); $\|=1; $address = 0;
alarm 1;	alarm 1;
while (<STDIN>) {	while (<STDIN>) {
if(/^([A-Z]+)\s+([^\s]+)\s+([^\s\r\l\n]*)/) {	if(/^([A-Z]+)\s+(\S+)\s+(\S*)/) {
$method = $1;	$method = $1;
$address = $2;	$address = $2;
$httpver = $3;	$httpver = $3;