summaryrefslogtreecommitdiff
path: root/usr.bin/openssl
diff options
context:
space:
mode:
authorBob Beck <beck@cvs.openbsd.org>2020-05-10 16:55:29 +0000
committerBob Beck <beck@cvs.openbsd.org>2020-05-10 16:55:29 +0000
commit6337e014936b7faeb4f68dd6d4c7831165d7e52a (patch)
treeeacbee22af965d91104b3da8fc95be3e05506bcf /usr.bin/openssl
parente91b33aeb22d1aa0ac53a73ed9a6c7cde03e2d4f (diff)
Conditionalize sleep-before-retry in server code to only be done when
debug is on. otherwise, just retry. Fixes problems this creates in testing. ok jsing@ tb@
Diffstat (limited to 'usr.bin/openssl')
-rw-r--r--usr.bin/openssl/s_server.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/usr.bin/openssl/s_server.c b/usr.bin/openssl/s_server.c
index 65cd36c54ea..8b9512fdc33 100644
--- a/usr.bin/openssl/s_server.c
+++ b/usr.bin/openssl/s_server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s_server.c,v 1.33 2020/04/19 17:05:55 jsing Exp $ */
+/* $OpenBSD: s_server.c,v 1.34 2020/05/10 16:55:28 beck Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -1727,8 +1727,10 @@ www_body(char *hostname, int s, unsigned char *context)
ERR_print_errors(bio_err);
goto err;
} else {
- BIO_printf(bio_s_out, "read R BLOCK\n");
- sleep(1);
+ if (s_debug) {
+ BIO_printf(bio_s_out, "read R BLOCK\n");
+ sleep(1);
+ }
continue;
}
} else if (i == 0) { /* end of input */