RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-13 15:04:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Christopher Faulet 2019-07-15 15:00:25 +02:00
parent 3494c63770
commit 60d29b37b2
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/proxy.c
View File

@ -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);