X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;ds=inline;f=perl%2FMsg.pm;h=165596d270265b34c2fc5cba785cc633f1f58b5c;hb=532c5c9e14a48ec17d38dce5d904a3b612a2563b;hp=19c81484e5cd95662d489b673bc15f34578e8cdd;hpb=a37c1c79176eefa3273445e1d51a656104b964e2;p=spider.git

diff --git a/perl/Msg.pm b/perl/Msg.pm
index 19c81484..165596d2 100644
--- a/perl/Msg.pm
+++ b/perl/Msg.pm
@@ -52,6 +52,15 @@ BEGIN {
 	eval {
 		require Errno; Errno->import(qw(EAGAIN EINPROGRESS EWOULDBLOCK));
 	};
+
+	eval {
+		require Socket; Socket->import(qw(IPPROTO_TCP TCP_NODELAY));
+	};
+	unless (*IPPROTO_TCP  && !$^O =~ /^MS/) {
+		dbg("IPPROTO_TCP and TCP_NODELAY manually defined");
+		eval '*IPPROTO_TCP     = sub {     6 };';
+		eval '*TCP_NODELAY     = sub {     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,6 +69,8 @@ BEGIN {
 		eval '*EWOULDBLOCK = *EAGAIN = sub { 10035 };';
 		eval '*F_GETFL     = sub {     0 };';
 		eval '*F_SETFL     = sub {     0 };';
+		eval '*IPPROTO_TCP     = sub {     6 };';
+		eval '*TCP_NODELAY     = sub {     1 };';
 		$blocking_supported = 1;
 	} 
 }
@@ -121,12 +132,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,14 +386,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
 {
@@ -397,7 +400,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')) {