Skip to content

Commit f5538d9

Browse files
douzzerdouzzer
authored
Merge pull request #10758 from julek-wolfssl/fix-ocsp-stapling-tls13multi-wait-timeout
Bound waited example servers with timeout to fix flaky CI test hangs
2 parents 27e160f + 88032c1 commit f5538d9

9 files changed

Lines changed: 94 additions & 31 deletions

‎scripts/crl-revoked.test‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
#!/usr/bin/env bash
22

3+
# timeout(1) is GNU coreutils and absent on macOS; where it's missing, run the
4+
# command unbounded (the flaky hang this guards against is Linux-only CI).
5+
if ! command -v timeout >/dev/null 2>&1; then
6+
timeout() { while [ "${1:-}" = "-s" ] || [ "${1:-}" = "-k" ]; do shift 2; done; shift; "$@"; }
7+
fi
8+
9+
310
[ ! -x ./examples/client/client ] && printf '\n\n%s\n' "Client doesn't exist" \
411
&& exit 1
512

@@ -99,7 +106,7 @@ run_test() {
99106
# starts the server on crl_port, -R generates ready file to be used as a
100107
# mutex lock, -c loads the revoked certificate. We capture the processid
101108
# into the variable server_pid
102-
./examples/server/server -R "$ready_file" -p $crl_port \
109+
timeout -s KILL 2m ./examples/server/server -R "$ready_file" -p $crl_port \
103110
-c ${CERT_DIR}/server-revoked-cert.pem \
104111
-k ${CERT_DIR}/server-revoked-key.pem &
105112
server_pid=$!
@@ -176,7 +183,7 @@ run_hashdir_test() {
176183
# starts the server on crl_port, -R generates ready file to be used as a
177184
# mutex lock, -c loads the revoked certificate. We capture the processid
178185
# into the variable server_pid
179-
./examples/server/server -R "$ready_file" -p $crl_port \
186+
timeout -s KILL 2m ./examples/server/server -R "$ready_file" -p $crl_port \
180187
-c ${CERT_DIR}/server-revoked-cert.pem \
181188
-k ${CERT_DIR}/server-revoked-key.pem &
182189
server_pid=$!

‎scripts/dtlscid.test‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
#!/usr/bin/env bash
22

3+
# timeout(1) is GNU coreutils and absent on macOS; where it's missing, run the
4+
# command unbounded (the flaky hang this guards against is Linux-only CI).
5+
if ! command -v timeout >/dev/null 2>&1; then
6+
timeout() { while [ "${1:-}" = "-s" ] || [ "${1:-}" = "-k" ]; do shift 2; done; shift; "$@"; }
7+
fi
8+
9+
310
# dtlscid.test
411
# Copyright wolfSSL 2022-2024
512

@@ -54,7 +61,7 @@ test_cid () {
5461
echo "Running test_cid"
5562
SERVER_FILE=$(mktemp)
5663
CLIENT_FILE=$(mktemp)
57-
$WOLFSSL_ROOT/examples/server/server -v4 -u --cid $SCID 1> $SERVER_FILE &
64+
timeout -s KILL 2m $WOLFSSL_ROOT/examples/server/server -v4 -u --cid $SCID 1> $SERVER_FILE &
5865
SERVER_PID=$!
5966
sleep 0.2
6067
$WOLFSSL_ROOT/examples/client/client -v4 -u --cid $CCID 1> $CLIENT_FILE

‎scripts/ocsp-stapling-with-wolfssl-responder.test‎

Lines changed: 26 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
#!/usr/bin/env bash
22

3+
# timeout(1) is GNU coreutils and absent on macOS; where it's missing, run the
4+
# command unbounded (the flaky hang this guards against is Linux-only CI).
5+
if ! command -v timeout >/dev/null 2>&1; then
6+
timeout() { while [ "${1:-}" = "-s" ] || [ "${1:-}" = "-k" ]; do shift 2; done; shift; "$@"; }
7+
fi
8+
9+
310
# ocsp-stapling-with-wolfssl-responder.test
411
# Tests OCSP stapling using wolfSSL's own ocsp_responder example
512
# instead of the OpenSSL ocsp utility.
@@ -455,7 +462,7 @@ if [ "$stapling_v1" == "yes" ]; then
455462

456463
printf '%s\n\n' "------------- TEST CASE 1 SHOULD PASS -------------------------"
457464
# client test against our own server - GOOD CERT
458-
./examples/server/server -c certs/ocsp/server1-cert.pem \
465+
timeout -s KILL 2m ./examples/server/server -c certs/ocsp/server1-cert.pem \
459466
-k certs/ocsp/server1-key.pem -R $ready_file5 \
460467
-p $port5 &
461468
server_pid5=$!
@@ -468,7 +475,7 @@ if [ "$stapling_v1" == "yes" ]; then
468475
printf '%s\n\n' "------------- TEST CASE 2 SHOULD REVOKE -----------------------"
469476
# client test against our own server - REVOKED CERT
470477
remove_single_rF $ready_file5
471-
./examples/server/server -c certs/ocsp/server2-cert.pem \
478+
timeout -s KILL 2m ./examples/server/server -c certs/ocsp/server2-cert.pem \
472479
-k certs/ocsp/server2-key.pem -R $ready_file5 \
473480
-p $port5 &
474481
server_pid5=$!
@@ -486,7 +493,7 @@ if [ "$stapling_v1" == "yes" ]; then
486493
printf '%s\n\n' "------------- TEST CASE 3 TLS13 SHOULD PASS -----------------"
487494
# client test against our own server - GOOD CERT
488495
remove_single_rF $ready_file5
489-
./examples/server/server -c certs/ocsp/server1-cert.pem \
496+
timeout -s KILL 2m ./examples/server/server -c certs/ocsp/server1-cert.pem \
490497
-k certs/ocsp/server1-key.pem -v 4 \
491498
-R $ready_file5 -p $port5 &
492499
server_pid5=$!
@@ -500,7 +507,7 @@ if [ "$stapling_v1" == "yes" ]; then
500507
printf '%s\n\n' "------------- TEST CASE 4 TLS13 MUST-STAPLE SHOULD PASS -----"
501508
# client test against our own server, must staple - GOOD CERT
502509
remove_single_rF $ready_file5
503-
./examples/server/server -c certs/ocsp/server1-cert.pem \
510+
timeout -s KILL 2m ./examples/server/server -c certs/ocsp/server1-cert.pem \
504511
-k certs/ocsp/server1-key.pem -v 4 \
505512
-R $ready_file5 -p $port5 &
506513
server_pid5=$!
@@ -514,7 +521,7 @@ if [ "$stapling_v1" == "yes" ]; then
514521
printf '%s\n\n' "------------- TEST CASE 5 TLS13 SHOULD REVOKE ---------------"
515522
# client test against our own server - REVOKED CERT
516523
remove_single_rF $ready_file5
517-
./examples/server/server -c certs/ocsp/server2-cert.pem \
524+
timeout -s KILL 2m ./examples/server/server -c certs/ocsp/server2-cert.pem \
518525
-k certs/ocsp/server2-key.pem -v 4 \
519526
-R $ready_file5 -p $port5 &
520527
server_pid5=$!
@@ -533,7 +540,7 @@ if [ "$stapling_v1" == "yes" ]; then
533540
if [[ "$dtls12" == "yes" ]]; then
534541
printf '%s\n\n' "------------- TEST CASE DTLS12-1 SHOULD PASS ----------------"
535542
remove_single_rF $ready_file5
536-
./examples/server/server -c certs/ocsp/server1-cert.pem -R $ready_file5 \
543+
timeout -s KILL 2m ./examples/server/server -c certs/ocsp/server1-cert.pem -R $ready_file5 \
537544
-k certs/ocsp/server1-key.pem -u -v 3 \
538545
-p $port5 &
539546
server_pid5=$!
@@ -549,7 +556,7 @@ if [ "$stapling_v1" == "yes" ]; then
549556
if [ "$dtls13" == "yes" ]; then
550557
printf '%s\n\n' "------------- TEST CASE DTLS13-1 SHOULD PASS ----------------"
551558
remove_single_rF $ready_file5
552-
./examples/server/server -c certs/ocsp/server1-cert.pem -R $ready_file5 \
559+
timeout -s KILL 2m ./examples/server/server -c certs/ocsp/server1-cert.pem -R $ready_file5 \
553560
-k certs/ocsp/server1-key.pem -u -v 4 \
554561
-p $port5 &
555562
server_pid5=$!
@@ -575,7 +582,7 @@ if [ "$stapling_v2" == "yes" ]; then
575582
printf '%s\n\n' "------------- TEST CASE V2-1 SHOULD PASS ----------------------"
576583
# client test against our own server - GOOD CERTS
577584
remove_single_rF $ready_file5
578-
./examples/server/server -c certs/ocsp/server3-cert.pem \
585+
timeout -s KILL 2m ./examples/server/server -c certs/ocsp/server3-cert.pem \
579586
-k certs/ocsp/server3-key.pem -R $ready_file5 \
580587
-p $port5 &
581588
server_pid5=$!
@@ -588,7 +595,7 @@ if [ "$stapling_v2" == "yes" ]; then
588595

589596
printf '%s\n\n' "------------- TEST CASE V2-2 SHOULD PASS ----------------------"
590597
remove_single_rF $ready_file5
591-
./examples/server/server -c certs/ocsp/server3-cert.pem \
598+
timeout -s KILL 2m ./examples/server/server -c certs/ocsp/server3-cert.pem \
592599
-k certs/ocsp/server3-key.pem -R $ready_file5 \
593600
-p $port5 &
594601
server_pid5=$!
@@ -602,7 +609,7 @@ if [ "$stapling_v2" == "yes" ]; then
602609
printf '%s\n\n' "------------- TEST CASE V2-3 SHOULD REVOKE --------------------"
603610
# client test against our own server - REVOKED SERVER CERT
604611
remove_single_rF $ready_file5
605-
./examples/server/server -c certs/ocsp/server4-cert.pem \
612+
timeout -s KILL 2m ./examples/server/server -c certs/ocsp/server4-cert.pem \
606613
-k certs/ocsp/server4-key.pem -R $ready_file5 \
607614
-p $port5 &
608615
server_pid5=$!
@@ -616,7 +623,7 @@ if [ "$stapling_v2" == "yes" ]; then
616623

617624
printf '%s\n\n' "------------- TEST CASE V2-4 SHOULD REVOKE --------------------"
618625
remove_single_rF $ready_file5
619-
./examples/server/server -c certs/ocsp/server4-cert.pem \
626+
timeout -s KILL 2m ./examples/server/server -c certs/ocsp/server4-cert.pem \
620627
-k certs/ocsp/server4-key.pem -R $ready_file5 \
621628
-p $port5 &
622629
sleep 0.1
@@ -630,7 +637,7 @@ if [ "$stapling_v2" == "yes" ]; then
630637
printf '%s\n\n' "------------- TEST CASE V2-5 SHOULD PASS ----------------------"
631638
# client test against our own server - REVOKED INTERMEDIATE CERT
632639
remove_single_rF $ready_file5
633-
./examples/server/server -c certs/ocsp/server5-cert.pem \
640+
timeout -s KILL 2m ./examples/server/server -c certs/ocsp/server5-cert.pem \
634641
-k certs/ocsp/server5-key.pem -R $ready_file5 \
635642
-p $port5 &
636643
server_pid5=$!
@@ -643,7 +650,7 @@ if [ "$stapling_v2" == "yes" ]; then
643650

644651
printf '%s\n\n' "------------- TEST CASE V2-6 SHOULD REVOKE --------------------"
645652
remove_single_rF $ready_file5
646-
./examples/server/server -c certs/ocsp/server5-cert.pem \
653+
timeout -s KILL 2m ./examples/server/server -c certs/ocsp/server5-cert.pem \
647654
-k certs/ocsp/server5-key.pem -R $ready_file5 \
648655
-p $port5 &
649656
server_pid5=$!
@@ -659,7 +666,7 @@ if [ "$stapling_v2" == "yes" ]; then
659666
if [[ "$dtls12" == "yes" ]]; then
660667
printf '%s\n\n' "------------- TEST CASE DTLS12-V2 SHOULD PASS ----------------"
661668
remove_single_rF $ready_file5
662-
./examples/server/server -c certs/ocsp/server3-cert.pem \
669+
timeout -s KILL 2m ./examples/server/server -c certs/ocsp/server3-cert.pem \
663670
-k certs/ocsp/server3-key.pem -R $ready_file5 \
664671
-p $port5 -u -v 3 &
665672
server_pid5=$!
@@ -685,7 +692,7 @@ if [ "$tls13" == "yes" ] && [ "$stapling_v1" == "yes" ]; then
685692
printf '%s\n\n' "------------- TEST CASE T13-1 SHOULD PASS --------------------"
686693
# client test against our own server - GOOD CERTS
687694
remove_single_rF $ready_file5
688-
./examples/server/server -c certs/ocsp/server3-cert.pem \
695+
timeout -s KILL 2m ./examples/server/server -c certs/ocsp/server3-cert.pem \
689696
-k certs/ocsp/server3-key.pem -R $ready_file5 \
690697
-p $port5 -v 4 &
691698
server_pid5=$!
@@ -699,7 +706,7 @@ if [ "$tls13" == "yes" ] && [ "$stapling_v1" == "yes" ]; then
699706
printf '%s\n\n' "------------- TEST CASE T13-2 SHOULD REVOKE ------------------"
700707
# client test against our own server - REVOKED SERVER CERT
701708
remove_single_rF $ready_file5
702-
./examples/server/server -c certs/ocsp/server4-cert.pem \
709+
timeout -s KILL 2m ./examples/server/server -c certs/ocsp/server4-cert.pem \
703710
-k certs/ocsp/server4-key.pem -R $ready_file5 \
704711
-p $port5 -v 4 &
705712
server_pid5=$!
@@ -714,7 +721,7 @@ if [ "$tls13" == "yes" ] && [ "$stapling_v1" == "yes" ]; then
714721
printf '%s\n\n' "------------- TEST CASE T13-3 SHOULD REVOKE ------------------"
715722
# client test against our own server - REVOKED INTERMEDIATE CERT
716723
remove_single_rF $ready_file5
717-
./examples/server/server -c certs/ocsp/server5-cert.pem \
724+
timeout -s KILL 2m ./examples/server/server -c certs/ocsp/server5-cert.pem \
718725
-k certs/ocsp/server5-key.pem -R $ready_file5 \
719726
-p $port5 -v 4 &
720727
server_pid5=$!
@@ -730,7 +737,7 @@ if [ "$tls13" == "yes" ] && [ "$stapling_v1" == "yes" ]; then
730737
if [ "$dtls13" == "yes" ]; then
731738
printf '%s\n\n' "------------- TEST CASE DTLS13-V2 SHOULD PASS ----------------"
732739
remove_single_rF $ready_file5
733-
./examples/server/server -c certs/ocsp/server3-cert.pem \
740+
timeout -s KILL 2m ./examples/server/server -c certs/ocsp/server3-cert.pem \
734741
-k certs/ocsp/server3-key.pem -R $ready_file5 \
735742
-p $port5 -u -v 4 &
736743
server_pid5=$!
@@ -743,7 +750,7 @@ if [ "$tls13" == "yes" ] && [ "$stapling_v1" == "yes" ]; then
743750

744751
printf '%s\n\n' "------------- TEST CASE DTLS13-V2-REVOKE SHOULD REVOKE -------"
745752
remove_single_rF $ready_file5
746-
./examples/server/server -c certs/ocsp/server4-cert.pem \
753+
timeout -s KILL 2m ./examples/server/server -c certs/ocsp/server4-cert.pem \
747754
-k certs/ocsp/server4-key.pem -R $ready_file5 \
748755
-p $port5 -v 4 &
749756
server_pid5=$!

‎scripts/ocsp-stapling.test‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
#!/usr/bin/env bash
22

3+
# timeout(1) is GNU coreutils and absent on macOS; where it's missing, run the
4+
# command unbounded (the flaky hang this guards against is Linux-only CI).
5+
if ! command -v timeout >/dev/null 2>&1; then
6+
timeout() { while [ "${1:-}" = "-s" ] || [ "${1:-}" = "-k" ]; do shift 2; done; shift; "$@"; }
7+
fi
8+
9+
310
# ocsp-stapling.test
411
# Test requires HAVE_OCSP and HAVE_CERTIFICATE_STATUS_REQUEST
512

@@ -290,7 +297,7 @@ port3=$(get_first_free_port $((port2 + 1)))
290297
# test interop fail case
291298
ready_file=$PWD/wolf_ocsp_readyF$$
292299
printf '%s\n' "ready file: \"$ready_file\""
293-
./examples/server/server -b -p "$port1" -o -R "$ready_file" &
300+
timeout -s KILL 2m ./examples/server/server -b -p "$port1" -o -R "$ready_file" &
294301
wolf_pid=$!
295302
wait_for_readyFile "$ready_file" "$wolf_pid" "$port1"
296303
if [ ! -f "$ready_file" ]; then

‎scripts/ocsp-stapling2.test‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
#!/usr/bin/env bash
22

3+
# timeout(1) is GNU coreutils and absent on macOS; where it's missing, run the
4+
# command unbounded (the flaky hang this guards against is Linux-only CI).
5+
if ! command -v timeout >/dev/null 2>&1; then
6+
timeout() { while [ "${1:-}" = "-s" ] || [ "${1:-}" = "-k" ]; do shift 2; done; shift; "$@"; }
7+
fi
8+
9+
310
# ocsp-stapling2.test
411
# Test requires HAVE_OCSP and HAVE_CERTIFICATE_STATUS_REQUEST_V2
512

@@ -447,7 +454,7 @@ RESULT=$?
447454
printf '%s\n\n' "Test successfully REVOKED!"
448455
printf '%s\n\n' "------------- TEST CASE 7 LOAD CERT IN SSL -------------------"
449456
remove_single_rF "$ready_file5"
450-
./examples/server/server -c certs/ocsp/server1-cert.pem \
457+
timeout -s KILL 2m ./examples/server/server -c certs/ocsp/server1-cert.pem \
451458
-k certs/ocsp/server1-key.pem -R "$ready_file5" \
452459
-p "$port5" -H loadSSL &
453460
server_pid5=$!
@@ -462,7 +469,7 @@ fi
462469
printf '%s\n\n' "Test successful"
463470
printf '%s\n\n' "------------- TEST CASE 8 SHOULD REVOKE ----------------------"
464471
remove_single_rF "$ready_file5"
465-
./examples/server/server -c certs/ocsp/server4-cert.pem \
472+
timeout -s KILL 2m ./examples/server/server -c certs/ocsp/server4-cert.pem \
466473
-k certs/ocsp/server4-key.pem -R "$ready_file5" \
467474
-p "$port5" -H loadSSL &
468475
server_pid5=$!

‎scripts/ocsp-stapling_tls13multi.test‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
#!/bin/bash
22

3+
# timeout(1) is GNU coreutils and absent on macOS; where it's missing, run the
4+
# command unbounded (the flaky hang this guards against is Linux-only CI).
5+
if ! command -v timeout >/dev/null 2>&1; then
6+
timeout() { while [ "${1:-}" = "-s" ] || [ "${1:-}" = "-k" ]; do shift 2; done; shift; "$@"; }
7+
fi
8+
9+
310
# ocsp-stapling_tls13multi.test
411
# Test requires HAVE_OCSP and HAVE_CERTIFICATE_STATUS_REQUEST_V2
512

@@ -455,7 +462,7 @@ if [ "$tls13" == "yes" ]; then
455462

456463
printf '%s\n\n' "------------- TEST CASE 6 LOAD CERT IN SSL -------------------"
457464
remove_single_rF "$ready_file5"
458-
./examples/server/server -c certs/ocsp/server1-cert.pem \
465+
timeout -s KILL 2m ./examples/server/server -c certs/ocsp/server1-cert.pem \
459466
-k certs/ocsp/server1-key.pem -R "$ready_file5" -v 4 \
460467
-p "$port5" -H loadSSL &
461468
server_pid5=$!
@@ -470,7 +477,7 @@ if [ "$tls13" == "yes" ]; then
470477
printf '%s\n\n' "Test successful"
471478
printf '%s\n\n' "------------- TEST CASE 7 SHOULD REVOKE ----------------------"
472479
remove_single_rF "$ready_file5"
473-
./examples/server/server -c certs/ocsp/server4-cert.pem \
480+
timeout -s KILL 2m ./examples/server/server -c certs/ocsp/server4-cert.pem \
474481
-k certs/ocsp/server4-key.pem -R "$ready_file5" \
475482
-p "$port5" -H loadSSL -v 4 &
476483
server_pid5=$!

‎scripts/pkcallbacks.test‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
#!/usr/bin/env bash
22

3+
# timeout(1) is GNU coreutils and absent on macOS; where it's missing, run the
4+
# command unbounded (the flaky hang this guards against is Linux-only CI).
5+
if ! command -v timeout >/dev/null 2>&1; then
6+
timeout() { while [ "${1:-}" = "-s" ] || [ "${1:-}" = "-k" ]; do shift 2; done; shift; "$@"; }
7+
fi
8+
9+
310
#pkcallbacks.test
411

512
[ ! -x ./examples/client/client ] && printf '\n\n%s\n' "Client doesn't exist" \
@@ -101,7 +108,7 @@ run_test() {
101108
# starts the server on pk_port, -R generates ready file to be used as a
102109
# mutex lock, -P does pkcallbacks. We capture the processid
103110
# into the variable server_pid
104-
./examples/server/server -P -R "$ready_file" -p $pk_port &
111+
timeout -s KILL 2m ./examples/server/server -P -R "$ready_file" -p $pk_port &
105112
server_pid=$!
106113

107114
while [ ! -s "$ready_file" -a "$counter" -lt 20 ]; do

‎scripts/resume.test‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
#!/usr/bin/env bash
22

3+
# timeout(1) is GNU coreutils and absent on macOS; where it's missing, run the
4+
# command unbounded (the flaky hang this guards against is Linux-only CI).
5+
if ! command -v timeout >/dev/null 2>&1; then
6+
timeout() { while [ "${1:-}" = "-s" ] || [ "${1:-}" = "-k" ]; do shift 2; done; shift; "$@"; }
7+
fi
8+
9+
310
#resume.test
411

512
# if we can, isolate the network namespace to eliminate port collisions.
@@ -77,7 +84,7 @@ do_test() {
7784

7885
remove_ready_file
7986
echo "./examples/server/server -r -R \"$ready_file\" -p $resume_port"
80-
./examples/server/server -r -R "$ready_file" -p $resume_port &
87+
timeout -s KILL 2m ./examples/server/server -r -R "$ready_file" -p $resume_port &
8188
server_pid=$!
8289

8390
while [ ! -s "$ready_file" -a "$counter" -lt 20 ]; do

‎scripts/tls13.test‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
#!/usr/bin/env bash
22

3+
# timeout(1) is GNU coreutils and absent on macOS; where it's missing, run the
4+
# command unbounded (the flaky hang this guards against is Linux-only CI).
5+
if ! command -v timeout >/dev/null 2>&1; then
6+
timeout() { while [ "${1:-}" = "-s" ] || [ "${1:-}" = "-k" ]; do shift 2; done; shift; "$@"; }
7+
fi
8+
9+
310
# tls13.test
411
# Copyright wolfSSL 2016-2021
512

@@ -260,7 +267,7 @@ if [ "$early_data" = "yes" ]; then
260267

261268
echo -e "\n\nTLS v1.3 Early Data - session ticket"
262269
port=0
263-
(./examples/server/server -v 4 -r -0 -R "$ready_file" -p $port 2>&1 | \
270+
(timeout -s KILL 2m ./examples/server/server -v 4 -r -0 -R "$ready_file" -p $port 2>&1 | \
264271
tee "$server_out_file") &
265272
server_pid=$!
266273
create_port
@@ -308,7 +315,7 @@ if [ "$early_data" = "yes" -a "$psk" = "yes" ]; then
308315
early_data_try_num=1
309316
while :; do
310317

311-
(./examples/server/server -v 4 -s -0 -R "$ready_file" -p $port 2>&1 | \
318+
(timeout -s KILL 2m ./examples/server/server -v 4 -s -0 -R "$ready_file" -p $port 2>&1 | \
312319
tee "$server_out_file") &
313320
server_pid=$!
314321
create_port

0 commit comments

Comments
 (0)