Author: markt
Date: Thu Jan 23 17:33:42 2014
New Revision: 1560764
URL: http://svn.apache.org/r1560764
Log:
Make the HTTP NIO connector tolerant of whitespace in the individual alues used
for the ciphers attribute.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1560764&r1=1560763&r2=1560764&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 23 17:33:42 2014
@@ -30,19 +30,6 @@ None
PATCHES PROPOSED TO BACKPORT:
[ New proposals should be added at the end of the list ]
-* BIO tolerates whitespace in the ciphers attribute whereas NIO does not. Make
- NIO tolerate it as well
-
http://people.apache.org/~markt/patches/2014-01-18-ciphers-whitespace-nio-tc6-v1.patch
- +1: markt, rjung, schultz
- +1: kkolinko: OK, though I have two comments:
- 1. If we align NIO and BIO here, the code in
JSSESocketFactory.getEnabledCiphers(..)
- also skips empty tokens.
- 2. There is similar code in TC7 & trunk in
AbstractEndpoint.setCiphers(),
- but it has not been fixed yet.
- Actually as far as I see the ciphersarr is never used in TC7 &
- trunk, as there are no calls to AbstractEndpoint.getCiphersArray().
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56029
Regression in fix for BZ55198 broke parsing of some ternary expressions
Align tc6 implementation with that of trunk (diff to trunk is easy to review)
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1560764&r1=1560763&r2=1560764&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Thu
Jan 23 17:33:42 2014
@@ -640,7 +640,9 @@ public class NioEndpoint extends Abstrac
else {
StringTokenizer t = new StringTokenizer(s,",");
ciphersarr = new String[t.countTokens()];
- for (int i=0; i<ciphersarr.length; i++ ) ciphersarr[i] =
t.nextToken();
+ for (int i=0; i<ciphersarr.length; i++ ) {
+ ciphersarr[i] = t.nextToken().trim();
+ }
}
}
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1560764&r1=1560763&r2=1560764&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Jan 23 17:33:42 2014
@@ -44,6 +44,14 @@
General, Catalina, Coyote, Jasper, Cluster, Web applications, Other
-->
<section name="Tomcat 6.0.39 (markt)">
+ <subsection name="Coyote">
+ <changelog>
+ <fix>
+ Make the HTTP NIO connector tolerant of whitespace in the individual
+ values used for the ciphers attribute. (markt)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Web applications">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
