From: Bernd Edlinger <bernd.edlinger@hotmail.de>
Date: Thu, 9 Jan 2025 20:25:55 +0000 (+0100)
Subject: Revert "chomp does not work on windows."
X-Git-Tag: openssl-3.3.3~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb3399bfa8f5f9a5aec49ce793ceff93250f23c5;p=thirdparty%2Fopenssl.git

Revert "chomp does not work on windows."

This reverts commit 3e94e2b11d73ed22c601f818b31b7c4ca281f5d1.

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)

(cherry picked from commit 716a64fcc4b0981fd788deb43ca6548cc634ea56)
---

diff --git a/util/perl/TLSProxy/Proxy.pm b/util/perl/TLSProxy/Proxy.pm
index 429dc8154fa..6ec0128e4bc 100644
--- a/util/perl/TLSProxy/Proxy.pm
+++ b/util/perl/TLSProxy/Proxy.pm
@@ -297,8 +297,7 @@ sub start
     # Process the output from s_server until we find the ACCEPT line, which
     # tells us what the accepting address and port are.
     while (<$sout>) {
-        print;
-        s/\R$//; # chomp does not work on windows.
+        chomp;
         next unless (/^ACCEPT\s.*:(\d+)$/);
         $self->{server_port} = $1;
         last;