]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
chomp does not work on windows.
authorFrederik Wedel-Heinen <frederik.wedel-heinen@dencrypt.dk>
Fri, 26 Jan 2024 10:27:02 +0000 (11:27 +0100)
committerMatt Caswell <matt@openssl.org>
Fri, 9 Feb 2024 08:16:56 +0000 (08:16 +0000)
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23319)

util/perl/TLSProxy/Proxy.pm

index 08c82c0c52d06ead568f4a5a430a0576875309d9..3ecbd1893e03abdfb3d49d3d92372532b1fc22ac 100644 (file)
@@ -296,7 +296,8 @@ 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>) {
-        chomp;
+        print;
+        s/\R$//; # chomp does not work on windows.
         next unless (/^ACCEPT\s.*:(\d+)$/);
         $self->{server_port} = $1;
         last;