diff options
| author | Roelof duToit <r@dutoit.za.net> | 2017-07-13 14:09:19 -0400 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-07-14 10:32:30 +0100 |
| commit | a87a39d05f070dda823953a0c90a447bb755b73f (patch) | |
| tree | b5f0bdacdcd601bb2ec9fe5610e11f676551965d /apps/s_time.c | |
| parent | f32bf051cf1c376216bf4fec905fafebeb6ec2dc (diff) | |
Update PR#3925
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3925)
Diffstat (limited to 'apps/s_time.c')
| -rw-r--r-- | apps/s_time.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/apps/s_time.c b/apps/s_time.c index 6976c3ce9c..cf9ed4571d 100644 --- a/apps/s_time.c +++ b/apps/s_time.c @@ -240,7 +240,9 @@ int s_time_main(int argc, char **argv) www_path); if (buf_len <= 0 || SSL_write(scon, buf, buf_len) <= 0) goto end; - while ((i = SSL_read(scon, buf, sizeof(buf))) > 0 || SSL_get_error(scon, i) == SSL_ERROR_WANT_READ) + while ((i = SSL_read(scon, buf, sizeof(buf))) > 0 || + SSL_get_error(scon, i) == SSL_ERROR_WANT_READ || + SSL_get_error(scon, i) == SSL_ERROR_WANT_WRITE) if (i > 0) bytes_read += i; } #ifdef NO_SHUTDOWN @@ -297,7 +299,9 @@ int s_time_main(int argc, char **argv) buf_len = BIO_snprintf(buf, sizeof(buf), fmt_http_get_cmd, www_path); if (buf_len <= 0 || SSL_write(scon, buf, buf_len) <= 0) goto end; - while ((i = SSL_read(scon, buf, sizeof(buf))) > 0 || SSL_get_error(scon, i) == SSL_ERROR_WANT_READ) + while ((i = SSL_read(scon, buf, sizeof(buf))) > 0 || + SSL_get_error(scon, i) == SSL_ERROR_WANT_READ || + SSL_get_error(scon, i) == SSL_ERROR_WANT_WRITE) continue; } #ifdef NO_SHUTDOWN @@ -328,7 +332,9 @@ int s_time_main(int argc, char **argv) www_path); if (buf_len <= 0 || SSL_write(scon, buf, buf_len) <= 0) goto end; - while ((i = SSL_read(scon, buf, sizeof(buf))) > 0 || SSL_get_error(scon, i) == SSL_ERROR_WANT_READ) + while ((i = SSL_read(scon, buf, sizeof(buf))) > 0 || + SSL_get_error(scon, i) == SSL_ERROR_WANT_READ || + SSL_get_error(scon, i) == SSL_ERROR_WANT_WRITE) if (i > 0) bytes_read += i; } #ifdef NO_SHUTDOWN |