mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-21 22:01:31 +02:00
Code Issues Projects Releases Wiki Activity

BUILD: ssl: fix again a libressl build failure after the openssl FD leak fix

Browse Source 
As with every single OpenSSL fix, LibreSSL build broke again, this time
after commit 56996dabe ("BUG/MINOR: mworker/ssl: close OpenSSL FDs on
reload"). A definitive solution will have to be found quickly. For now,
let's exclude libressl from the version test.

This patch must be backported to 1.9 since the fix above was already
backported there.
This commit is contained in:
Willy Tarreau 2019-05-09 13:53:28 +02:00
parent d9986ed51e
commit affd1b980a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/haproxy.c
View File

@ -590,7 +590,7 @@ void mworker_reload()
ptdf->fct(); ptdf->fct();
if (fdtab) if (fdtab)
deinit_pollers(); deinit_pollers();
#if defined(USE_OPENSSL) && (OPENSSL_VERSION_NUMBER >= 0x10101000L) #if defined(USE_OPENSSL) && (OPENSSL_VERSION_NUMBER >= 0x10101000L) && !defined(LIBRESSL_VERSION_NUMBER)
if (global.ssl_used_frontend || global.ssl_used_backend) if (global.ssl_used_frontend || global.ssl_used_backend)
/* close random device FDs */ /* close random device FDs */
RAND_keep_random_devices_open(0); RAND_keep_random_devices_open(0);