backed out all the M$ chnages

[spider.git] / perl / Msg.pm

diff --git a/perl/Msg.pm b/perl/Msg.pm
index 5aef961ee4f4162593228d0c1abd71a41dd52fef..0f2f2d1d04d37771e4e9138a10c826012ea60413 100644 (file)
--- a/perl/Msg.pm
+++ b/perl/Msg.pm
@@ -72,7 +72,9 @@ BEGIN {
                eval '*EWOULDBLOCK = *EAGAIN = sub { 10035 };';
                eval '*F_GETFL     = sub {     0 };';
                eval '*F_SETFL     = sub {     0 };';
-               $blocking_supported = 1;
+               eval '*IPPROTO_TCP     = sub {     6 };';
+               eval '*TCP_NODELAY     = sub {     1 };';
+               $blocking_supported = 0;   # it appears that this DOESN'T work :-(
        } 
 }
 
@@ -392,26 +394,26 @@ sub nolinger
 {
        my $conn = shift;
 
-       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 = 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) {
+               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");
+               }
+               
+               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); 
+                       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);
-       
-       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 = unpack "l", getsockopt($conn->{sock}, IPPROTO_TCP, TCP_NODELAY);
-               dbg("Linger is: $l $t, keepalive: $k, nagle: $n");
-       }
 }
 
 sub dequeue