diff options
| author | Darren Tucker <dtucker@cvs.openbsd.org> | 2006-03-13 08:33:01 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@cvs.openbsd.org> | 2006-03-13 08:33:01 +0000 |
| commit | bb4cc81340a8c1277cd0d9ab83c304b8b29427e5 (patch) | |
| tree | 2aed46959e530b50cb2a9bfe1c6b584fa8de8816 /usr.bin/ssh | |
| parent | 2873bc6e90515a8b7086b7e9340f1ec65d9f42f7 (diff) | |
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@
Diffstat (limited to 'usr.bin/ssh')
| -rw-r--r-- | usr.bin/ssh/packet.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/usr.bin/ssh/packet.c b/usr.bin/ssh/packet.c index a087cbec185..609746d109b 100644 --- a/usr.bin/ssh/packet.c +++ b/usr.bin/ssh/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 <sys/queue.h> @@ -1475,8 +1475,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); } |