[openssh-commits] [openssh] 07/10: upstream: don't attempt to set TCP_NODELAY on non-AF_INET[6]

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 4fc22252c403d5a996a9921f3b7f9b2c5c972645
Author: djm at openbsd.org <djm at openbsd.org>
AuthorDate: Mon Sep 14 02:38:27 2026 +0000

    upstream: don't attempt to set TCP_NODELAY on non-AF_INET[6]
    
    sockets. Fixes some of the regress failures in t-multiplex after recent
    pledge(2) strictification.
    
    OpenBSD-Commit-ID: ff64648747176a3192c97df50d6a8fb66b926828
---
 channels.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/channels.c b/channels.c
index fcd80288f..56020d879 100644
--- a/channels.c
+++ b/channels.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.c,v 1.463 2026/06/24 11:59:09 dtucker Exp $ */
+/* $OpenBSD: channels.c,v 1.464 2026/09/14 02:38:27 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo at cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
@@ -2066,7 +2066,7 @@ channel_post_port_listener(struct ssh *ssh, Channel *c)
 			c->notbefore = monotime() + 1;
 		return;
 	}
-	if (c->host_port != PORT_STREAMLOCAL)
+	if (addr.ss_family == AF_INET || addr.ss_family == AF_INET6)
 		set_nodelay(newsock);
 	nc = channel_new(ssh, rtype, nextstate, newsock, newsock, -1,
 	    c->local_window_max, c->local_maxpacket, 0, rtype, 1);

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.