--- loncom/LondConnection.pm	2007/04/03 01:08:05	1.45
+++ loncom/LondConnection.pm	2010/11/11 15:01:13	1.49
@@ -1,7 +1,7 @@
 #   This module defines and implements a class that represents
 #   a connection to a lond daemon.
 #
-# $Id: LondConnection.pm,v 1.45 2007/04/03 01:08:05 albertel Exp $
+# $Id: LondConnection.pm,v 1.49 2010/11/11 15:01:13 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -184,7 +184,7 @@ sub new {
                      TimeoutCallback    => undef,
                      TransitionCallback => undef,
                      Timeoutable        => 0,
-                     TimeoutValue       => 3,
+                     TimeoutValue       => 30,
                      TimeoutRemaining   => 0,
 		     LocalKeyFile       => "",
                      CipherKey          => "",
@@ -241,11 +241,11 @@ sub new {
 	if((defined $ca)  && (defined $cert) && (defined $sslkeyfile)) {
 
 	    $self->{AuthenticationMode} = "ssl";
-	    $self->{TransactionRequest} = "init:ssl\n";
+	    $self->{TransactionRequest} = "init:ssl:$perlvar{'lonVersion'}\n";
 	} else {
 	    if($InsecureOk) {		# Allowed to do insecure:
 		$self->{AuthenticationMode} = "insecure";
-		$self->{TransactionRequest} = "init\n";
+		$self->{TransactionRequest} = "init::$perlvar{'lonVersion'}\n";
 	    }
 	    else {		# Not allowed to do insecure...
 		$socket->close;
@@ -563,6 +563,7 @@ sub Writable {
 	($errno == POSIX::EAGAIN)         ||
 	($errno == POSIX::EINTR)          ||
 	($errno ==  0)) {
+    $self->{TimeoutRemaining} = $self->{TimeoutValue};
 	substr($self->{TransactionRequest}, 0, $nwritten) = ""; # rmv written part
       if(length $self->{TransactionRequest} == 0) {
          $self->{InformWritable} = 0;