Fix ${readsocket } eol-replacement. Bug 2630

[exim.git] / test / scripts / 4058-pipe-conn-tfo / 4058

diff --git a/test/scripts/4058-pipe-conn-tfo/4058 b/test/scripts/4058-pipe-conn-tfo/4058
index 3a388a2d924f84e39f30b8e235dcdb47cd543478..5f0257810c288a99d3e9b6da4970a3aa351c07c6 100644 (file)
--- a/test/scripts/4058-pipe-conn-tfo/4058
+++ b/test/scripts/4058-pipe-conn-tfo/4058
@@ -2,13 +2,12 @@
 #
 #
 # Packet delays so we can see TFO operational in packet captures
 #
 #
 # Packet delays so we can see TFO operational in packet captures

-sudo perl
-system ("tc qdisc add dev lo root netem delay 50ms");
-****
-#

 # Wipe any stored TFO cookie, to start from known state.
 # Wipe any stored TFO cookie, to start from known state.

+# Disable TFO blackhole-detection as we seem to be running afoul of that

 sudo perl
 sudo perl

+system ("tc qdisc add dev lo root netem delay 50ms");

 system ("ip tcp_metrics delete 127.0.0.1");
 system ("ip tcp_metrics delete 127.0.0.1");

+system ("[ -e /proc/sys/net/ipv4/tcp_fastopen_blackhole_timeout_sec ] && echo 0 > /proc/sys/net/ipv4/tcp_fastopen_blackhole_timeout_sec");

 ****
 #
 #
 ****
 #
 #


@@ -73,6 +72,7 @@ killdaemon
 #
 sudo perl
 system ("tc qdisc delete dev lo root");
 #
 sudo perl
 system ("tc qdisc delete dev lo root");

+system ("[ -e /proc/sys/net/ipv4/tcp_fastopen_blackhole_timeout_sec ] && echo 3600 > /proc/sys/net/ipv4/tcp_fastopen_blackhole_timeout_sec");

 ****
 #
 no_msglog_check
 ****
 #
 no_msglog_check