From: minima <minima>
Date: Fri, 11 Jan 2002 20:03:24 +0000 (+0000)
Subject: backed out all the M$ chnages
X-Git-Tag: R_1_50~83
X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?p=spider.git;a=commitdiff_plain;h=b0d0a20f3a8f9c5cd0f2e034a32dc524e3f2f003

backed out all the M$ chnages
---

diff --git a/Changes b/Changes
index a30c4d0f..4e77e665 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,6 @@
 11Jan02=======================================================================
 1. Make M$ TCP connx blocking again, sigh...
+2. backed out ALL the M$ speedup and make nicer changes :-(
 10Jan02=======================================================================
 1. set SO_LINGER = 0 to try to prevent the system sending data on a closing
 socket. This MAY help some of the hanging problems (but I am now beginning
diff --git a/perl/Msg.pm b/perl/Msg.pm
index e774c59d..0f2f2d1d 100644
--- a/perl/Msg.pm
+++ b/perl/Msg.pm
@@ -405,6 +405,7 @@ sub nolinger
 		setsockopt($conn->{sock}, SOL_SOCKET, SO_KEEPALIVE, 1) or confess "setsockopt keepalive: $!";
 		setsockopt($conn->{sock}, SOL_SOCKET, SO_LINGER, pack("ll", 0, 0)) or confess "setsockopt linger: $!";
 		setsockopt($conn->{sock}, IPPROTO_TCP, TCP_NODELAY, 1) or confess "setsockopt: $!";
+		$conn->{sock}->autoflush(0);
 
 		if (isdbg('sock')) {
 			my ($l, $t) = unpack "ll", getsockopt($conn->{sock}, SOL_SOCKET, SO_LINGER); 
@@ -413,7 +414,6 @@ sub nolinger
 			dbg("Linger is: $l $t, keepalive: $k, nagle: $n");
 		}
 	} 
-	$conn->{sock}->autoflush(0);
 }
 
 sub dequeue