Fix #432: deal with inability to find port correctly

teodesian · Oct 22, 2019 · 8b83cf1 · 8b83cf1
1 parent d4065ff
commit 8b83cf1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 14 deletions.
diff --git a/Changes b/Changes
@@ -1,5 +1,9 @@
 Revision history for Selenium-Remote-Driver
 
+1.35  10-21-2019 TEODESIAN
+        [BUG FIXES]
+        - Fix race condition and inability to find a port in certain circumstances when using direct driver modules.
+
 1.34   09-11-2019 TEODESIAN
         [BUG FIXES]
         - Remove .so files from Firefox lib tree to simplify CPAN RPM build tool chains

diff --git a/dist.ini b/dist.ini
@@ -1,5 +1,5 @@
 name = Selenium-Remote-Driver
-version = 1.34
+version = 1.35
 author = George S. Baugh <george@troglodyne.net>
 author = Aditya Ivaturi <ivaturi@gmail.com>
 author = Daniel Gempesaw <gempesaw@gmail.com>

diff --git a/lib/Selenium/CanStartBinary/ProbePort.pm b/lib/Selenium/CanStartBinary/ProbePort.pm
@@ -17,19 +17,11 @@ our @EXPORT_OK = qw/find_open_port_above find_open_port probe_port/;
 =cut
 
 sub find_open_port_above {
-    my ($port) = @_;
-
-    my $free_port = wait_until {
-        if ( probe_port($port) ) {
-            $port++;
-            return 0;
-        }
-        else {
-            return $port;
-        }
-    };
-
-    return $free_port;
+    socket(SOCK, PF_INET, SOCK_STREAM, getprotobyname("tcp"));
+    bind(SOCK, sockaddr_in(0, INADDR_ANY));
+    my $port = (sockaddr_in(getsockname(SOCK)))[0];
+    close(SOCK);
+    return $port;
 }
 
 sub find_open_port {