--- loncom/loncnew	2004/02/17 09:43:21	1.42
+++ loncom/loncnew	2004/03/02 16:25:17	1.44
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # lonc maintains the connections to remote computers
 #
-# $Id: loncnew,v 1.42 2004/02/17 09:43:21 foxr Exp $
+# $Id: loncnew,v 1.44 2004/03/02 16:25:17 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -263,7 +263,7 @@ sub SocketTimeout {
     Debug(0, " SocketTimeout called: ");
     $Socket->Dump();
     if(exists($ActiveTransactions{$Socket})) {
-      FailTransaction($ActiveTransactions{$Socket});
+	FailTransaction($ActiveTransactions{$Socket});
     }
     KillSocket($Socket);	# A transaction timeout also counts as
                                 # a connection failure:
@@ -959,16 +959,16 @@ sub LondWritable {
     # so that the writing states are actually NO-OPs.
 
     if ($Socket->Writable() != 0) {
-      #  The write resulted in an error.
-      # We'll treat this as if the socket got disconnected:
-      Log("WARNING", "Connection to ".$RemoteHost.
-	  " has been disconnected");
-      if(exists($ActiveTransactions{$Socket})) {
-	FailTransaction($ActiveTransactions{$Socket});
-      }
-      $Watcher->cancel();
-      KillSocket($Socket);
-      return;
+	#  The write resulted in an error.
+	# We'll treat this as if the socket got disconnected:
+	Log("WARNING", "Connection to ".$RemoteHost.
+	    " has been disconnected");
+	if(exists($ActiveTransactions{$Socket})) {
+	    FailTransaction($ActiveTransactions{$Socket});
+	}
+	$Watcher->cancel();
+	KillSocket($Socket);
+	return;
     }
 
 
@@ -1269,7 +1269,7 @@ sub ClientRequest {
     Debug(8,"Data: ".$data." this read: ".$thisread);
     $data = $data.$thisread;	# Append new data.
     $watcher->data($data);
-    if($data =~ /(.*\n)/) {	# Request entirely read.
+    if($data =~ /\n$/) {	# Request entirely read.
 	if($data eq "close_connection_exit\n") {
 	    Log("CRITICAL",
 		"Request Close Connection ... exiting");