michael-o 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_r338621248
##########
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:
@markt-asf This is is a very good question. I share @ChristopherSchultz's
opinion. It is in line with
https://tools.ietf.org/id/draft-thomson-hybi-http-timeout-01.html#rfc.section.2.
If the client has not requested a keep alive, the else clause is never
evaluated. The condition is that the has send a `keep-alive` and either a
timeout is set or the timeout is negative which means the connection can be
held open forever. Does this make sense?
----------------------------------------------------------------
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:
us...@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
