move more M$ stuff out from nolinger

diff --git a/perl/Msg.pm b/perl/Msg.pm
index f6164132a33469ae7757e171863d722146e10195..8cf36701ef78d61852d78ee9c612dab6982707f5 100644 (file)
--- a/perl/Msg.pm
+++ b/perl/Msg.pm
@@ -400,20 +400,20 @@ sub nolinger
                my $n = $main::is_win ? 0 : unpack "l", getsockopt($conn->{sock}, IPPROTO_TCP, TCP_NODELAY);
                dbg("Linger is: $l $t, keepalive: $k, nagle: $n");
        }
-
-       setsockopt($conn->{sock}, SOL_SOCKET, SO_LINGER, pack("ll", 0, 0)) or confess "setsockopt linger: $!";
+               
        setsockopt($conn->{sock}, SOL_SOCKET, SO_KEEPALIVE, 1) or confess "setsockopt keepalive: $!";
        unless ($main::is_win) {
+               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); 
                my $k = unpack 'l', getsockopt($conn->{sock}, SOL_SOCKET, SO_KEEPALIVE);
                my $n = $main::is_win ? 0 : unpack "l", getsockopt($conn->{sock}, IPPROTO_TCP, TCP_NODELAY);
                dbg("Linger is: $l $t, keepalive: $k, nagle: $n");
-       }
+         
+       } 
+       $conn->{sock}->autoflush(0);
 }
 
 sub dequeue