On Tue, Aug 22, 2017 at 1:03 PM, <ma...@apache.org> wrote: > Author: markt > Date: Tue Aug 22 11:03:28 2017 > New Revision: 1805752 > > URL: http://svn.apache.org/viewvc?rev=1805752&view=rev > Log: > Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61415 > Fix TLS renegotiation with OpenSSL based connections and session caching. > > Modified: > tomcat/trunk/java/org/apache/tomcat/jni/SSLContext.java > tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java > tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java > tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ > OpenSSLContext.java > tomcat/trunk/webapps/docs/changelog.xml > > Modified: tomcat/trunk/java/org/apache/tomcat/util/net/ > SecureNioChannel.java > URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/ > tomcat/util/net/SecureNioChannel.java?rev=1805752&r1=1805751&r2=1805752& > view=diff > ============================================================ > ================== > --- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java > (original) > +++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java > Tue Aug 22 11:03:28 2017 > @@ -432,7 +432,7 @@ public class SecureNioChannel extends Ni > //so we can clear it here. > netOutBuffer.clear(); > //perform the wrap > - getBufHandler().configureWriteBufferForWrite(); > + getBufHandler().configureWriteBufferForRead(); > SSLEngineResult result = > sslEngine.wrap(getBufHandler().getWriteBuffer(), > netOutBuffer); > //prepare the results to be written > netOutBuffer.flip(); > > Oops, I must have forgotten to port a fix to NIO there, or something like that, sorry.
Rémy
