Commit d4d98644 authored by Roelof duToit's avatar Roelof duToit Committed by Matt Caswell
Browse files

Update PR#3925 



Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
Reviewed-by: default avatarBernd Edlinger <bernd.edlinger@hotmail.de>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3925)
parent a071d72b

apps/s_time.c

+9 −3
Original line number Original line Diff line number Diff line
@@ -234,7 +234,9 @@ int s_time_main(int argc, char **argv) 
                                   fmt_http_get_cmd, www_path);

                                   fmt_http_get_cmd, www_path);

            if (SSL_write(scon, buf, buf_len) <= 0)

            if (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
@@ -292,7 +294,9 @@ int s_time_main(int argc, char **argv) 
                               fmt_http_get_cmd, www_path);

                               fmt_http_get_cmd, www_path);

        if (SSL_write(scon, buf, buf_len) <= 0)

        if (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
@@ -323,7 +327,9 @@ int s_time_main(int argc, char **argv) 
                         www_path);

                         www_path);

            if (SSL_write(scon, buf, strlen(buf)) <= 0)

            if (SSL_write(scon, buf, strlen(buf)) <= 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