From 03a154da16ee16e07c472fb357586673c5ab099b Mon Sep 17 00:00:00 2001
From: jyn <github@jyn.dev>
Date: Sat, 15 Mar 2025 22:46:41 -0400
Subject: [PATCH] Increase delay to a minimum of 500 ms when requesting device
attributes
This avoids treating the terminal response as user input when it comes
over a network connection.
I confirmed that this fixed the issue for me when ssh-ing from a Windows
host (Windows Terminal, OpenSSH_for_Windows_9.5) to a Linux host.
---
tty-keys.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/tty-keys.c b/tty-keys.c
index 45175171..234b5f80 100644
--- a/tty-keys.c
+++ b/tty-keys.c
@@ -937,6 +937,16 @@ partial_key:
delay = options_get_number(global_options, "escape-time");
if (delay == 0)
delay = 1;
+ /* During startup, we request the Device Attributes from the terminal.
+ * When connecting via ssh, the response is sometimes broken over multiple TCP packets,
+ * and the delay would cause us to treat the escape code as user input.
+ * See https://github.com/PowerShell/Win32-OpenSSH/issues/2275 for more information.
+ * Raise the delay temporarily until we see a response. */
+ if (delay < 500 && (tty->flags & TTY_ALL_REQUEST_FLAGS) != TTY_ALL_REQUEST_FLAGS) {
+ log_debug("%s: increase delay for DA query", c->name);
+ delay = 500;
+ }
+
tv.tv_sec = delay / 1000;
tv.tv_usec = (delay % 1000) * 1000L;