tree 2cce56048ff4ae43ce866d3f44d7ff56fc918b41
parent 6187cc30937b3ac1e6e4716c299c018ace863a31
author Olivier Houchard <ohouchard@haproxy.com> 1561393180 +0200
committer Christopher Faulet <cfaulet@haproxy.com> 1561537105 +0200

BUG/MEDIUM: connections: Always add the xprt handshake if needed.

In connect_server(), we used to only call xprt_add_hs() if CO_FL_SEND_PROXY
was set during the function call, we would not do it if the flag was set
before connect_server() was called. The rational at the time was if the flag
was already set, then the XPRT was already present. But now the xprt_handshake
always removes itself, so we have to re-add it each time, or it wouldn't be
done if the first connection attempt failed.
While I'm there, check any non-ssl handshake flag, instead of just
CO_FL_SEND_PROXY, or we'd miss the SOCKS4 flags.

This should be backported to 2.0.

(cherry picked from commit 6c6dc58da0dd868dd8ac3e8c7aa623d1bd4ddc40)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>