From 76440f3ed72c9a3edc6ea7a5751ad2ecf4655841 Mon Sep 17 00:00:00 2001
From: Kohsuke Kawaguchi <kk@kohsuke.org>
Date: Wed, 4 Jan 2012 23:58:55 -0800
Subject: [PATCH] [FIXED SECURITY-22]

Fixed hash DoS problem.
(cherry picked from commit 5ef902bb272880f47ecec4eeccd81907d9330d84)

Conflicts:

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

diff --git a/changelog.html b/changelog.html
index 8398bf839b..c4891bb223 100644
--- a/changelog.html
+++ b/changelog.html
@@ -55,7 +55,6 @@ Upcoming changes</a>
 <!-- Record your changes in the trunk here. -->
 <div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
 <ul class=image>
-  <li class=>
 </ul>
 </div><!--=TRUNK-END=-->
 
@@ -63,6 +62,9 @@ Upcoming changes</a>
 <div id="rc" style="display:none;"><!--=BEGIN=-->
 <h3><a name=v1.447>What's new in 1.447</a> <!--=DATE=--></h3>
 <ul class=image>
+  <li class=bug>
+    Fixed a hash DoS vulnerability.
+    (<a href="http://www.ocert.org/advisories/ocert-2011-003.html">SECURITY-22</a>)
   <li class=bug>
   NullPointerException in maven-plugin: Maven3Builder / ExecutedMojo (1.445)
   (<a href="https://issues.jenkins-ci.org/browse/JENKINS-12259">issue 12259</a>)
diff --git a/war/pom.xml b/war/pom.xml
index 428cad41a3..b1e9339a7a 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.24</version>
+      <version>1.25</version>
       <scope>provided</scope>
     </dependency>
 
@@ -99,7 +99,7 @@ THE SOFTWARE.
       -->
       <groupId>org.jenkins-ci</groupId>
       <artifactId>winstone</artifactId>
-      <version>0.9.10-jenkins-30</version>
+      <version>0.9.10-jenkins-31</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-- 
GitLab