This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 1c8998ccf5 Add missing call to set keep-alive timeout
1c8998ccf5 is described below
commit 1c8998ccf54576ccb10d92fd3fb184ca0803068f
Author: remm <[email protected]>
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 | 5 +++++
2 files changed, 7 insertions(+)
diff --git a/java/org/apache/coyote/http11/Http11Processor.java
b/java/org/apache/coyote/http11/Http11Processor.java
index 9f4232c7f7..f0b52c4430 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 65785ed1ed..7133de1da1 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -184,6 +184,11 @@
Remove NIO2 connector. (remm)
</update>
<!-- Entries for backport and removal before 12.0.0-M1 below this line
-->
+ <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="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
