Author: remm
Date: Thu Dec 10 17:33:22 2015
New Revision: 1719121
URL: http://svn.apache.org/viewvc?rev=1719121&view=rev
Log:
Fix NIO renegotiation algorithm.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.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=1719121&r1=1719120&r2=1719121&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java Thu Dec
10 17:33:22 2015
@@ -338,12 +338,14 @@ public class SecureNioChannel extends Ni
if (!getBufHandler().isReadBufferEmpty()) throw new
IOException(sm.getString("channel.nio.ssl.appInputNotEmpty"));
if (!getBufHandler().isWriteBufferEmpty()) throw new
IOException(sm.getString("channel.nio.ssl.appOutputNotEmpty"));
handshakeComplete = false;
- boolean isReadable = true;
- boolean isWriteable = true;
+ boolean isReadable = false;
+ boolean isWriteable = false;
boolean handshaking = true;
Selector selector = null;
SelectionKey key = null;
try {
+ sslEngine.beginHandshake();
+ handshakeStatus = sslEngine.getHandshakeStatus();
while (handshaking) {
int hsStatus = this.handshake(isReadable, isWriteable);
switch (hsStatus) {
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1719121&r1=1719120&r2=1719121&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Dec 10 17:33:22 2015
@@ -155,6 +155,9 @@
OpenSSL renegotiation support for client certificate authentication.
(remm)
</add>
+ <fix>
+ Fix NIO connector renegotiation. (remm)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
