mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-11-27 05:21:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't wait in select if we have data to write

Browse Source 
In s_client, when using quic, if we have data from the user to write then we shouldn't
hang in "select" waiting for something to happen.

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22480)
This commit is contained in:
Matt Caswell 2023-10-23 18:11:06 +01:00
parent 1a91fda183
commit 95420a2500
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/s_client.c
View File

@ -2969,10 +2969,13 @@ int s_client_main(int argc, char **argv)
} while (!write_ssl
&& cbuf_len == 0
&& user_data_has_data(&user_data));
if (cbuf_len > 0)
if (cbuf_len > 0) {
read_tty = 0;
else
timeout.tv_sec = 0;
timeout.tv_usec = 0;
} else {
read_tty = 1;
}
}
ssl_pending = read_ssl && SSL_has_pending(con);
@ -3266,6 +3269,7 @@ int s_client_main(int argc, char **argv)
ret = 0;
goto shut;
}
if (i > 0 && !user_data_add(&user_data, i)) {
ret = 0;
goto shut;