Author: markt
Date: Mon Oct 21 14:04:19 2013
New Revision: 1534165
URL: http://svn.apache.org/r1534165
Log:
Revert the swallowing of the Status.APR_EGENERAL. It can't be the SSL handshake
failing as that has to have completed for the code to get this far and it
appears to be related (the same?) as the random closes when using the drawing
board example.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletInputStream.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletOutputStream.java
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletInputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletInputStream.java?rev=1534165&r1=1534164&r2=1534165&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletInputStream.java
(original)
+++
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletInputStream.java
Mon Oct 21 14:04:19 2013
@@ -100,9 +100,6 @@ public class AprServletInputStream exten
(-result == Status.APR_OS_START_SYSERR + 10053)) {
// 10053 on Windows is connection aborted
throw new EOFException(sm.getString("apr.clientAbort"));
- } else if (-result == Status.APR_EGENERAL && wrapper.isSecure()) {
- // Connection abort by client during SSL handshake
- throw new EOFException(sm.getString("apr.clientAbort"));
} else {
throw new IOException(sm.getString("apr.read.error",
Integer.valueOf(-result), Long.valueOf(socket)));
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletOutputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletOutputStream.java?rev=1534165&r1=1534164&r2=1534165&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletOutputStream.java
(original)
+++
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletOutputStream.java
Mon Oct 21 14:04:19 2013
@@ -141,9 +141,6 @@ public class AprServletOutputStream exte
(-written == Status.APR_OS_START_SYSERR + 10053)) {
// 10053 on Windows is connection aborted
throw new EOFException(sm.getString("apr.clientAbort"));
- } else if (-written == Status.APR_EGENERAL && wrapper.isSecure()) {
- // Connection abort by client during SSL handshake
- throw new EOFException(sm.getString("apr.clientAbort"));
} else if (written < 0) {
throw new IOException(sm.getString("apr.write.error",
Integer.valueOf(-written), Long.valueOf(socket)));
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
