[FIXED JENKINS-27218]

Advertise X-JNLP-Host-Name correctly
jenkinsci · Apr 22, 2015 · 342dc73 · 342dc73
1 parent 86bf6b7
commit 342dc73
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/changelog.html b/changelog.html
@@ -58,6 +58,9 @@
   <li class=bug>
     Search box did not work well inside folders.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-24433">issue 24433</a>)
+  <li class=rfe>
+    Advertise JNLP slave agents to the correct host name, even in the presence of a reverse proxy.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-27218">issue 27218</a>)
   <li class=rfe>
     Advertised TCP slave agent port number is made tweakable.
 </ul>

diff --git a/core/src/main/resources/hudson/TcpSlaveAgentListener/index.jelly b/core/src/main/resources/hudson/TcpSlaveAgentListener/index.jelly
@@ -30,6 +30,10 @@ THE SOFTWARE.
   -->
   <st:header name="X-Hudson-JNLP-Port" value="${app.tcpSlaveAgentListener.port}" />
   <st:header name="X-Jenkins-JNLP-Port" value="${app.tcpSlaveAgentListener.port}" />
+  <!--
+    if the host name is overriden, advertise that as well
+  -->
+  <st:header name="X-Jenkins-JNLP-Host" value="${app.tcpSlaveAgentListener.CLI_HOST_NAME}" />
 
   Jenkins
 </j:jelly>