You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2020/04/22 21:15:30 UTC
[tomcat] branch 9.0.x updated: Improve the handling of requests
that use an expectation.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 4e5fb54 Improve the handling of requests that use an expectation.
4e5fb54 is described below
commit 4e5fb54774905dff9b36d476ec6f616026136ee2
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Apr 22 22:11:29 2020 +0100
Improve the handling of requests that use an expectation.
Do not disable keep-alive where the response has a non-2xx status code
but the request body has been fully read. Patch by rjung.
---
java/org/apache/coyote/http11/Http11Processor.java | 2 +-
webapps/docs/changelog.xml | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/coyote/http11/Http11Processor.java b/java/org/apache/coyote/http11/Http11Processor.java
index aa1569c..e7d44a3 100644
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -513,7 +513,7 @@ public class Http11Processor extends AbstractProcessor {
private void checkExpectationAndResponseStatus() {
- if (request.hasExpectation() &&
+ if (request.hasExpectation() && !isRequestBodyFullyRead() &&
(response.getStatus() < 200 || response.getStatus() > 299)) {
// Client sent Expect: 100-continue but received a
// non-2xx final response. Disable keep-alive (if enabled)
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 9988353..a7de3b8 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -88,6 +88,11 @@
Include the problematic data in the error message when reporting that
the provided request line contains an invalid component. (markt)
</fix>
+ <fix>
+ Improve the handling of requests that use an expectation. Do not disable
+ keep-alive where the response has a non-2xx status code but the request
+ body has been fully read. (rjung/markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org