This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 129a5d631f5e06228053e1ce18be7917d012fdeb
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Oct 15 17:18:23 2020 +0100
Re-fix BZ 55160
All NIO timeouts should be set on the SocketWrapper, not the underlying
socket.
---
java/org/apache/coyote/http11/Http11NioProcessor.java | 2 +-
webapps/docs/changelog.xml | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/coyote/http11/Http11NioProcessor.java
b/java/org/apache/coyote/http11/Http11NioProcessor.java
index 8cc5648..4d81f1b 100644
--- a/java/org/apache/coyote/http11/Http11NioProcessor.java
+++ b/java/org/apache/coyote/http11/Http11NioProcessor.java
@@ -251,7 +251,7 @@ public class Http11NioProcessor extends
AbstractHttp11Processor<NioChannel> {
@Override
protected void setSocketTimeout(int timeout) throws IOException {
-
socketWrapper.getSocket().getIOChannel().socket().setSoTimeout(timeout);
+ socketWrapper.setTimeout(timeout);
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index e20a9f8..97e1263 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -97,6 +97,10 @@
and the encoded solidus was preceeded by other %nn encoded characters.
Based on a pull request by willmeck. (markt)
</fix>
+ <fix>
+ <bug>55160</bug>: Re-fix this bug after the original fix was reverted
by
+ a separate fix to timeouts in 7.0.81. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Web applications">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
