From: Willy Tarreau <w@1wt.eu>
Date: Sun, 18 Oct 2009 19:17:42 +0000 (+0200)
Subject: [MINOR] http request: simplify the test of no-data
X-Git-Tag: v1.4-dev5~95
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=349a0f62b58c715adc7dea9b6a865232d5f322df;p=thirdparty%2Fhaproxy.git

[MINOR] http request: simplify the test of no-data

Now we can rely on (chunked && !hdr_content_len) to stop forwarding
data. We only do that for known methods that are not CONNECT though.
---

diff --git a/src/proto_http.c b/src/proto_http.c
index 5fd52117d5..a7b2975335 100644
--- a/src/proto_http.c
+++ b/src/proto_http.c
@@ -2390,16 +2390,9 @@ int http_process_req_common(struct session *s, struct buffer *req, int an_bit, s
 	}
 
 	/* We can shut read side if "connection: close" && !abort_on_close && !content-length */
-	if ((txn->meth == HTTP_METH_GET || txn->meth == HTTP_METH_HEAD) &&
-	    (s->flags & SN_CONN_CLOSED) && !(s->be->options & PR_O_ABRT_CLOSE)) {
-		struct hdr_ctx ctx;
-		ctx.idx = 0;
-		if (!http_find_header2("Transfer-Encoding", 17, msg->sol, &txn->hdr_idx, &ctx)) {
-			ctx.idx = 0;
-			if (!http_find_header2("Content-length", 14, msg->sol, &txn->hdr_idx, &ctx))
-				req->flags |= BF_DONT_READ;
-		}
-	}
+	if ((s->flags & SN_CONN_CLOSED) && !(s->be->options & PR_O_ABRT_CLOSE) &&
+	    !(txn->flags & TX_REQ_TE_CHNK) && !txn->req.hdr_content_len && (txn->meth < HTTP_METH_CONNECT))
+		req->flags |= BF_DONT_READ;
 
 	/* that's OK for us now, let's move on to next analysers */
 	return 1;