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

diff --git a/perl/Msg.pm b/perl/Msg.pm
index f2881c8f..fdcc9fa0 100644
--- a/perl/Msg.pm
+++ b/perl/Msg.pm
@@ -52,6 +52,14 @@ BEGIN {
 	eval {
 		require Errno; Errno->import(qw(EAGAIN EINPROGRESS EWOULDBLOCK));
 	};
+	# 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;
+	} 
 }
 
 my $w = $^W;
@@ -109,14 +117,23 @@ sub set_rproc
 sub blocking
 {
 	return unless $blocking_supported;
-	
-	my $flags = fcntl ($_[0], F_GETFL, 0);
-	if ($_[1]) {
-		$flags &= ~O_NONBLOCK;
+
+	# 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]"
+             );
 	} else {
-		$flags |= O_NONBLOCK;
+		my $flags = fcntl ($_[0], F_GETFL, 0);
+		if ($_[1]) {
+			$flags &= ~O_NONBLOCK;
+		} else {
+			$flags |= O_NONBLOCK;
+		}
+		fcntl ($_[0], F_SETFL, $flags);
 	}
-	fcntl ($_[0], F_SETFL, $flags);
 }
 
 # save it
@@ -356,19 +373,36 @@ 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
 {
 	my $conn = shift;
-	my $buf;
-	if (isdbg('sock') && ($buf = getsockopt($conn->{sock}, SOL_SOCKET, SO_LINGER))) {
-		my ($l, $t) = unpack("ll", $buf);
-		dbg("Linger is: $buf = $l $t");
+
+	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);
+		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: $!";
-	if (isdbg('sock') && ($buf = getsockopt($conn->{sock}, SOL_SOCKET, SO_LINGER))) {
-		my ($l, $t) = unpack("ll", $buf);
-		dbg("Linger is: $buf = $l $t");
+	setsockopt($conn->{sock}, IPPROTO_TCP, TCP_NODELAY, 1) or confess "setsockopt: $!" unless $main::iswin;
+	$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);
+		dbg("Linger is: $l $t, keepalive: $k, nagle: $n");
 	}
 }