From: minima <minima>
Date: Fri, 11 Jan 2002 01:03:00 +0000 (+0000)
Subject: final M$ patches?
X-Git-Tag: R_1_50~92
X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=commitdiff_plain;h=7b96c0d932ac9f34cbbaf97b8299ed8d0b47e598;p=spider.git

final M$ patches?
---

diff --git a/perl/Msg.pm b/perl/Msg.pm
index 19c81484..c9ad3433 100644
--- a/perl/Msg.pm
+++ b/perl/Msg.pm
@@ -121,12 +121,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]) {
@@ -375,11 +375,8 @@ sub new_server {
 	return $self;
 }
 
-my $oldw = $^W;
-$^W = 0;
 eval "use Socket qw(IPPROTO_TCP TCP_NODELAY)";
-$^W = $oldw;
-if ($@ && !$main::inwin) {
+if ($@ && !$main::is_win) {
 	sub IPPROTO_TCP {6;}
 	sub TCP_NODELAY {1;};
 }
@@ -397,7 +394,9 @@ sub nolinger
 
 	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')) {