--- loncom/loncnew	2003/08/25 18:48:11	1.20
+++ loncom/loncnew	2003/08/26 09:19:51	1.21
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # lonc maintains the connections to remote computers
 #
-# $Id: loncnew,v 1.20 2003/08/25 18:48:11 albertel Exp $
+# $Id: loncnew,v 1.21 2003/08/26 09:19:51 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -45,6 +45,12 @@
 
 # Change log:
 #    $Log: loncnew,v $
+#    Revision 1.21  2003/08/26 09:19:51  foxr
+#    How embarrassing... put in the SocketTimeout function in loncnew and forgot
+#    to actually hook it into the LondTransaction.  Added this to MakeLondConnection
+#    where it belongs... hopefully transactions (not just connection attempts) will
+#    timeout more speedily than the socket errors will catch it.
+#
 #    Revision 1.20  2003/08/25 18:48:11  albertel
 #    - fixing a forgotten ;
 #
@@ -1094,7 +1100,8 @@ sub MakeLondConnection {
 	    &Debug(9,"MakeLondConnection got socket: ".$Socket);
 	}
 	
-	
+	$Connection->SetTimeoutCallback(\&SocketTimeout);
+
 	$event = Event->io(fd       => $Socket,
 			   poll     => 'w',
 			   cb       => \&LondWritable,