提交 95420a25 编写于 作者: M Matt Caswell

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

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: NTomas Mraz <tomas@openssl.org>
Reviewed-by: NHugo Landau <hlandau@openssl.org>
Reviewed-by: NPaul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22480)
上级 1a91fda1
......@@ -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;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册