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 11:19:07 +0100 |
commit | d4d986441132212c24107fc6163fd9ba28bec1e4 (patch) | |
tree | 2917e449758332b44053ae5040088b8dca6c8158 | |
parent | a071d72b82edacf562cff7197ea4a46faffad9e7 (diff) |
Update PR#3925tls1.3-draft-19
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)
-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 a7a25229a9..3c8efe9142 100644 --- a/apps/s_time.c +++ b/apps/s_time.c @@ -234,7 +234,9 @@ int s_time_main(int argc, char **argv) fmt_http_get_cmd, www_path); if (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 @@ -292,7 +294,9 @@ int s_time_main(int argc, char **argv) fmt_http_get_cmd, www_path); if (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 @@ -323,7 +327,9 @@ int s_time_main(int argc, char **argv) www_path); if (SSL_write(scon, buf, strlen(buf)) <= 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 |