From: Bernd Edlinger <bernd.edlinger@hotmail.de>
Date: Thu, 9 Jan 2025 20:24:44 +0000 (+0100)
Subject: Revert "Do not confuse TAP::Parser by mixing up stderr with stdout."
X-Git-Tag: openssl-3.5.0-alpha1~738
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=824d23772b2c38bdeab60ccb087517e62e5192e5;p=thirdparty%2Fopenssl.git

Revert "Do not confuse TAP::Parser by mixing up stderr with stdout."

This reverts commit 3d3bb26a13dcc67f99e66de6a44ae9ced117f64b.

Reviewed-by: Frederik Wedel-Heinen <fwh.openssl@gmail.com>
Reviewed-by: Saša Nedvědický <sashan@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/26374)
---

diff --git a/util/perl/TLSProxy/Proxy.pm b/util/perl/TLSProxy/Proxy.pm
index 8436861668a..48c55f48220 100644
--- a/util/perl/TLSProxy/Proxy.pm
+++ b/util/perl/TLSProxy/Proxy.pm
@@ -290,14 +290,8 @@ sub start
     if ($self->debug) {
         print STDERR "Server command: $execcmd\n";
     }
-    my $sin = undef;
-    my $sout = undef;
-    if ("$^O" eq "MSWin32") {
-        $pid = IPC::Open2::open2($sout, $sin, $execcmd) or die "Failed to $execcmd: $!\n";
-    } else {
-        $pid = IPC::Open3::open3($sin, $sout, undef, $execcmd) or die "Failed to $execcmd: $!\n";
-    }
 
+    $pid = IPC::Open2::open2(my $sout, my $sin, $execcmd) or die "Failed to $execcmd: $!\n";
     $self->{serverpid} = $pid;
 
     # Process the output from s_server until we find the ACCEPT line, which