make M$ TCP connx blocking again

[spider.git] / perl / Msg.pm

diff --git a/perl/Msg.pm b/perl/Msg.pm
index 5593e937b0323218bbc89bbcfe66a086f266ef41..f6164132a33469ae7757e171863d722146e10195 100644 (file)
--- a/perl/Msg.pm
+++ b/perl/Msg.pm
@@ -52,13 +52,29 @@ BEGIN {
        eval {
                require Errno; Errno->import(qw(EAGAIN EINPROGRESS EWOULDBLOCK));
        };
+
+       unless ($^O eq 'MSWin32') {
+               if ($] >= 5.6) {
+                       eval {
+                               require Socket; Socket->import(qw(IPPROTO_TCP TCP_NODELAY));
+                       };
+               } else {
+                       dbg("IPPROTO_TCP and TCP_NODELAY manually defined");
+                       eval 'sub IPPROTO_TCP {     6 };';
+                       eval 'sub TCP_NODELAY {     1 };';
+               }
+       }
        # http://support.microsoft.com/support/kb/articles/Q150/5/37.asp
        # defines EINPROGRESS as 10035.  We provide it here because some
        # Win32 users report POSIX::EINPROGRESS is not vendor-supported.
        if ($^O eq 'MSWin32') { 
                eval '*EINPROGRESS = sub { 10036 };';
                eval '*EWOULDBLOCK = *EAGAIN = sub { 10035 };';
-               $blocking_supported = 1;
+               eval '*F_GETFL     = sub {     0 };';
+               eval '*F_SETFL     = sub {     0 };';
+               eval '*IPPROTO_TCP     = sub {     6 };';
+               eval '*TCP_NODELAY     = sub {     1 };';
+               $blocking_supported = 0;   # it appears that this DOESN'T work :-(
        } 
 }
 
@@ -119,23 +135,21 @@ sub blocking
        return unless $blocking_supported;
 
        # Make the handle stop blocking, the Windows way.
-       if ($^O eq 'MSWin32') { 
-        my $set_it = $_[1];
-               
-        # 126 is FIONBIO (some docs say 0x7F << 16)
-        ioctl( $_[0],
-               0x80000000 | (4 << 16) | (ord('f') << 8) | 126,
-               $set_it
-             ) or confess "Can't set the handle non-blocking: $!";
-       }
-       
-       my $flags = fcntl ($_[0], F_GETFL, 0);
-       if ($_[1]) {
-               $flags &= ~O_NONBLOCK;
+       if ($main::is_win) { 
+         # 126 is FIONBIO (some docs say 0x7F << 16)
+               ioctl( $_[0],
+                          0x80000000 | (4 << 16) | (ord('f') << 8) | 126,
+                          "$_[1]"
+                        );
        } else {
-               $flags |= O_NONBLOCK;
+               my $flags = fcntl ($_[0], F_GETFL, 0);
+               if ($_[1]) {
+                       $flags &= ~O_NONBLOCK;
+               } else {
+                       $flags |= O_NONBLOCK;
+               }
+               fcntl ($_[0], F_SETFL, $flags);
        }
-       fcntl ($_[0], F_SETFL, $flags);
 }
 
 # save it
@@ -375,7 +389,6 @@ sub new_server {
        return $self;
 }
 
-use Socket qw(IPPROTO_TCP TCP_NODELAY);
 
 sub nolinger
 {
@@ -384,19 +397,21 @@ sub nolinger
        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);
+               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: $!";
-       setsockopt($conn->{sock}, IPPROTO_TCP, TCP_NODELAY, 1) or confess "setsockopt: $!";
+       unless ($main::is_win) {
+               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 = unpack "l", getsockopt($conn->{sock}, IPPROTO_TCP, TCP_NODELAY);
+               my $n = $main::is_win ? 0 : unpack "l", getsockopt($conn->{sock}, IPPROTO_TCP, TCP_NODELAY);
                dbg("Linger is: $l $t, keepalive: $k, nagle: $n");
        }
 }