On Sat, Nov 16, 2019 at 5:44 PM <ma...@apache.org> wrote: > This is an automated email from the ASF dual-hosted git repository. > > markt pushed a commit to branch master > in repository https://gitbox.apache.org/repos/asf/tomcat.git > > > The following commit(s) were added to refs/heads/master by this push: > new 40ca9be Fix timeout handling. Write timeout could be handled as > read timeout. > 40ca9be is described below > > commit 40ca9bef10a2c2db48e759b16fc4fbff3725ffca > Author: Mark Thomas <ma...@apache.org> > AuthorDate: Sat Nov 16 16:43:52 2019 +0000 > > Fix timeout handling. Write timeout could be handled as read timeout. > --- > java/org/apache/tomcat/util/net/NioEndpoint.java | 15 ++++++++------- > webapps/docs/changelog.xml | 4 ++++ > 2 files changed, 12 insertions(+), 7 deletions(-) > > diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java > b/java/org/apache/tomcat/util/net/NioEndpoint.java > index 1e5b900..090b26a 100644 > --- a/java/org/apache/tomcat/util/net/NioEndpoint.java > +++ b/java/org/apache/tomcat/util/net/NioEndpoint.java > @@ -953,24 +953,25 @@ public class NioEndpoint extends > AbstractJsseEndpoint<NioChannel,SocketChannel> > cancelledKey(key, socketWrapper); > } else if ((socketWrapper.interestOps() & > SelectionKey.OP_READ) == SelectionKey.OP_READ || > (socketWrapper.interestOps() & > SelectionKey.OP_WRITE) == SelectionKey.OP_WRITE) { > - boolean isTimedOut = false; > boolean readTimeout = false; > boolean writeTimeout = false; >
I should have figured out that I needed only two flags there. Sorry for the trouble, it must have been a lot harder to figure out a long time after the initial overhaul. Rémy
