Author: remm
Date: Fri Aug 26 13:58:33 2016
New Revision: 1757853
URL: http://svn.apache.org/viewvc?rev=1757853&view=rev
Log:
Looking at things after reading the comment in BZ60035. The status should be
ERROR, it was probably a cut and paste error.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1757853&r1=1757852&r2=1757853&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Fri Aug 26
13:58:33 2016
@@ -713,7 +713,7 @@ public class Nio2Endpoint extends Abstra
}
setError(ioe);
writePending.release();
- endpoint.processSocket(Nio2SocketWrapper.this,
SocketEvent.OPEN_WRITE, true);
+ endpoint.processSocket(Nio2SocketWrapper.this,
SocketEvent.ERROR, true);
}
};
@@ -767,7 +767,7 @@ public class Nio2Endpoint extends Abstra
}
setError(ioe);
writePending.release();
- endpoint.processSocket(Nio2SocketWrapper.this,
SocketEvent.OPEN_WRITE, true);
+ endpoint.processSocket(Nio2SocketWrapper.this,
SocketEvent.ERROR, true);
}
};
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1757853&r1=1757852&r2=1757853&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Aug 26 13:58:33 2016
@@ -225,6 +225,10 @@
OpenSSl now disables 3DES by default so reflect this when using OpenSSL
syntax to select ciphers. (markt)
</fix>
+ <fix>
+ Use the proper ERROR socket status code for async errors with NIO2.
+ (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
