summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbeck <>2020-05-10 16:55:28 +0000
committerbeck <>2020-05-10 16:55:28 +0000
commit88fc0831cf60da58a9722ed343974b71b39bb0be (patch)
tree11ef3d0780052a2b8ab3b9db405c2636da78493a
parente3c950e99fdc9bd1236909cca3074806223d651b (diff)
downloadopenbsd-88fc0831cf60da58a9722ed343974b71b39bb0be.tar.gz
openbsd-88fc0831cf60da58a9722ed343974b71b39bb0be.tar.bz2
openbsd-88fc0831cf60da58a9722ed343974b71b39bb0be.zip
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@
-rw-r--r--src/usr.bin/openssl/s_server.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/usr.bin/openssl/s_server.c b/src/usr.bin/openssl/s_server.c
index 65cd36c54e..8b9512fdc3 100644
--- a/src/usr.bin/openssl/s_server.c
+++ b/src/usr.bin/openssl/s_server.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: s_server.c,v 1.33 2020/04/19 17:05:55 jsing Exp $ */ 1/* $OpenBSD: s_server.c,v 1.34 2020/05/10 16:55:28 beck Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -1727,8 +1727,10 @@ www_body(char *hostname, int s, unsigned char *context)
1727 ERR_print_errors(bio_err); 1727 ERR_print_errors(bio_err);
1728 goto err; 1728 goto err;
1729 } else { 1729 } else {
1730 BIO_printf(bio_s_out, "read R BLOCK\n"); 1730 if (s_debug) {
1731 sleep(1); 1731 BIO_printf(bio_s_out, "read R BLOCK\n");
1732 sleep(1);
1733 }
1732 continue; 1734 continue;
1733 } 1735 }
1734 } else if (i == 0) { /* end of input */ 1736 } else if (i == 0) { /* end of input */