Merge commit 'c9d54a4b'

core/src/main/java/hudson/model/PageDecorator.java

@@ -62,6 +62,10 @@ import java.util.List;
  * This page is added right before the </head> tag. Convenient place for additional stylesheet,
  * <meta> tags, etc.
  *
+ * <h4>httpHeaders.jelly</h4>
+ * <p>
+ * This is a generalization of the X-Jenkins header that aids auto-discovery.
+ * This fragment can write additional &lt;st:header name="..." value="..." /> tags that go along with it.
  *
  * @author Kohsuke Kawaguchi
  * @since 1.235

core/src/main/resources/hudson/model/View/index.jelly

@@ -23,16 +23,19 @@ THE SOFTWARE.
 -->
 
 <st:compress xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
+    <j:new var="h" className="hudson.Functions" /><!-- instead of JSP functions -->
     <j:if test="${request.servletPath=='/' || request.servletPath==''}">
-        <st:header name="X-Hudson" value="${servletContext.getAttribute('version')}" />
+        <st:header name="X-Hudson" value="1.395" />
         <st:header name="X-Jenkins" value="${servletContext.getAttribute('version')}" />
         <j:if test="${app.tcpSlaveAgentListener!=null}">
             <!-- advertise the CLI TCP port -->
             <st:header name="X-Hudson-CLI-Port" value="${app.tcpSlaveAgentListener.port}" />
             <st:header name="X-Jenkins-CLI-Port" value="${app.tcpSlaveAgentListener.port}" />
         </j:if>
+        <j:forEach var="pd" items="${h.pageDecorators}">
+            <st:include it="${pd}" page="httpHeaders.jelly" optional="true" />
+        </j:forEach>
     </j:if>
-    <j:new var="h" className="hudson.Functions" /><!-- instead of JSP functions -->
     <l:layout title="${it.class.name=='hudson.model.AllView' ? '%Dashboard' : it.viewName}">
         <st:include page="sidepanel.jelly" />
         <l:main-panel>