X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FMsg.pm;h=ec2f3b4ca0214836327bb99c8a84aaa60a609b6a;hb=2076d02a004fd25a975ec527661e05ea762a1f44;hp=f6164132a33469ae7757e171863d722146e10195;hpb=b56ccffc81ac94b40755bb8c7485eb223f7e2ff4;p=spider.git

diff --git a/perl/Msg.pm b/perl/Msg.pm
index f6164132..ec2f3b4c 100644
--- a/perl/Msg.pm
+++ b/perl/Msg.pm
@@ -37,6 +37,7 @@ $now = time;
 BEGIN {
     # Checks if blocking is supported
     eval {
+		local $^W;
         require POSIX; POSIX->import(qw(O_NONBLOCK F_SETFL F_GETFL))
     };
 	if ($@ || $main::is_win) {
@@ -50,12 +51,14 @@ BEGIN {
 
 	# import as many of these errno values as are available
 	eval {
+		local $^W;
 		require Errno; Errno->import(qw(EAGAIN EINPROGRESS EWOULDBLOCK));
 	};
 
 	unless ($^O eq 'MSWin32') {
 		if ($] >= 5.6) {
 			eval {
+				local $^W;
 				require Socket; Socket->import(qw(IPPROTO_TCP TCP_NODELAY));
 			};
 		} else {
@@ -394,26 +397,26 @@ sub nolinger
 {
 	my $conn = shift;
 
-	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 = $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: $!";
 	unless ($main::is_win) {
-		setsockopt($conn->{sock}, IPPROTO_TCP, TCP_NODELAY, 1) or confess "setsockopt: $!";
+		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 = $main::is_win ? 0 : unpack "l", getsockopt($conn->{sock}, IPPROTO_TCP, TCP_NODELAY);
+			dbg("Linger is: $l $t, keepalive: $k, nagle: $n");
+		}
+		
+		eval {setsockopt($conn->{sock}, SOL_SOCKET, SO_KEEPALIVE, 1)} or dbg("setsockopt keepalive: $!");
+		eval {setsockopt($conn->{sock}, SOL_SOCKET, SO_LINGER, pack("ll", 0, 0))} or dbg("setsockopt linger: $!");
+		eval {setsockopt($conn->{sock}, IPPROTO_TCP, TCP_NODELAY, 1)} or eval {setsockopt($conn->{sock}, SOL_SOCKET, TCP_NODELAY, 1)} or dbg("setsockopt tcp_nodelay: $!");
+		$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 = $main::is_win ? 0 : unpack "l", getsockopt($conn->{sock}, IPPROTO_TCP, TCP_NODELAY);
+			dbg("Linger is: $l $t, keepalive: $k, nagle: $n");
+		}
 	} 
-	$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 = $main::is_win ? 0 : unpack "l", getsockopt($conn->{sock}, IPPROTO_TCP, TCP_NODELAY);
-		dbg("Linger is: $l $t, keepalive: $k, nagle: $n");
-	}
 }
 
 sub dequeue