[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

Richard Levitte levitte at openssl.org
Wed Jan 17 21:41:14 UTC 2018


The branch OpenSSL_1_1_0-stable has been updated
       via  634c1a6b752830d6631a9a8e7884b2f600aca696 (commit)
      from  fa9dc509cccbe30b48ad7f4f2e23610a182a23c3 (commit)


- Log -----------------------------------------------------------------
commit 634c1a6b752830d6631a9a8e7884b2f600aca696
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Jan 17 21:27:33 2018 +0100

    TLSProxy::Proxy: don't waste time redirecting STDOUT and STDERR
    
    On Windows, it seems that doing so in a forked (pseudo-)process
    sometimes affects the parent, and thereby hides all the results that
    are supposed to be seen by the running test framework (the "ok" and
    "not ok" lines).
    
    It turns out that our redirection isn't necessary, as the test
    framework seems to swallow it all in non-verbose mode anyway.
    It's possible that we did need this at some point, but the framework
    has undergone some refinement since then...
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5100)
    
    (cherry picked from commit 825038d8c36075488922617e48fc4782afe871d1)

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

Summary of changes:
 util/perl/TLSProxy/Proxy.pm | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/util/perl/TLSProxy/Proxy.pm b/util/perl/TLSProxy/Proxy.pm
index 8dbc5d0..e30b0aa 100644
--- a/util/perl/TLSProxy/Proxy.pm
+++ b/util/perl/TLSProxy/Proxy.pm
@@ -147,11 +147,6 @@ sub start
 
     $pid = fork();
     if ($pid == 0) {
-        if (!$self->debug) {
-            open(STDOUT, ">", File::Spec->devnull())
-                or die "Failed to redirect stdout: $!";
-            open(STDERR, ">&STDOUT");
-        }
         my $execcmd = $self->execute
             ." s_server -no_comp -rev -engine ossltest -accept "
             .($self->server_port)
@@ -180,11 +175,6 @@ sub clientstart
     my ($self) = shift;
     my $oldstdout;
 
-    if(!$self->debug) {
-        open DEVNULL, ">", File::Spec->devnull();
-        $oldstdout = select(DEVNULL);
-    }
-
     # Create the Proxy socket
     my $proxaddr = $self->proxy_addr;
     $proxaddr =~ s/[\[\]]//g; # Remove [ and ]
@@ -206,11 +196,6 @@ sub clientstart
     if ($self->execute) {
         my $pid = fork();
         if ($pid == 0) {
-            if (!$self->debug) {
-                open(STDOUT, ">", File::Spec->devnull())
-                    or die "Failed to redirect stdout: $!";
-                open(STDERR, ">&STDOUT");
-            }
             my $echostr;
             if ($self->reneg()) {
                 $echostr = "R";


More information about the openssl-commits mailing list