markt-asf commented on a change in pull request #218: WIP: BZ 63835: Add
support for Keep-Alive header
URL: https://github.com/apache/tomcat/pull/218#discussion_r338656563
##########
File path: java/org/apache/coyote/http11/Http11Processor.java
##########
@@ -915,8 +915,26 @@ protected final void prepareResponse() throws IOException
{
headers.addValue(Constants.CONNECTION).setString(
Constants.CLOSE);
}
- } else if (!http11 && !getErrorState().isError()) {
-
headers.addValue(Constants.CONNECTION).setString(Constants.KEEPALIVE);
+ } else if (!getErrorState().isError()) {
+ if (!http11) {
+
headers.addValue(Constants.CONNECTION).setString(Constants.KEEPALIVE);
+ }
+
+ boolean connectionKeepAlivePresent =
+ isConnectionToken(request.getMimeHeaders(),
Constants.KEEPALIVE);
+
+ if (connectionKeepAlivePresent) {
+ int keepAliveTimeout = protocol.getKeepAliveTimeout();
+
+ if (keepAliveTimeout > 0) {
+ String value = "timeout=" + keepAliveTimeout / 1000L;
+ headers.setValue("Keep-Alive").setString(value);
+ }
+
+ if (http11) {
+
headers.addValue(Constants.CONNECTION).setString(Constants.KEEPALIVE);
Review comment:
Not really. I don't see the spec language that says you need to add
`Connection: keep-alive` to an HTTP/1.1 connection when there is no
`Keep-alive: ...` header.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
