root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

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)
This commit is contained in:
Roelof duToit 2017-07-13 14:09:19 -04:00 committed by Matt Caswell
parent f32bf051cf
commit a87a39d05f
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/s_time.c
View File

@ -240,7 +240,9 @@ int s_time_main(int argc, char **argv)
www_path); www_path);
if (buf_len <= 0 || SSL_write(scon, buf, buf_len) <= 0) if (buf_len <= 0 || SSL_write(scon, buf, buf_len) <= 0)
goto end; 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; if (i > 0) bytes_read += i;
} }
#ifdef NO_SHUTDOWN #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); buf_len = BIO_snprintf(buf, sizeof(buf), fmt_http_get_cmd, www_path);
if (buf_len <= 0 || SSL_write(scon, buf, buf_len) <= 0) if (buf_len <= 0 || SSL_write(scon, buf, buf_len) <= 0)
goto end; 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; continue;
} }
#ifdef NO_SHUTDOWN #ifdef NO_SHUTDOWN
@ -328,7 +332,9 @@ int s_time_main(int argc, char **argv)
www_path); www_path);
if (buf_len <= 0 || SSL_write(scon, buf, buf_len) <= 0) if (buf_len <= 0 || SSL_write(scon, buf, buf_len) <= 0)
goto end; 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; if (i > 0) bytes_read += i;
} }
#ifdef NO_SHUTDOWN #ifdef NO_SHUTDOWN