X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FMsg.pm;h=f6164132a33469ae7757e171863d722146e10195;hb=b56ccffc81ac94b40755bb8c7485eb223f7e2ff4;hp=c9ad34338952888b03fa4c563bae15cef172c993;hpb=7b96c0d932ac9f34cbbaf97b8299ed8d0b47e598;p=spider.git

diff --git a/perl/Msg.pm b/perl/Msg.pm
index c9ad3433..f6164132 100644
--- a/perl/Msg.pm
+++ b/perl/Msg.pm
@@ -52,6 +52,18 @@ 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.
@@ -60,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 :-(
 	} 
 }
 
@@ -375,11 +389,6 @@ sub new_server {
 	return $self;
 }
 
-eval "use Socket qw(IPPROTO_TCP TCP_NODELAY)";
-if ($@ && !$main::is_win) {
-	sub IPPROTO_TCP {6;}
-	sub TCP_NODELAY {1;};
-}
 
 sub nolinger
 {
@@ -388,7 +397,7 @@ 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");
 	}
 
@@ -402,7 +411,7 @@ 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");
 	}
 }