From: Willy Tarreau <w@1wt.eu>
Date: Sun, 10 Jan 2010 09:35:01 +0000 (+0100)
Subject: [MINOR] http redirect: don't explicitly state keep-alive on 1.1
X-Git-Tag: v1.4-dev7~40
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=75661457f7258253933ad1c4187f188297481b09;p=thirdparty%2Fhaproxy.git

[MINOR] http redirect: don't explicitly state keep-alive on 1.1

Do not set the "connection: keep-alive" header when the request is in
HTTP 1.1, it's implicit.
---

diff --git a/src/proto_http.c b/src/proto_http.c
index f2f312e3b7..92c58691a8 100644
--- a/src/proto_http.c
+++ b/src/proto_http.c
@@ -2867,8 +2867,12 @@ int http_process_req_common(struct session *s, struct buffer *req, int an_bit, s
 			    ((txn->flags & TX_CON_WANT_MSK) == TX_CON_WANT_SCL ||
 			     (txn->flags & TX_CON_WANT_MSK) == TX_CON_WANT_KAL)) {
 				/* keep-alive possible */
-				memcpy(rdr.str + rdr.len, "\r\nConnection: keep-alive\r\n\r\n", 28);
-				rdr.len += 28;
+				if (!(txn->flags & TX_REQ_VER_11)) {
+					memcpy(rdr.str + rdr.len, "\r\nConnection: keep-alive", 24);
+					rdr.len += 24;
+				}
+				memcpy(rdr.str + rdr.len, "\r\n\r\n", 4);
+				rdr.len += 4;
 				buffer_write(req->prod->ob, rdr.str, rdr.len);
 				/* "eat" the request */
 				buffer_ignore(req, msg->sov - msg->som);