Author: markt Date: Mon Jan 9 14:12:36 2017 New Revision: 1777967 URL: http://svn.apache.org/viewvc?rev=1777967&view=rev Log: Remove problematic work-around
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1777967&r1=1777966&r2=1777967&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Mon Jan 9 14:12:36 2017 @@ -2362,14 +2362,6 @@ public class AprEndpoint extends Abstrac return result; } else if (result == 0 || -result == Status.EAGAIN) { return 0; - } else if (-result == Status.APR_EGENERAL && isSecure()) { - // Not entirely sure why this is necessary. Testing to date has not - // identified any issues with this but log it so it can be tracked - // if it is suspected of causing issues in the future. - if (log.isDebugEnabled()) { - log.debug(sm.getString("socket.apr.read.sslGeneralError", getSocket(), this)); - } - return 0; } else if ((-result) == Status.ETIMEDOUT || (-result) == Status.TIMEUP) { if (block) { throw new SocketTimeoutException(sm.getString("iib.readtimeout")); 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=1777967&r1=1777966&r2=1777967&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties (original) +++ tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties Mon Jan 9 14:12:36 2017 @@ -115,7 +115,6 @@ socket.sslreneg=Exception re-negotiating socket.apr.clientAbort=The client aborted the connection. socket.apr.read.error=Unexpected error [{0}] reading data from the APR/native socket [{1}] with wrapper [{2}]. -socket.apr.read.sslGeneralError=An APR general error was returned by the SSL read operation on APR/native socket [{0}] with wrapper [{1}]. It will be treated as EAGAIN and the socket returned to the poller. socket.apr.write.error=Unexpected error [{0}] writing data to the APR/native socket [{1}] with wrapper [{2}]. socket.apr.closed=The socket [{0}] associated with this connection has been closed. Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1777967&r1=1777966&r2=1777967&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Mon Jan 9 14:12:36 2017 @@ -51,6 +51,12 @@ Ensure UpgradeProcessor instances associated with closed connections are removed from the map of current connections to Processors. (markt) </fix> + <fix> + Remove a workaround for a problem previously reported with WebSocket, + TLS and APR that treated some error conditions as not errors. The + original problem cannot be reproduced with the current code and the + work-around is now causing problems. (markt) + </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