[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  e02d5886636095c26a8bff1bf8344bd0bba7ccff (commit)
      from  9db6673e23ab47bb7ee1304c078125bff66141b7 (commit)


- Log -----------------------------------------------------------------
commit e02d5886636095c26a8bff1bf8344bd0bba7ccff
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Jan 18 10:54:48 2018 +0100

    TLSProxy::Proxy: Don't use ReuseAddr on Windows
    
    On Windows, we sometimes see a behavior with SO_REUSEADDR where there
    remains lingering listening sockets on the same address and port as a
    newly created one.
    
    An easy solution is not to use ReuseAddr on Windows.
    
    Thanks Bernd Edlinger for the suggestion.
    
    Reviewed-by: Bernd Edlinger <bernd.edlinger at hotmail.de>
    (Merged from https://github.com/openssl/openssl/pull/5103)

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

Summary of changes:
 util/perl/TLSProxy/Proxy.pm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/util/perl/TLSProxy/Proxy.pm b/util/perl/TLSProxy/Proxy.pm
index c29f440..8c7b6d6 100644
--- a/util/perl/TLSProxy/Proxy.pm
+++ b/util/perl/TLSProxy/Proxy.pm
@@ -189,13 +189,15 @@ sub clientstart
     # Create the Proxy socket
     my $proxaddr = $self->proxy_addr;
     $proxaddr =~ s/[\[\]]//g; # Remove [ and ]
-    my $proxy_sock = $IP_factory->(
+    my @proxyargs = (
         LocalHost   => $proxaddr,
         LocalPort   => $self->proxy_port,
         Proto       => "tcp",
         Listen      => SOMAXCONN,
-        ReuseAddr   => 1
-    );
+       );
+    push @proxyargs, ReuseAddr => 1
+        unless $^O eq "MSWin32";
+    my $proxy_sock = $IP_factory->(@proxyargs);
 
     if ($proxy_sock) {
         print "Proxy started on port ".$self->proxy_port."\n";