X-Git-Url: http://scm.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=perl%2FMsg.pm;h=30519a0764b9c0ddec9dcc7330277cb68d600986;hb=94b9e6854969b7c7419a4ef39eb83a70ca1a85f8;hp=5593e937b0323218bbc89bbcfe66a086f266ef41;hpb=f00b2281c52b68ab0df2166f8e263271861935ad;p=spider.git

diff --git a/perl/Msg.pm b/perl/Msg.pm
index 5593e937..30519a07 100644
--- a/perl/Msg.pm
+++ b/perl/Msg.pm
@@ -119,14 +119,12 @@ sub blocking
 	return unless $blocking_supported;
 
 	# Make the handle stop blocking, the Windows way.
-	if ($^O eq 'MSWin32') { 
-        my $set_it = $_[1];
-		
+	if ($main::iswin) { 
         # 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: $!";
+               "$_[1]"
+             );
 	}
 	
 	my $flags = fcntl ($_[0], F_GETFL, 0);
@@ -375,7 +373,14 @@ sub new_server {
 	return $self;
 }
 
-use Socket qw(IPPROTO_TCP TCP_NODELAY);
+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
 {
@@ -390,7 +395,7 @@ 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: $!";
+	setsockopt($conn->{sock}, IPPROTO_TCP, TCP_NODELAY, 1) or confess "setsockopt: $!" unless $main::iswin;
 	$conn->{sock}->autoflush(0);
 	
 	if (isdbg('sock')) {