From fa6c9ba35de4ec98f5487f296bab7ee1b7fb2da5 Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Wed, 6 Mar 2013 18:56:59 -0500
Subject: [PATCH] [FIXED JENKINS-16474] Winstone and executable WAR upgraded to
 actually support --httpKeepAliveTimeout.

---
 changelog.html | 3 +++
 war/pom.xml    | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/changelog.html b/changelog.html
index fb940c63df..fffbba7777 100644
--- a/changelog.html
+++ b/changelog.html
@@ -58,6 +58,9 @@ Upcoming changes</a>
   <li class='major bug'>
     Saving Global Jenkins Global Config wipes out the crumb issuer settings in the Global Security Config.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-17087">issue 17087</a>)
+  <li class='major bug'>
+    Made <code>--httpKeepAliveTimeout</code> option work (that was supposed to have been introduced in 1.503).
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-16474">issue 16474</a>)
   <li class=bug>
     Preview function for textareas using Jenkins markup did not work when CSRF protection was enabled.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-17085">issue 17085</a>)
diff --git a/war/pom.xml b/war/pom.xml
index b4e1362e9e..4e342d9083 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -51,7 +51,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci</groupId>
       <artifactId>executable-war</artifactId>
-      <version>1.26</version>
+      <version>1.28</version>
       <scope>provided</scope>
     </dependency>
 
@@ -104,7 +104,7 @@ THE SOFTWARE.
       -->
       <groupId>org.jenkins-ci</groupId>
       <artifactId>winstone</artifactId>
-      <version>0.9.10-jenkins-42</version>
+      <version>0.9.10-jenkins-43</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-- 
GitLab