mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-07 23:56:57 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MEDIUM: Special-case http_proxy when dealing with outgoing connections.

Browse Source 
http_proxy is special, because it creates its connection and conn_stream
earlier. So in assign_server(), check that the connection associated with
the conn_stream has a destination address set, and in connect_server(),
use the connection and the conn_stream already attached to the
stream_interface, instead of looking for a connection in the session, and
creating a new conn_stream.
This commit is contained in:
Olivier Houchard 2018-12-01 17:03:38 +01:00 committed by Willy Tarreau
parent ba4fff5fd2
commit 2442f68dd3
1 changed files with 51 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
src/backend.c
View File

@ -744,10 +744,16 @@ int assign_server(struct stream *s)
else if (s->be->options & (PR_O_DISPATCH | PR_O_TRANSP)) { else if (s->be->options & (PR_O_DISPATCH | PR_O_TRANSP)) {
s->target = &s->be->obj_type; s->target = &s->be->obj_type;
} }
else if ((s->be->options & PR_O_HTTP_PROXY) && else if ((s->be->options & PR_O_HTTP_PROXY)) {
conn && is_addr(&conn->addr.to)) { conn = cs_conn(objt_cs(s->si[1].end));
/* in proxy mode, we need a valid destination address */
s->target = &s->be->obj_type; if (conn && is_addr(&conn->addr.to)) {
/* in proxy mode, we need a valid destination address */
s->target = &s->be->obj_type;
} else {
err = SRV_STATUS_NOSRV;
goto out;
}
} }
else { else {
err = SRV_STATUS_NOSRV; err = SRV_STATUS_NOSRV;
@ -1109,33 +1115,45 @@ int connect_server(struct stream *s)
struct connection *cli_conn = NULL; struct connection *cli_conn = NULL;
struct connection *srv_conn = NULL; struct connection *srv_conn = NULL;
struct connection *old_conn = NULL; struct connection *old_conn = NULL;
struct conn_stream *srv_cs; struct conn_stream *srv_cs = NULL;
struct server *srv; struct server *srv;
int reuse = 0; int reuse = 0;
int err; int err;
int i; int i;
for (i = 0; i < MAX_SRV_LIST; i++) { if (!(s->be->options & PR_O_HTTP_PROXY)) {
if (s->sess->srv_list[i].target == s->target) { for (i = 0; i < MAX_SRV_LIST; i++) {
list_for_each_entry(srv_conn, &s->sess->srv_list[i].list, if (s->sess->srv_list[i].target == s->target) {
session_list) { list_for_each_entry(srv_conn, &s->sess->srv_list[i].list,
if (conn_xprt_ready(srv_conn) && session_list) {
srv_conn->mux && (srv_conn->mux->avail_streams(srv_conn) > 0)) { if (conn_xprt_ready(srv_conn) &&
reuse = 1; srv_conn->mux && (srv_conn->mux->avail_streams(srv_conn) > 0)) {
reuse = 1;
break;
}
}
}
}
if (!srv_conn) {
for (i = 0; i < MAX_SRV_LIST; i++) {
if (!LIST_ISEMPTY(&s->sess->srv_list[i].list)) {
srv_conn = LIST_ELEM(&s->sess->srv_list[i].list,
struct connection *, session_list);
break; break;
} }
} }
} }
} } else {
if (!srv_conn) { /* http_proxy is special, we can't just reuse any connection,
for (i = 0; i < MAX_SRV_LIST; i++) { * as the destination may be different. We should have created
if (!LIST_ISEMPTY(&s->sess->srv_list[i].list)) { * a connection and a conn_stream earlier, so get the
srv_conn = LIST_ELEM(&s->sess->srv_list[i].list, * connection from the conn_stream.
struct connection *, session_list); */
break; srv_cs = objt_cs(s->si[1].end);
} old_conn = srv_conn = cs_conn(srv_cs);
} if (old_conn)
reuse = 1;
} }
old_conn = srv_conn; old_conn = srv_conn;
@ -1227,14 +1245,19 @@ int connect_server(struct stream *s)
srv_conn = conn_new(); srv_conn = conn_new();
srv_cs = NULL; srv_cs = NULL;
} else { } else {
if (srv_conn->mux->avail_streams(srv_conn) == 1) { /* We already created a cs earlier when using http_proxy, so
/* No more streams available, remove it from the list */ * only create a new one if we don't have one already.
LIST_DEL(&srv_conn->list); */
LIST_INIT(&srv_conn->list); if (!srv_cs) {
if (srv_conn->mux->avail_streams(srv_conn) == 1) {
/* No more streams available, remove it from the list */
LIST_DEL(&srv_conn->list);
LIST_INIT(&srv_conn->list);
}
srv_cs = srv_conn->mux->attach(srv_conn);
if (srv_cs)
si_attach_cs(&s->si[1], srv_cs);
} }
srv_cs = srv_conn->mux->attach(srv_conn);
if (srv_cs)
si_attach_cs(&s->si[1], srv_cs);
} }
if (srv_conn && old_conn != srv_conn) { if (srv_conn && old_conn != srv_conn) {
srv_conn->owner = s->sess; srv_conn->owner = s->sess;