mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-05-04 20:46:11 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MINOR: mux-fcgi: Be sure to have a connection as session's origin to use it

Browse Source 
When default parameters are set in a request message, we get the client
connection using the session's origin. But it is not necessarily a
conncection. For instance, for health checks, thanks to recent changes, it may
be a check object. At this step, the client connection may be NULL. Thus, we
must be sure to have a client connection before using it.

This patch must be backported to 2.1.
This commit is contained in:
Christopher Faulet 2020-04-24 07:19:04 +02:00
parent edc6ed9778
commit bb86a0f7be
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mux_fcgi.c
View File

@ -1225,7 +1225,7 @@ static int fcgi_set_default_param(struct fcgi_conn *fconn, struct fcgi_strm *fst
if (!(params->mask & FCGI_SP_SRV_PORT)) {
char *end;
int port = 0;
if (conn_get_dst(cli_conn))
if (cli_conn && conn_get_dst(cli_conn))
port = get_host_port(cli_conn->dst);
end = ultoa_o(port, b_tail(params->p), b_room(params->p));
if (!end)
@ -1239,7 +1239,7 @@ static int fcgi_set_default_param(struct fcgi_conn *fconn, struct fcgi_strm *fst
if (!istlen(params->srv_name)) {
char *ptr = NULL;
if (conn_get_dst(cli_conn))
if (cli_conn && conn_get_dst(cli_conn))
if (addr_to_str(cli_conn->dst, b_tail(params->p), b_room(params->p)) != -1)
ptr = b_tail(params->p);
if (ptr) {
@ -1251,7 +1251,7 @@ static int fcgi_set_default_param(struct fcgi_conn *fconn, struct fcgi_strm *fst
if (!(params->mask & FCGI_SP_REM_ADDR)) {
char *ptr = NULL;
if (conn_get_src(cli_conn))
if (cli_conn && conn_get_src(cli_conn))
if (addr_to_str(cli_conn->src, b_tail(params->p), b_room(params->p)) != -1)
ptr = b_tail(params->p);
if (ptr) {
@ -1262,7 +1262,7 @@ static int fcgi_set_default_param(struct fcgi_conn *fconn, struct fcgi_strm *fst
if (!(params->mask & FCGI_SP_REM_PORT)) {
char *end;
int port = 0;
if (conn_get_src(cli_conn))
if (cli_conn && conn_get_src(cli_conn))
port = get_host_port(cli_conn->src);
end = ultoa_o(port, b_tail(params->p), b_room(params->p));
if (!end)
@ -1292,7 +1292,8 @@ static int fcgi_set_default_param(struct fcgi_conn *fconn, struct fcgi_strm *fst
}
#ifdef USE_OPENSSL
if (!(params->mask & FCGI_SP_HTTPS)) {
params->https = ssl_sock_is_ssl(cli_conn);
if (cli_conn)
params->https = ssl_sock_is_ssl(cli_conn);
}
#endif
if ((params->mask & FCGI_SP_URI_MASK) != FCGI_SP_URI_MASK) {