move more M$ stuff out from nolinger

[spider.git] / perl / Msg.pm

diff --git a/perl/Msg.pm b/perl/Msg.pm
index 3dcc1641060277c2a21593a575cdedf0c778972c..8cf36701ef78d61852d78ee9c612dab6982707f5 100644 (file)
--- a/perl/Msg.pm
+++ b/perl/Msg.pm
@@ -74,7 +74,7 @@ BEGIN {
                eval '*F_SETFL     = sub {     0 };';
                eval '*IPPROTO_TCP     = sub {     6 };';
                eval '*TCP_NODELAY     = sub {     1 };';
-               $blocking_supported = 1;
+               $blocking_supported = 0;   # it appears that this DOESN'T work :-(
        } 
 }
 
@@ -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