From b7dd22f3b3e55ea5b9c6b59d9d56350a2c91fa67 Mon Sep 17 00:00:00 2001
From: kohsuke <kohsuke@71c3de6d-444a-0410-be80-ed276b4c234a>
Date: Sun, 1 Mar 2009 02:39:53 +0000
Subject: [PATCH] [FIXED HUDSON-3158] Starting some relatively recent version
 of Hudson, slave agent now supports multiple master URLs to try. This is to
 counter a typical configuration problem and general inability of Hudson
 master to correctly infer the Hudson URL on its own.

So this is not a bug, but I changed the code anyway to only put one -url option if the two inferred Hudson URLs are identical.

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@15914 71c3de6d-444a-0410-be80-ed276b4c234a
---
 .../SlaveComputer/slave-agent.jnlp.jelly      | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/core/src/main/resources/hudson/slaves/SlaveComputer/slave-agent.jnlp.jelly b/core/src/main/resources/hudson/slaves/SlaveComputer/slave-agent.jnlp.jelly
index 15728ffad4..e3ae0b3fe1 100644
--- a/core/src/main/resources/hudson/slaves/SlaveComputer/slave-agent.jnlp.jelly
+++ b/core/src/main/resources/hudson/slaves/SlaveComputer/slave-agent.jnlp.jelly
@@ -70,18 +70,20 @@ THE SOFTWARE.
         <argument>-url</argument>
         <argument>${rootURL}</argument>
 
-        <!--
-          rootURL is based on the URL in the system config, but there has been
-          numerous reports about people moving Hudson to another place but
-          forgetting to update it. To improve the user experience in this regard,
-          let's also pass the URL that the browser sent us as well, so that the
-          JNLP Main class can try both.
+        <j:if test="${rootURL!=app.rootUrlFromRequest}">
+          <!--
+            rootURL is based on the URL in the system config, but there has been
+            numerous reports about people moving Hudson to another place but
+            forgetting to update it. To improve the user experience in this regard,
+            let's also pass the URL that the browser sent us as well, so that the
+            JNLP Main class can try both.
 
-          Note that rootURL is still necessary in various situations, such
-          as reverse HTTP proxy situation, which makes rootUrlFromRequest incorrect. 
-        -->
-        <argument>-url</argument>
-        <argument>${app.rootUrlFromRequest}</argument>
+            Note that rootURL is still necessary in various situations, such
+            as reverse HTTP proxy situation, which makes rootUrlFromRequest incorrect.
+          -->
+          <argument>-url</argument>
+          <argument>${app.rootUrlFromRequest}</argument>
+        </j:if>
       </application-desc>
     </jnlp>
   </l:isAdminOrTest>
-- 
GitLab