This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new 73b5707390 Add missing call to set keep-alive timeout
73b5707390 is described below
commit 73b570739016e5f7bac5062002918ff66e97b01e
Author: remm <r...@apache.org>
AuthorDate: Mon Jul 21 14:23:26 2025 +0200
Add missing call to set keep-alive timeout
Was present in AJP but not HTTP/1.1, so harmonize.
BZ69748
---
java/org/apache/coyote/http11/Http11Processor.java | 2 ++
webapps/docs/changelog.xml | 9 +++++++++
2 files changed, 11 insertions(+)
diff --git a/java/org/apache/coyote/http11/Http11Processor.java
b/java/org/apache/coyote/http11/Http11Processor.java
index ac9e0eb71a..fefe748859 100644
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -1150,6 +1150,8 @@ public class Http11Processor extends AbstractProcessor {
endRequest();
inputBuffer.nextRequest();
outputBuffer.nextRequest();
+ // Set keep alive timeout for next request
+ socketWrapper.setReadTimeout(protocol.getKeepAliveTimeout());
if (socketWrapper.isReadPending()) {
return SocketState.LONG;
} else {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d5d2cc16ee..901e5c6d23 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -105,6 +105,15 @@
issues do not "pop up" wrt. others).
-->
<section name="Tomcat 11.0.10 (markt)" rtext="in development">
+ <subsection name="Coyote">
+ <changelog>
+ <fix>
+ <bug>69748</bug>: Add missing call to set keep-alive timeout when using
+ HTTP/1.1 following an async request, which was present for AJP.
+ (remm/markt)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Cluster">
<changelog>
<update>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
