--- loncom/lonhttpd	2003/02/24 23:32:32	1.6
+++ loncom/lonhttpd	2003/07/30 15:28:56	1.9
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: lonhttpd,v 1.6 2003/02/24 23:32:32 albertel Exp $
+# $Id: lonhttpd,v 1.9 2003/07/30 15:28:56 www Exp $
 
 $VERSION = "1.3.2 (Demonic/Linux/LON-CAPA Derivative $Revison$)";
 
@@ -260,7 +260,9 @@ EOF
 	}
 
 
-sub bye { unlink($pidfile); exit; }
+sub bye { exit; }
+
+sub goodbye { unlink($pidfile); exit; }
 
 sub dead {
 	&htsponse(500, "Server Error");
@@ -276,7 +278,8 @@ EOF
 }
 
 $SIG{'__DIE__'} = \&dead;
-$SIG{'ALRM'} = $SIG{'TERM'} = $SIG{'INT'} = \&bye;
+$SIG{'ALRM'} = \&bye;
+$SIG{'TERM'} = $SIG{'INT'} = \&goodbye;
 
 sub master {
 	$0 = "lonhttpd: (dhttpi) handling request";
@@ -296,7 +299,7 @@ $date = "$dt/$mon/$yr:$tm +0000";
 select(STDOUT); $|=1; $address = 0; 
 alarm 1;
 while (<STDIN>) {
-	if(/^([A-Z]+)\s+([^\s]+)\s+([^\s\r\l\n]*)/) {
+	if(/^([A-Z]+)\s+(\S+)\s+(\S*)/) {
 		$method = $1;
 		$address = $2; 
 		$httpver = $3;
@@ -374,8 +377,8 @@ while (<STDIN>) {
 	if ($fail) {
 		&htsponse(403, "Forbidden");
 		if ($fail == 1) {
-			&hterror("Forbidden (Client Disallowed)", <<"EOF");
-Your network address (<i>$ip</i>) is not allowed to access this resource.
+			&hterror("Wrong URL", <<"EOF");
+You might want to remove the "<tt>:$port_to_use</tt>" from the web page address (URL).
 EOF
 			&log; exit;
 		} else {