From: Christopher Faulet <cfaulet@haproxy.com>
Date: Wed, 17 Jul 2019 09:21:36 +0000 (+0200)
Subject: MINOR: proto_http: Remove the unused flag HTTP_MSGF_WAIT_CONN
X-Git-Tag: v2.1-dev2~350
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cc76d5b9a17c7d7d5971ebe653ce2d964fe7da70;p=thirdparty%2Fhaproxy.git

MINOR: proto_http: Remove the unused flag HTTP_MSGF_WAIT_CONN

This flag is set but never used. So remove it.
---

diff --git a/include/types/proto_http.h b/include/types/proto_http.h
index 9d84ef4656..a73a0a3d79 100644
--- a/include/types/proto_http.h
+++ b/include/types/proto_http.h
@@ -118,11 +118,8 @@
 #define HTTP_MSGF_XFER_LEN    0x00000004  /* message xfer size can be determined */
 #define HTTP_MSGF_VER_11      0x00000008  /* the message is HTTP/1.1 or above */
 
-/* If this flag is set, we don't process the body until the connect() is confirmed.
- * This is only used by the request forwarding function to protect the buffer
- * contents if something needs them during a redispatch.
- */
-#define HTTP_MSGF_WAIT_CONN   0x00000010  /* Wait for connect() to be confirmed before processing body */
+/* unused: 0x00000010 */
+
 #define HTTP_MSGF_COMPRESSING 0x00000020  /* data compression is in progress */
 
 #define HTTP_MSGF_BODYLESS    0x00000040  /* The message has no body (content-length = 0) */
diff --git a/src/proxy.c b/src/proxy.c
index 94b26eb99c..3012233745 100644
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -1464,15 +1464,6 @@ int stream_set_backend(struct stream *s, struct proxy *be)
 			}
 		}
 
-		/* If an LB algorithm needs to access some pre-parsed body contents,
-		 * we must not start to forward anything until the connection is
-		 * confirmed otherwise we'll lose the pointer to these data and
-		 * prevent the hash from being doable again after a redispatch.
-		 */
-		if (be->mode == PR_MODE_HTTP &&
-		    (be->lbprm.algo & (BE_LB_KIND | BE_LB_PARM)) == (BE_LB_KIND_HI | BE_LB_HASH_PRM))
-			s->txn->req.flags |= HTTP_MSGF_WAIT_CONN;
-
 		/* we may request to parse a request body */
 		if (be->options & PR_O_WREQ_BODY)
 			s->req.analysers |= AN_REQ_HTTP_BODY;