- djm@cvs.openbsd.org 2013/07/12 05:48:55
[ssh.c] set TCP nodelay for connections started with -N; bz#2124 ok dtucker@
This commit is contained in:
parent
5bb8833e80
commit
649fe025a4
|
@ -54,6 +54,9 @@
|
||||||
do_print_resource_record() can never be called with a NULL filename, so
|
do_print_resource_record() can never be called with a NULL filename, so
|
||||||
don't attempt (and bungle) asking for one if it has not been specified
|
don't attempt (and bungle) asking for one if it has not been specified
|
||||||
bz#2127 ok dtucker@
|
bz#2127 ok dtucker@
|
||||||
|
- djm@cvs.openbsd.org 2013/07/12 05:48:55
|
||||||
|
[ssh.c]
|
||||||
|
set TCP nodelay for connections started with -N; bz#2124 ok dtucker@
|
||||||
|
|
||||||
20130702
|
20130702
|
||||||
- (dtucker) [contrib/cygwin/README contrib/cygwin/ssh-host-config
|
- (dtucker) [contrib/cygwin/README contrib/cygwin/ssh-host-config
|
||||||
|
|
7
ssh.c
7
ssh.c
|
@ -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>
|
* Author: Tatu Ylonen <ylo@cs.hut.fi>
|
||||||
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
|
* 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))
|
if (!no_shell_flag || (datafellows & SSH_BUG_DUMMYCHAN))
|
||||||
id = ssh_session2_open();
|
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 we don't expect to open a new session, then disallow it */
|
||||||
if (options.control_master == SSHCTL_MASTER_NO &&
|
if (options.control_master == SSHCTL_MASTER_NO &&
|
||||||
|
|
Loading…
Reference in New Issue