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

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 2ad9be0..36955c7 100644 (file)
--- 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 913ea74..2835db1 100644 (file)
--- 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>