From 4cfa6204e8740a3e89b96fac3f1ac49d137e9dc9 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Fri, 27 Mar 2015 15:20:24 +0000 Subject: [PATCH] Fix s_server -WWW with -async The s_server option -WWW was not async aware, and therefore was not handling SSL_ERROR_WANT_ASYNC conditions. This commit fixes that. Reviewed-by: Rich Salz --- apps/s_server.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/s_server.c b/apps/s_server.c index da093523c5..548eacbbce 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -2662,7 +2662,7 @@ static int www_body(char *hostname, int s, int stype, unsigned char *context) for (;;) { i = BIO_gets(io, buf, bufsize - 1); if (i < 0) { /* error */ - if (!BIO_should_retry(io)) { + if (!BIO_should_retry(io) && !SSL_waiting_for_async(con)) { if (!s_quiet) ERR_print_errors(bio_err); goto err; @@ -2929,7 +2929,7 @@ static int www_body(char *hostname, int s, int stype, unsigned char *context) #endif k = BIO_write(io, &(buf[j]), i - j); if (k <= 0) { - if (!BIO_should_retry(io)) + if (!BIO_should_retry(io) && !SSL_waiting_for_async(con)) goto write_error; else { BIO_printf(bio_s_out, "rwrite W BLOCK\n"); -- 2.25.1