loncom/lonhttpd - diff

Return to lonhttpd CVS log

Up to [LON-CAPA] / loncom

version 1.6, 2003/02/24 23:32:32	version 1.9, 2003/07/30 15:28:56
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;
Line 374 while (<STDIN>) {	Line 377 while (<STDIN>) {
if ($fail) {	if ($fail) {
&htsponse(403, "Forbidden");	&htsponse(403, "Forbidden");
if ($fail == 1) {	if ($fail == 1) {
&hterror("Forbidden (Client Disallowed)", <<"EOF");	&hterror("Wrong URL", <<"EOF");
Your network address (<i>$ip</i>) is not allowed to access this resource.	You might want to remove the "<tt>:$port_to_use</tt>" from the web page address (URL).
EOF	EOF
&log; exit;	&log; exit;
} else {	} else {