From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 8 May 2011 21:35:28 +0000 (+0000)
Subject: Fix TCK failure with mod_proxy_http and HTTP-BIO connector as SSL key size is not... 
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=3d54878182391ee44a68e5567221030bed63af36;p=tomcat7.0

Fix TCK failure with mod_proxy_http and HTTP-BIO connector as SSL key size is not readable

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1100822 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/catalina/valves/SSLValve.java b/java/org/apache/catalina/valves/SSLValve.java
index 2ad9be0fc..36955c7b2 100644
--- a/java/org/apache/catalina/valves/SSLValve.java
+++ b/java/org/apache/catalina/valves/SSLValve.java
@@ -126,7 +126,8 @@ public class SSLValve extends ValveBase {
         }
         strcert0 = mygetHeader(request, "ssl_cipher_usekeysize");
         if (strcert0 != null) {
-            request.setAttribute(Globals.KEY_SIZE_ATTR, strcert0);
+            request.setAttribute(Globals.KEY_SIZE_ATTR,
+                    Integer.valueOf(strcert0));
         }
         getNext().invoke(request, response);
     }
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 913ea74f1..2835db166 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -49,6 +49,10 @@
         Stylistic improvements to MIME type sync script.
         Based on a patch provided by Felix Schumacher. (rjung)
       </update>
+      <fix>
+        Ensure that the SSLValve provides the SSL key size as an Integer rather
+        than a String. (markt)
+      </fix>
     </changelog>
   </subsection>
 </section>