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

diff --git a/perl/Msg.pm b/perl/Msg.pm
index fdcc9fa0..f6164132 100644
--- 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,12 +135,12 @@ sub blocking
 	return unless $blocking_supported;
 
 	# Make the handle stop blocking, the Windows way.
-	if ($main::iswin) { 
-        # 126 is FIONBIO (some docs say 0x7F << 16)
-        ioctl( $_[0],
-               0x80000000 | (4 << 16) | (ord('f') << 8) | 126,
-               "$_[1]"
-             );
+	if ($main::is_win) { 
+	  # 126 is FIONBIO (some docs say 0x7F << 16)
+		ioctl( $_[0],
+			   0x80000000 | (4 << 16) | (ord('f') << 8) | 126,
+			   "$_[1]"
+			 );
 	} else {
 		my $flags = fcntl ($_[0], F_GETFL, 0);
 		if ($_[1]) {
@@ -373,14 +389,6 @@ sub new_server {
 	return $self;
 }
 
-my $oldw = $^W;
-$^W = 0;
-eval "use Socket qw(IPPROTO_TCP TCP_NODELAY)";
-$^W = $oldw;
-if ($@ && !$main::inwin) {
-	sub IPPROTO_TCP {6;}
-	sub TCP_NODELAY {1;};
-}
 
 sub nolinger
 {
@@ -389,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::iswin;
+	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");
 	}
 }