[FIXED JENKINS-5753]

Integrated the fix into Jenkins
jenkinsci · Jul 17, 2013 · 905bc03 · jglick · Jul 17, 2013 · 905bc03
1 parent 0f515fe
commit 905bc03
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/changelog.html b/changelog.html
@@ -55,6 +55,9 @@
 <!-- Record your changes in the trunk here. -->
 <div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
 <ul class=image>
+  <li class=bug>
+    Fixed Winstone+mod_proxy_ajp+SSL combo issue.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-5753">issue 5753</a>)
   <li class=bug>
     Provided maven settings.xml in maven builder is lost.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-15976">issue 15976</a>)

diff --git a/war/pom.xml b/war/pom.xml
@@ -104,7 +104,7 @@ THE SOFTWARE.
       -->
       <groupId>org.jenkins-ci</groupId>
       <artifactId>winstone</artifactId>
-      <version>0.9.10-jenkins-44</version>
+      <version>0.9.10-jenkins-45</version>
       <scope>test</scope>
     </dependency>
     <dependency>