diff --git a/core/src/main/java/hudson/slaves/JNLPLauncher.java b/core/src/main/java/hudson/slaves/JNLPLauncher.java
index 4f0cbc1e6153..09d2b52a15fe 100644
--- a/core/src/main/java/hudson/slaves/JNLPLauncher.java
+++ b/core/src/main/java/hudson/slaves/JNLPLauncher.java
@@ -213,9 +213,7 @@ private String getRemotingOptions(String computerName) {
sb.append("-name ");
sb.append(computerName);
sb.append(' ');
- if (isWebSocket()) {
- sb.append("-webSocket ");
- }
+ sb.append("-webSocket ");
if (tunnel != null) {
sb.append(" -tunnel ");
sb.append(tunnel);
diff --git a/core/src/main/resources/hudson/slaves/JNLPLauncher/main.properties b/core/src/main/resources/hudson/slaves/JNLPLauncher/main.properties
index dbb8ec9fed72..1eb84e1006bf 100644
--- a/core/src/main/resources/hudson/slaves/JNLPLauncher/main.properties
+++ b/core/src/main/resources/hudson/slaves/JNLPLauncher/main.properties
@@ -26,7 +26,7 @@ slaveAgent.cli.run=Run from agent command line:
slaveAgent.cli.run.secret=Or run from agent command line, with the secret stored in a file:
powerShell.cli.curl=Note: PowerShell users must use curl.exe instead of curl because curl is a default PowerShell cmdlet alias for Invoke-WebRequest.
commonOptions=\
- The most commonly used option is -webSocket
. \
+ If you prefer to use TCP instead of WebSockets, remove the -webSocket
option. \
Run java -jar agent.jar -help
for more.
tcp-port-disabled=\
The TCP port is disabled so TCP agents may not be connected. \