"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/checks.c" between
haproxy-1.9.3.tar.gz and haproxy-1.9.4.tar.gz

About: HAProxy is a TCP/HTTP reverse proxy which is particularly suited for high availability environments.

checks.c  (haproxy-1.9.3):checks.c  (haproxy-1.9.4)
skipping to change at line 1626 skipping to change at line 1626
if (i == 0) if (i == 0)
return SF_ERR_CHK_PORT; return SF_ERR_CHK_PORT;
set_host_port(&conn->addr.to, i); set_host_port(&conn->addr.to, i);
} }
/* no client address */ /* no client address */
clear_addr(&conn->addr.from); clear_addr(&conn->addr.from);
conn_prepare(conn, proto, check->xprt); conn_prepare(conn, proto, check->xprt);
conn_install_mux(conn, &mux_pt_ops, cs, s->proxy, NULL); if (conn_install_mux(conn, &mux_pt_ops, cs, s->proxy, NULL) < 0)
return SF_ERR_RESOURCE;
cs_attach(cs, check, &check_conn_cb); cs_attach(cs, check, &check_conn_cb);
/* only plain tcp-check supports quick ACK */ /* only plain tcp-check supports quick ACK */
quickack = check->type == 0 || check->type == PR_O2_TCPCHK_CHK; quickack = check->type == 0 || check->type == PR_O2_TCPCHK_CHK;
if (tcp_rule && tcp_rule->action == TCPCHK_ACT_EXPECT) if (tcp_rule && tcp_rule->action == TCPCHK_ACT_EXPECT)
quickack = 0; quickack = 0;
ret = SF_ERR_INTERNAL; ret = SF_ERR_INTERNAL;
if (proto && proto->connect) if (proto && proto->connect)
ret = proto->connect(conn, check->type, quickack ? 2 : 0); ret = proto->connect(conn, check->type, quickack ? 2 : 0);
#ifdef USE_OPENSSL #ifdef USE_OPENSSL
if (s->check.sni) if (ret == SF_ERR_NONE) {
ssl_sock_set_servername(conn, s->check.sni); if (s->check.sni)
if (s->check.alpn_str) ssl_sock_set_servername(conn, s->check.sni);
ssl_sock_set_alpn(conn, (unsigned char *)s->check.alpn_str, if (s->check.alpn_str)
s->check.alpn_len); ssl_sock_set_alpn(conn, (unsigned char *)s->check.alpn_st
r,
s->check.alpn_len);
}
#endif #endif
if (s->check.send_proxy && !(check->state & CHK_ST_AGENT)) { if (s->check.send_proxy && !(check->state & CHK_ST_AGENT)) {
conn->send_proxy_ofs = 1; conn->send_proxy_ofs = 1;
conn->flags |= CO_FL_SEND_PROXY; conn->flags |= CO_FL_SEND_PROXY;
} }
return ret; return ret;
} }
static struct list pid_list = LIST_HEAD_INIT(pid_list); static struct list pid_list = LIST_HEAD_INIT(pid_list);
skipping to change at line 2818 skipping to change at line 2821
set_host_port(&conn->addr.to, s->svc_port); set_host_port(&conn->addr.to, s->svc_port);
if (check->current_step->conn_opts & TCPCHK_OPT_SSL) { if (check->current_step->conn_opts & TCPCHK_OPT_SSL) {
xprt = xprt_get(XPRT_SSL); xprt = xprt_get(XPRT_SSL);
} }
else { else {
xprt = xprt_get(XPRT_RAW); xprt = xprt_get(XPRT_RAW);
} }
conn_prepare(conn, proto, xprt); conn_prepare(conn, proto, xprt);
conn_install_mux(conn, &mux_pt_ops, cs, proxy, NULL); if (conn_install_mux(conn, &mux_pt_ops, cs, proxy, NULL)
< 0)
return SF_ERR_RESOURCE;
cs_attach(cs, check, &check_conn_cb); cs_attach(cs, check, &check_conn_cb);
ret = SF_ERR_INTERNAL; ret = SF_ERR_INTERNAL;
if (proto->connect) if (proto->connect)
ret = proto->connect(conn, ret = proto->connect(conn,
1 /* I/O polling is always n eeded */, 1 /* I/O polling is always n eeded */,
(next && next->action == TCP CHK_ACT_EXPECT) ? 0 : 2); (next && next->action == TCP CHK_ACT_EXPECT) ? 0 : 2);
if (check->current_step->conn_opts & TCPCHK_OPT_SEND_PROX Y) { if (check->current_step->conn_opts & TCPCHK_OPT_SEND_PROX Y) {
conn->send_proxy_ofs = 1; conn->send_proxy_ofs = 1;
conn->flags |= CO_FL_SEND_PROXY; conn->flags |= CO_FL_SEND_PROXY;
 End of changes. 3 change blocks. 
7 lines changed or deleted 13 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)