RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-02-13 17:07:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUILD: ssl: fix build of backend without ssl

Browse Source 
Commit 522eea7 ("MINOR: ssl: Handle sending early data to server.") added
a dependency on SRV_SSL_O_EARLY_DATA which only exists when USE_OPENSSL
is defined (which is probably not the best solution) and breaks the build
when ssl is not enabled. Just add an ifdef USE_OPENSSL around the block
for now.
This commit is contained in:
Willy Tarreau 2017-11-08 14:25:59 +01:00
parent 522eea7110
commit 46c9d3e6cb
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend.c
View File

@ -1209,6 +1209,7 @@ int connect_server(struct stream *s)
err = si_connect(&s->si[1]);
#ifdef USE_OPENSSL
if (!reuse && cli_conn && srv &&
(srv->ssl_ctx.options & SRV_SSL_O_EARLY_DATA) &&
(cli_conn->flags & CO_FL_EARLY_DATA) &&
@ -1217,6 +1218,7 @@ int connect_server(struct stream *s)
srv_conn->flags &= ~(CO_FL_SSL_WAIT_HS | CO_FL_WAIT_L6_CONN);
srv_conn->flags |= CO_FL_EARLY_SSL_HS;
}
#endif
if (err != SF_ERR_NONE)
return err;