diff options
| author | Neil Horman <nhorman@openssl.org> | 2023-11-10 15:31:23 -0500 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2023-11-14 07:44:06 +0100 |
| commit | 0ef3e1305db3f77bb0b0702c9b45bb39d165f28a (patch) | |
| tree | 75b717429aa3723cc1766533c75396b31f9029f0 | |
| parent | aa95fb14003121d0b6c86e564c31cb95424d4bed (diff) | |
Force Nonstop to use fcntl(F_GETFL) in BIO_sock_nbio
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 https://github.com/openssl/openssl/pull/22696)
(cherry picked from commit f63e1b48ac893dd6110452e70ed08f191547cd89)
| -rw-r--r-- | crypto/bio/bio_sock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/bio/bio_sock.c b/crypto/bio/bio_sock.c index 7aa7bdc65e..9f2ae73063 100644 --- a/crypto/bio/bio_sock.c +++ b/crypto/bio/bio_sock.c @@ -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); |