summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2015-09-19 20:07:33 +0100
committerMatt Caswell <matt@openssl.org>2015-09-19 20:07:33 +0100
commit50db968aad353756f71b844d6edc1cf58231e78c (patch)
tree8bada4ff91adc4df1cbe1acc9f41d2935ac17d58
parenta760a3805b49736632f14297a1c489290d4c1a6b (diff)
Fix some test failures when Configured with zlib
TLSProxy was failing if we are Configured with compression because it doesn't support it. This fix simply switches compression off for the purposes of the test. Reviewed-by: Richard Levitte <levitte@openssl.org>
-rw-r--r--util/TLSProxy/Proxy.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/util/TLSProxy/Proxy.pm b/util/TLSProxy/Proxy.pm
index 75094f1a44..6c1ea7780a 100644
--- a/util/TLSProxy/Proxy.pm
+++ b/util/TLSProxy/Proxy.pm
@@ -144,7 +144,8 @@ sub start
open(STDOUT, ">", File::Spec->devnull())
or die "Failed to redirect stdout";
open(STDERR, ">&STDOUT");
- my $execcmd = $self->execute." s_server -rev -engine ossltest -accept "
+ my $execcmd = $self->execute
+ ." s_server -no_comp -rev -engine ossltest -accept "
.($self->server_port)
." -cert ".$self->cert." -naccept ".$self->serverconnects;
if ($self->ciphers ne "") {