summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoelof duToit <r@dutoit.za.net>2017-07-13 14:09:19 -0400
committerMatt Caswell <matt@openssl.org>2017-07-14 11:19:17 +0100
commit669c623fe17ed8e33c742d9b8e7ea35ce90f2127 (patch)
tree95d4d2a553fd13221273c09d668699815ab80358
parenta889e9796b6617f98332a0cfe5473c5f63b32cfc (diff)
Update PR#3925tls1.3-draft-18
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.c12
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