[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  50db968aad353756f71b844d6edc1cf58231e78c (commit)
      from  a760a3805b49736632f14297a1c489290d4c1a6b (commit)


- Log -----------------------------------------------------------------
commit 50db968aad353756f71b844d6edc1cf58231e78c
Author: Matt Caswell <matt at openssl.org>
Date:   Sat Sep 19 20:07:33 2015 +0100

    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 at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 util/TLSProxy/Proxy.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/util/TLSProxy/Proxy.pm b/util/TLSProxy/Proxy.pm
index 75094f1..6c1ea77 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 "") {