From 71f0de56d94bd52d5f2eaeb84e0d5a3257c36dac Mon Sep 17 00:00:00 2001
From: djm <djm>
Date: Wed, 15 Mar 2006 01:05:22 +0000
Subject: [PATCH]    - dtucker@cvs.openbsd.org 2006/03/13 08:33:00     
 [packet.c]      Set TCP_NODELAY for all connections not just "interactive"
 ones.  Fixes      poor performance and protocol stalls under some network
 conditions (mindrot      bugs #556 and #981). Patch originally from markus@,
 ok djm@

---
 ChangeLog | 5 +++++
 packet.c  | 5 ++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 66c11c72..3bf299a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -210,6 +210,11 @@
      [sshd.c]
      don't log that we are listening on a socket before the listen() call
      actually succeeds, bz #1162 reported by Senthil Kumar; ok dtucker@
+   - dtucker@cvs.openbsd.org 2006/03/13 08:33:00
+     [packet.c]
+     Set TCP_NODELAY for all connections not just "interactive" ones.  Fixes
+     poor performance and protocol stalls under some network conditions (mindrot
+     bugs #556 and #981). Patch originally from markus@, ok djm@
 
 20060313
  - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)
diff --git a/packet.c b/packet.c
index 24d2bb31..ca6861e5 100644
--- a/packet.c
+++ b/packet.c
@@ -37,7 +37,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: packet.c,v 1.121 2006/02/08 14:38:18 stevesk Exp $");
+RCSID("$OpenBSD: packet.c,v 1.122 2006/03/13 08:33:00 dtucker Exp $");
  
 #include "openbsd-compat/sys-queue.h"
 #include <netinet/in_systm.h>
@@ -1482,8 +1482,7 @@ packet_set_interactive(int interactive)
 	/* Only set socket options if using a socket.  */
 	if (!packet_connection_is_on_socket())
 		return;
-	if (interactive)
-		set_nodelay(connection_in);
+	set_nodelay(connection_in);
 	packet_set_tos(interactive);
 }
 
-- 
2.45.2