tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1843142 - in /tomcat/trunk: java/org/apache/tomcat/util/net/LocalStrings.properties java/org/apache/tomcat/util/net/SecureNioChannel.java webapps/docs/changelog.xml
Date Mon, 08 Oct 2018 13:48:30 GMT
Author: markt
Date: Mon Oct  8 13:48:30 2018
New Revision: 1843142

URL: http://svn.apache.org/viewvc?rev=1843142&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62791
Remove an unnecessary check in the NIO TLS implementation that prevented from secure WebSocket
connections from being established.

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
    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/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties?rev=1843142&r1=1843141&r2=1843142&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties [UTF-8] (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties [UTF-8] Mon Oct 
8 13:48:30 2018
@@ -120,7 +120,6 @@ channel.nio.ssl.wrapException=Handshake
 channel.nio.ssl.wrapFail=Unable to wrap data, invalid status [{0}]
 channel.nio.ssl.incompleteHandshake=Handshake incomplete, you must complete handshake before
reading data.
 channel.nio.ssl.closing=Channel is in closing state.
-channel.nio.ssl.invalidBuffer=You can only read using the application read buffer provided
by the handler.
 channel.nio.ssl.expandNetInBuffer=Expanding network input buffer to [{0}] bytes
 channel.nio.ssl.expandNetOutBuffer=Expanding network output buffer to [{0}] bytes
 channel.nio.ssl.sniDefault=Unable to buffer enough data to determine requested SNI host name.
Using default

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=1843142&r1=1843141&r2=1843142&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java Mon Oct  8 13:48:30
2018
@@ -565,11 +565,6 @@ public class SecureNioChannel extends Ni
      */
     @Override
     public int read(ByteBuffer dst) throws IOException {
-        // Make sure we only use the ApplicationBufferHandler's buffers
-        if (dst != getBufHandler().getReadBuffer() && (getAppReadBufHandler() ==
null
-                || dst != getAppReadBufHandler().getByteBuffer())) {
-            throw new IllegalArgumentException(sm.getString("channel.nio.ssl.invalidBuffer"));
-        }
         //are we in the middle of closing or closed?
         if ( closing || closed) return -1;
         //did we finish our handshake?

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1843142&r1=1843141&r2=1843142&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Oct  8 13:48:30 2018
@@ -118,6 +118,11 @@
         Such requests are unusual but not invalid. Patch provided by Michael
         Orr. (markt)
       </fix>
+      <fix>
+        <bug>62791</bug>: Remove an unnecessary check in the NIO TLS
+        implementation that prevented from secure WebSocket connections from
+        being established. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Jasper">



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message