[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  825038d8c36075488922617e48fc4782afe871d1 (commit)
      from  c44bab084ed139b5e5c3f6b318bf1bf65e04cfa5 (commit)


- Log -----------------------------------------------------------------
commit 825038d8c36075488922617e48fc4782afe871d1
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)

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

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 a87675c..c29f440 100644
--- a/util/perl/TLSProxy/Proxy.pm
+++ b/util/perl/TLSProxy/Proxy.pm
@@ -157,11 +157,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)
@@ -191,11 +186,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 ]
@@ -217,11 +207,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";