backed out all the M$ chnages

diff --git a/Changes b/Changes
index a30c4d0f392de5fb1785523f1c0030824ee8c519..4e77e66521be6028ed4419f290dec4991fb4d662 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,5 +1,6 @@
 11Jan02=======================================================================
 1. Make M$ TCP connx blocking again, sigh...
+2. backed out ALL the M$ speedup and make nicer changes :-(
 10Jan02=======================================================================
 1. set SO_LINGER = 0 to try to prevent the system sending data on a closing
 socket. This MAY help some of the hanging problems (but I am now beginning

diff --git a/perl/Msg.pm b/perl/Msg.pm
index e774c59d41ddb6df20c610e2ef886a14d7e6c2f1..0f2f2d1d04d37771e4e9138a10c826012ea60413 100644 (file)
--- a/perl/Msg.pm
+++ b/perl/Msg.pm
@@ -405,6 +405,7 @@ sub nolinger
                setsockopt($conn->{sock}, SOL_SOCKET, SO_KEEPALIVE, 1) or confess "setsockopt keepalive: $!";
                setsockopt($conn->{sock}, SOL_SOCKET, SO_LINGER, pack("ll", 0, 0)) or confess "setsockopt linger: $!";
                setsockopt($conn->{sock}, IPPROTO_TCP, TCP_NODELAY, 1) or confess "setsockopt: $!";
+               $conn->{sock}->autoflush(0);
 
                if (isdbg('sock')) {
                        my ($l, $t) = unpack "ll", getsockopt($conn->{sock}, SOL_SOCKET, SO_LINGER); 
@@ -413,7 +414,6 @@ sub nolinger
                        dbg("Linger is: $l $t, keepalive: $k, nagle: $n");
                }
        } 
-       $conn->{sock}->autoflush(0);
 }
 
 sub dequeue