Sorry I must have forgot/overlooked replying to this.

However, I did manage to get the OpenSSL Support working with the current
v1.5-dev19 downloaded directly from the the HAProxy website using the tar
image.
Saying that though I'm glad I can still manage to break things ;)


~Scott


On 22 August 2013 09:01, Simon Horman <ho...@verge.net.au> wrote:

> On Tue, Aug 13, 2013 at 04:56:57PM +0200, Willy Tarreau wrote:
> > On Tue, Aug 13, 2013 at 03:36:09PM +0100, Scott McKeown wrote:
> > > Hi Guys,
> > >
> > > I've not applied any patches to the download as this was a direct
> 'wget'
> > > from the Git repository.
> > > As follows is the OpenSSL v1.0.0 Centos 6.4 x64 build
> > >
> > > [root@localhost ~]# wget
> > > https://github.com/horms/haproxy/archive/agent-check-20130806.zip
> >
> > Hmmm it looks to me that this is not the mainstream code, but Simon's
> tree.
> > Oh BTW that reminds me that I have still not reviewed his patch set,
> shame
> > on me :-(
>
> Although Scott would have been better off using your tree it it does seem
> that Scott has uncovered a bug in the patches in my tree, thanks for that.
> I will squash the following into "MEDIUM: Split up struct server's check
> element" before reposting to resolve this problem.
>
>
> diff --git a/src/ssl_sock.c b/src/ssl_sock.c
> index ce1712d..23bf4a3 100644
> --- a/src/ssl_sock.c
> +++ b/src/ssl_sock.c
> @@ -793,7 +793,7 @@ int ssl_sock_prepare_srv_ctx(struct server *srv,
> struct proxy *curproxy)
>         if (srv->use_ssl)
>                 srv->xprt = &ssl_sock;
>         if (srv->check.use_ssl)
> -               srv->check.xprt = &ssl_sock;
> +               srv->check_common.xprt = &ssl_sock;
>
>         srv->ssl_ctx.ctx = SSL_CTX_new(SSLv23_client_method());
>         if (!srv->ssl_ctx.ctx) {
>



-- 
With Kind Regards.

Scott McKeown
Loadbalancer.org
http://www.loadbalancer.org

Reply via email to