mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-21 22:01:31 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MEDIUM: stream: Don't install the mux in back_handle_st_con().

Browse Source 
In back_handle_st_con(), don't bother setting up the mux, it is now done by
conn_fd_handler().
This commit is contained in:
Olivier Houchard 2020-01-24 15:36:38 +01:00 committed by Olivier Houchard
parent efe5e8e998
commit b43589cac5
1 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/backend.c
View File

@ -1905,9 +1905,6 @@ void back_handle_st_req(struct stream *s)
* SI_ST_CER (error), SI_ST_DIS (abort), and SI_ST_CON (no change). This only
* works with connection-based streams. We know that there were no I/O event
* when reaching this function. Timeouts and errors are *not* cleared.
* We might have been woken up as part of the confirmation of a full-stack
* connection setup (e.g. raw+PP+TLS+ALPN). It will then be our role to install
* a mux on this connection based on what ALPN could have been negotiated.
*/
void back_handle_st_con(struct stream *s)
{
@ -1933,25 +1930,6 @@ void back_handle_st_con(struct stream *s)
goto end;
}
/* first, let's see if we've made any progress on this connection */
if (!conn->mux && !(conn->flags & CO_FL_WAIT_XPRT)) {
/* connection finished to set up */
struct server *srv;
if (conn->flags & CO_FL_ERROR)
goto fail;
if (conn_install_mux_be(conn, srv_cs, s->sess) < 0)
goto fail;
srv = objt_server(s->target);
if (srv && ((s->be->options & PR_O_REUSE_MASK) != PR_O_REUSE_NEVR) &&
conn->mux->avail_streams(conn) > 0)
LIST_ADD(&srv->idle_conns[tid], &conn->list);
goto done;
fail:
si_release_endpoint(&s->si[1]);
}
done:
/* retryable error ? */
if (si->flags & (SI_FL_EXP|SI_FL_ERR)) {