Skip to content

Commit

Permalink
Force Nonstop to use fcntl(F_GETFL) in BIO_sock_nbio
Browse files Browse the repository at this point in the history
In tracking down a hang, we found that nonstop platforms were falling
into the if #ifdef FIONBIO clause in the implementation of
BIO_sock_nbio.  While the platform defines this macro, sockets set with
this continued to operate in blocking mode.  Given that the platform
also support O_NONBLOCK, adjust the ifdef to have the nonstop platform
use that method to ensure that sockets enter blocking mode

Related-To #22588

Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from #22696)
  • Loading branch information
nhorman authored and t8m committed Nov 14, 2023
1 parent 9890cc4 commit f63e1b4
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion crypto/bio/bio_sock.c
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ int BIO_socket_nbio(int s, int mode)
int l;

l = mode;
# ifdef FIONBIO
# if defined(FIONBIO) && !defined(OPENSSL_SYS_TANDEM)
l = mode;

ret = BIO_socket_ioctl(s, FIONBIO, &l);
Expand Down

0 comments on commit f63e1b4

Please sign in to comment.