Author: markt
Date: Sun May 8 21:35:28 2011
New Revision: 1100822
URL: http://svn.apache.org/viewvc?rev=1100822&view=rev
Log:
Fix TCK failure with mod_proxy_http and HTTP-BIO connector as SSL key size is
not readable
Modified:
tomcat/trunk/java/org/apache/catalina/valves/SSLValve.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/valves/SSLValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/SSLValve.java?rev=1100822&r1=1100821&r2=1100822&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/SSLValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/SSLValve.java Sun May 8
21:35:28 2011
@@ -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);
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1100822&r1=1100821&r2=1100822&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Sun May 8 21:35:28 2011
@@ -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>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
