merge 8.7

dgp · dgp · commit f89809c5652c · 2025-03-05T15:27:54.000Z
diff --git a/generic/tclIOSock.c b/generic/tclIOSock.c
@@ -332,8 +332,8 @@ Tcl_OpenTcpServer(
     char portbuf[TCL_INTEGER_SPACE];
 
     TclFormatInt(portbuf, port);
-    return Tcl_OpenTcpServerEx(interp, portbuf, host, -1,
-	    TCL_TCPSERVER_REUSEADDR, acceptProc, callbackData);
+    return Tcl_OpenTcpServerEx(interp, portbuf, host, TCL_TCPSERVER_REUSEADDR,
+	    -1, acceptProc, callbackData);
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -332,8 +332,8 @@ Tcl_OpenTcpServer(`
`332`	`332`	`char portbuf[TCL_INTEGER_SPACE];`
`333`	`333`
`334`	`334`	`TclFormatInt(portbuf, port);`
`335`		`- return Tcl_OpenTcpServerEx(interp, portbuf, host, -1,`
`336`		`- TCL_TCPSERVER_REUSEADDR, acceptProc, callbackData);`
	`335`	`+ return Tcl_OpenTcpServerEx(interp, portbuf, host, TCL_TCPSERVER_REUSEADDR,`
	`336`	`+ -1, acceptProc, callbackData);`
`337`	`337`	`}`
`338`	`338`
`339`	`339`	`/*`