Merge branch 'trunk' into trunk

AdamPDotty · web-flow · commit 8ef09d8f94de · 2024-10-31T13:52:53.000+01:00
diff --git a/common/mirror/selenium b/common/mirror/selenium
@@ -1,15 +1,35 @@
 [
+  {
+    "tag_name": "selenium-4.26.0",
+    "assets": [
+      {
+        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.26.0/selenium-dotnet-4.26.0.zip"
+      },
+      {
+        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.26.0/selenium-dotnet-strongnamed-4.26.0.zip"
+      },
+      {
+        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.26.0/selenium-java-4.26.0.zip"
+      },
+      {
+        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.26.0/selenium-server-4.26.0.jar"
+      },
+      {
+        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.26.0/selenium-server-4.26.0.zip"
+      }
+    ]
+  },
   {
     "tag_name": "nightly",
     "assets": [
       {
-        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-java-4.26.0-SNAPSHOT.zip"
+        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-java-4.27.0-SNAPSHOT.zip"
       },
       {
-        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-server-4.26.0-SNAPSHOT.jar"
+        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-server-4.27.0-SNAPSHOT.jar"
       },
       {
-        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-server-4.26.0-SNAPSHOT.zip"
+        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-server-4.27.0-SNAPSHOT.zip"
       }
     ]
   },
@@ -935,28 +955,5 @@
         "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.0.0-rc-2/selenium-server-4.0.0-rc-2.zip"
       }
     ]
-  },
-  {
-    "tag_name": "selenium-4.0.0-rc-1",
-    "assets": [
-      {
-        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.0.0-rc-1/selenium-dotnet-4.0.0-rc1.zip"
-      },
-      {
-        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.0.0-rc-1/selenium-dotnet-strongnamed-4.0.0-rc1.zip"
-      },
-      {
-        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.0.0-rc-1/selenium-html-runner-4.0.0-rc-1.jar"
-      },
-      {
-        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.0.0-rc-1/selenium-java-4.0.0-rc-1.zip"
-      },
-      {
-        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.0.0-rc-1/selenium-server-4.0.0-rc-1.jar"
-      },
-      {
-        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.0.0-rc-1/selenium-server-4.0.0-rc-1.zip"
-      }
-    ]
   }
 ]
diff --git a/dotnet/selenium-dotnet-version.bzl b/dotnet/selenium-dotnet-version.bzl
@@ -1,6 +1,6 @@
 # BUILD FILE SYNTAX: STARLARK
 
-SE_VERSION = "4.26.0"
+SE_VERSION = "4.27.0-nightly202410301443"
 ASSEMBLY_VERSION = "4.0.0.0"
 SUPPORTED_NET_STANDARD_VERSIONS = ["netstandard2.0"]
 
diff --git a/java/src/org/openqa/selenium/netty/server/SeleniumHandler.java b/java/src/org/openqa/selenium/netty/server/SeleniumHandler.java
@@ -19,8 +19,10 @@
 
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
 import org.openqa.selenium.internal.Require;
 import org.openqa.selenium.remote.ErrorFilter;
 import org.openqa.selenium.remote.http.HttpHandler;
@@ -31,18 +33,27 @@ class SeleniumHandler extends SimpleChannelInboundHandler<HttpRequest> {
 
   private static final ExecutorService EXECUTOR = Executors.newCachedThreadPool();
   private final HttpHandler seleniumHandler;
+  private Future<?> lastOne;
 
   public SeleniumHandler(HttpHandler seleniumHandler) {
     super(HttpRequest.class);
     this.seleniumHandler = Require.nonNull("HTTP handler", seleniumHandler).with(new ErrorFilter());
+    this.lastOne = CompletableFuture.completedFuture(null);
   }
 
   @Override
   protected void channelRead0(ChannelHandlerContext ctx, HttpRequest msg) {
-    EXECUTOR.submit(
-        () -> {
-          HttpResponse res = seleniumHandler.execute(msg);
-          ctx.writeAndFlush(res);
-        });
+    lastOne =
+        EXECUTOR.submit(
+            () -> {
+              HttpResponse res = seleniumHandler.execute(msg);
+              ctx.writeAndFlush(res);
+            });
+  }
+
+  @Override
+  public void channelInactive(ChannelHandlerContext ctx) throws Exception {
+    lastOne.cancel(true);
+    super.channelInactive(ctx);
   }
 }
diff --git a/java/test/org/openqa/selenium/netty/server/NettyServerTest.java b/java/test/org/openqa/selenium/netty/server/NettyServerTest.java
@@ -28,14 +28,20 @@
 
 import com.google.common.collect.ImmutableMap;
 import java.net.URL;
+import java.time.Duration;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
+import org.openqa.selenium.TimeoutException;
 import org.openqa.selenium.grid.config.CompoundConfig;
 import org.openqa.selenium.grid.config.Config;
 import org.openqa.selenium.grid.config.MapConfig;
 import org.openqa.selenium.grid.server.BaseServerOptions;
 import org.openqa.selenium.grid.server.Server;
 import org.openqa.selenium.net.PortProber;
+import org.openqa.selenium.remote.http.ClientConfig;
 import org.openqa.selenium.remote.http.HttpClient;
 import org.openqa.selenium.remote.http.HttpRequest;
 import org.openqa.selenium.remote.http.HttpResponse;
@@ -141,6 +147,43 @@ void shouldNotBindToHost() {
     assertEquals("anyRandomHost", server.getUrl().getHost());
   }
 
+  @Test
+  void doesInterruptPending() throws Exception {
+    CountDownLatch interrupted = new CountDownLatch(1);
+    Config cfg = new MapConfig(ImmutableMap.of());
+    BaseServerOptions options = new BaseServerOptions(cfg);
+
+    Server<?> server =
+        new NettyServer(
+                options,
+                req -> {
+                  try {
+                    Thread.sleep(800);
+                  } catch (InterruptedException ex) {
+                    interrupted.countDown();
+                  }
+                  return new HttpResponse();
+                })
+            .start();
+    ClientConfig config =
+        ClientConfig.defaultConfig()
+            .readTimeout(Duration.ofMillis(400))
+            .baseUri(server.getUrl().toURI());
+
+    // provoke a client timeout
+    Assertions.assertThrows(
+        TimeoutException.class,
+        () -> {
+          try (HttpClient client = HttpClient.Factory.createDefault().createClient(config)) {
+            HttpRequest request = new HttpRequest(DELETE, "/session");
+            request.setHeader("Accept", "*/*");
+            client.execute(request);
+          }
+        });
+
+    assertTrue(interrupted.await(1000, TimeUnit.MILLISECONDS), "The handling was interrupted");
+  }
+
   private void outputHeaders(HttpResponse res) {
     res.forEachHeader((name, value) -> System.out.printf("%s -> %s\n", name, value));
   }
diff --git a/java/version.bzl b/java/version.bzl
@@ -1,2 +1,2 @@
-SE_VERSION = "4.26.0"
+SE_VERSION = "4.27.0-SNAPSHOT"
 TOOLS_JAVA_VERSION = "17"
diff --git a/javascript/node/selenium-webdriver/BUILD.bazel b/javascript/node/selenium-webdriver/BUILD.bazel
@@ -11,7 +11,7 @@ load("//javascript/private:browsers.bzl", "BROWSERS")
 
 npm_link_all_packages(name = "node_modules")
 
-VERSION = "4.26.0"
+VERSION = "4.27.0-nightly202410301443"
 
 BROWSER_VERSIONS = [
     "v85",
diff --git a/javascript/node/selenium-webdriver/package.json b/javascript/node/selenium-webdriver/package.json
@@ -1,6 +1,6 @@
 {
   "name": "selenium-webdriver",
-  "version": "4.26.0",
+  "version": "4.27.0-nightly202410301443",
   "description": "The official WebDriver JavaScript bindings from the Selenium project",
   "license": "Apache-2.0",
   "keywords": [
diff --git a/py/BUILD.bazel b/py/BUILD.bazel
@@ -62,7 +62,7 @@ compile_pip_requirements(
     ],
 )
 
-SE_VERSION = "4.26.0"
+SE_VERSION = "4.27.0.dev202410301443"
 
 BROWSER_VERSIONS = [
     "v85",
diff --git a/py/docs/source/conf.py b/py/docs/source/conf.py
@@ -56,9 +56,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '4.26'
+version = '4.27'
 # The full version, including alpha/beta/rc tags.
-release = '4.26.0'
+release = '4.27.0.dev202410301443'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/py/selenium/__init__.py b/py/selenium/__init__.py
@@ -16,4 +16,4 @@
 # under the License.
 
 
-__version__ = "4.26.0"
+__version__ = "4.27.0.dev202410301443"
diff --git a/py/selenium/webdriver/__init__.py b/py/selenium/webdriver/__init__.py
@@ -44,7 +44,7 @@
 from .wpewebkit.service import Service as WPEWebKitService  # noqa
 from .wpewebkit.webdriver import WebDriver as WPEWebKit  # noqa
 
-__version__ = "4.26.0"
+__version__ = "4.27.0.dev202410301443"
 
 # We need an explicit __all__ because the above won't otherwise be exported.
 __all__ = [
diff --git a/py/setup.py b/py/setup.py
@@ -28,7 +28,7 @@
 setup_args = {
     'cmdclass': {'install': install},
     'name': 'selenium',
-    'version': "4.26.0",
+    'version': "4.27.0.dev202410301443",
     'license': 'Apache 2.0',
     'description': 'Official Python bindings for Selenium WebDriver.',
     'long_description': open(join(abspath(dirname(__file__)), "README.rst")).read(),
diff --git a/rb/Gemfile.lock b/rb/Gemfile.lock
@@ -3,7 +3,7 @@ PATH
   specs:
     selenium-devtools (0.130.0)
       selenium-webdriver (~> 4.2)
-    selenium-webdriver (4.26.0)
+    selenium-webdriver (4.27.0.nightly)
       base64 (~> 0.2)
       logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)
@@ -58,8 +58,8 @@ GEM
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jar-dependencies (0.4.1)
-    json (2.7.4)
-    json (2.7.4-java)
+    json (2.7.5)
+    json (2.7.5-java)
     language_server-protocol (3.17.0.3)
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
@@ -115,7 +115,7 @@ GEM
       rubocop-ast (>= 1.32.2, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.32.3)
+    rubocop-ast (1.33.0)
       parser (>= 3.3.1.0)
     rubocop-capybara (2.21.0)
       rubocop (~> 1.41)
@@ -196,4 +196,4 @@ DEPENDENCIES
   yard (~> 0.9.11, >= 0.9.36)
 
 BUNDLED WITH
-   2.5.14
+   2.5.6
diff --git a/rb/lib/selenium/webdriver/version.rb b/rb/lib/selenium/webdriver/version.rb
@@ -19,6 +19,6 @@
 
 module Selenium
   module WebDriver
-    VERSION = '4.26.0'
+    VERSION = '4.27.0.nightly'
   end # WebDriver
 end # Selenium

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-SE_VERSION = "4.26.0"`
	`1`	`+SE_VERSION = "4.27.0-SNAPSHOT"`
`2`	`2`	`TOOLS_JAVA_VERSION = "17"`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "selenium-webdriver",`
`3`		`- "version": "4.26.0",`
	`3`	`+ "version": "4.27.0-nightly202410301443",`
`4`	`4`	`"description": "The official WebDriver JavaScript bindings from the Selenium project",`
`5`	`5`	`"license": "Apache-2.0",`
`6`	`6`	`"keywords": [`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ compile_pip_requirements(`
`62`	`62`	`],`
`63`	`63`	`)`
`64`	`64`
`65`		`-SE_VERSION = "4.26.0"`
	`65`	`+SE_VERSION = "4.27.0.dev202410301443"`
`66`	`66`
`67`	`67`	`BROWSER_VERSIONS = [`
`68`	`68`	`"v85",`
Original file line number	Diff line number	Diff line change
`@@ -16,4 +16,4 @@`
`16`	`16`	`# under the License.`
`17`	`17`
`18`	`18`
`19`		`-__version__ = "4.26.0"`
	`19`	`+__version__ = "4.27.0.dev202410301443"`