Repository: trafficserver Updated Branches: refs/heads/master 545e9bafd -> 742d347a9
TS-3106: Make sure to close connection on timeout Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/742d347a Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/742d347a Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/742d347a Branch: refs/heads/master Commit: 742d347a9f3e92252932828bfb27bb831ebcb4ef Parents: 545e9ba Author: Brian Geffon <[email protected]> Authored: Thu Oct 2 20:02:55 2014 -0700 Committer: Brian Geffon <[email protected]> Committed: Thu Oct 2 20:02:55 2014 -0700 ---------------------------------------------------------------------- proxy/http/HttpTransact.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/742d347a/proxy/http/HttpTransact.cc ---------------------------------------------------------------------- diff --git a/proxy/http/HttpTransact.cc b/proxy/http/HttpTransact.cc index b1838e2..112f247 100644 --- a/proxy/http/HttpTransact.cc +++ b/proxy/http/HttpTransact.cc @@ -7977,7 +7977,9 @@ HttpTransact::build_error_response(State *s, HTTPStatus status_code, const char // the next header (unless we've already drained // // which we do for NTLM auth) // ////////////////////////////////////////////////////// - if (s->hdr_info.client_request.get_content_length() != 0 || s->client_info.transfer_encoding == HttpTransact::CHUNKED_ENCODING) { + if (status_code == HTTP_STATUS_REQUEST_TIMEOUT || + s->hdr_info.client_request.get_content_length() != 0 || + s->client_info.transfer_encoding == HttpTransact::CHUNKED_ENCODING) { s->client_info.keep_alive = HTTP_NO_KEEPALIVE; } else { // We don't have a request body. Since we are
