Merge branch 'request-timeout--allow-specifying-during-connection' of h…

…ttps://github.com/iFixit/php-webdriver into iFixit-request-timeout--allow-specifying-during-connection
php-webdriver · Jan 12, 2015 · daf6263 · daf6263
2 parents 58223ee + c84d655
commit daf6263
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/lib/chrome/ChromeDriver.php b/lib/chrome/ChromeDriver.php
@@ -47,7 +47,8 @@ public function startSession($desired_capabilities) {
   public static function create(
     $url = 'http://localhost:4444/wd/hub',
     $desired_capabilities = null,
-    $timeout_in_ms = 300000
+    $timeout_in_ms = 300000,
+    $request_timeout_in_ms = 300000
   ) {
     throw new WebDriverException('Please use ChromeDriver::start() instead.');
   }

diff --git a/lib/remote/RemoteWebDriver.php b/lib/remote/RemoteWebDriver.php
@@ -47,12 +47,14 @@ protected function __construct() {}
    * @param string $url The url of the remote server
    * @param DesiredCapabilities $desired_capabilities The desired capabilities
    * @param int $connection_timeout_in_ms
+   * @param int $request_timeout_in_ms
    * @return RemoteWebDriver
    */
   public static function create(
     $url = 'http://localhost:4444/wd/hub',
     $desired_capabilities = null,
-    $connection_timeout_in_ms = 300000
+    $connection_timeout_in_ms = 300000,
+    $request_timeout_in_ms = 300000
   ) {
     $url = preg_replace('#/+$#', '', $url);
 
@@ -64,6 +66,7 @@ public static function create(
 
     $executor = new HttpCommandExecutor($url);
     $executor->setConnectionTimeout($connection_timeout_in_ms);
+    $executor->setRequestTimeout($request_timeout_in_ms);
 
     $command = new WebDriverCommand(
       null,