diff options
| author | djm <djm> | 2013-07-18 06:13:55 +0000 |
|---|---|---|
| committer | djm <djm> | 2013-07-18 06:13:55 +0000 |
| commit | 32a58fbe094cefe945f2e6760663e254b8162962 (patch) | |
| tree | 9d44cd037d5459500508cd66bda7a29c86bdfb53 /ssh.c | |
| parent | 6dd13462ac06a972d030c53c1dc38df797d639fd (diff) | |
| download | openssh-32a58fbe094cefe945f2e6760663e254b8162962.tar.gz | |
- djm@cvs.openbsd.org 2013/07/12 05:48:55
[ssh.c]
set TCP nodelay for connections started with -N; bz#2124 ok dtucker@
Diffstat (limited to 'ssh.c')
| -rw-r--r-- | ssh.c | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.378 2013/05/17 00:13:14 djm Exp $ */ +/* $OpenBSD: ssh.c,v 1.379 2013/07/12 05:48:55 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1480,6 +1480,11 @@ ssh_session2(void) if (!no_shell_flag || (datafellows & SSH_BUG_DUMMYCHAN)) id = ssh_session2_open(); + else { + packet_set_interactive( + options.control_master == SSHCTL_MASTER_NO, + options.ip_qos_interactive, options.ip_qos_bulk); + } /* If we don't expect to open a new session, then disallow it */ if (options.control_master == SSHCTL_MASTER_NO && |