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_r339780088
##########
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:
I care more about what the spec says than what httpd does. While httpd is a
useful guide, it may not follow the spec in all instances.
----------------------------------------------------------------
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
