From: Christopher Faulet <cfaulet@haproxy.com>
Date: Mon, 15 Jul 2019 13:00:25 +0000 (+0200)
Subject: MINOR: proxy: Remove tests on the option 'http-use-htx' during H1 upgrade
X-Git-Tag: v2.1-dev2~368
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=60d29b37b24440dce783dfd0f229cc5c0ff42866;p=thirdparty%2Fhaproxy.git

MINOR: proxy: Remove tests on the option 'http-use-htx' during H1 upgrade

To know if an upgrade from TCP to H1 must be performed, we now only need to know
if a non HTX stream is assigned to an HTTP backend. So we don't rely anymore on
the flag PR_O2_USE_HTX to handle such upgrades.
---

diff --git a/src/proxy.c b/src/proxy.c
index 518ee3543c..2a8f87bcc3 100644
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -1415,10 +1415,6 @@ int stream_set_backend(struct stream *s, struct proxy *be)
 			     HA_ATOMIC_ADD(&be->beconn, 1));
 	proxy_inc_be_ctr(be);
 
-	/* HTX/legacy must match */
-	if ((strm_fe(s)->options2 ^ be->options2) & PR_O2_USE_HTX)
-		return 0;
-
 	/* assign new parameters to the stream from the new backend */
 	s->si[1].flags &= ~SI_FL_INDEP_STR;
 	if (be->options2 & PR_O2_INDEPSTR)
@@ -1464,7 +1460,7 @@ int stream_set_backend(struct stream *s, struct proxy *be)
 
 		/* If we chain a TCP frontend to an HTX backend, we must upgrade
 		 * the client mux */
-		if (!IS_HTX_STRM(s) && be->mode == PR_MODE_HTTP && (be->options2 & PR_O2_USE_HTX)) {
+		if (!IS_HTX_STRM(s) && be->mode == PR_MODE_HTTP) {
 			struct connection  *conn = objt_conn(strm_sess(s)->origin);
 			struct conn_stream *cs   = objt_cs(s->si[0].end);