- 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@

2 files changed, 8 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 2be6f21d6..7cc666a58 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)
@@ -4111,4 +4116,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4200 2006/03/15 01:04:36 djm Exp $
+$Id: ChangeLog,v 1.4201 2006/03/15 01:05:22 djm Exp $
diff --git a/packet.c b/packet.c
index 24d2bb312..ca6861e55 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);
 }