curl options in HttpCommandExecutor::remoteExecute()

change the interface from ($cmd, $timeout) to ($cmd, $curl_opts)
so that we can handle all curl opts nicer.

To set the original timeout, passing

array(CURLOPT_CONNECTTIMEOUT_MS => $timeout)

as the $curl_opts.

Author: whhone

lib/remote/HttpCommandExecutor.php

@@ -131,26 +131,25 @@ public function execute($name, array $params = array()) {
    *                  sessionId  : the session id if needed
    *                  name       : the name of the command
    *                  parameters : the parameters of the command required
-   * @param timeout Milliseconds to wait while trying to connect (defaults to 5 minutes)
+   * @param curl_opts An array of curl options.
    *
    * @return array The response of the command.
    */
-  public static function remoteExecute($command, $timeout = 300000) {
+  public static function remoteExecute($command, $curl_opts = array()) {
     if (!isset(self::$commands[$command['name']])) {
       throw new Exception($command['name']." is not a valid command.");
     }
     $raw = self::$commands[$command['name']];
-    $extra_opts = array(CURLOPT_CONNECTTIMEOUT_MS => $timeout);
 
     if ($command['name'] == 'newSession') {
-      $extra_opts[CURLOPT_FOLLOWLOCATION] = true;
+      $curl_opts[CURLOPT_FOLLOWLOCATION] = true;
     }
 
     return self::curl(
       $raw['method'],
       sprintf("%s%s", $command['url'], $raw['url']),
       $command,
-      $extra_opts
+      $curl_opts
     );
   }
 

lib/remote/RemoteWebDriver.php

@@ -23,15 +23,20 @@ class RemoteWebDriver implements WebDriver {
   public function __construct(
     $url = 'http://localhost:4444/wd/hub',
     $desired_capabilities = array(),
-    $timeout = 300000) {
+    $timeout_in_ms = 300000) {
 
     $url = preg_replace('#/+$#', '', $url);
     $command = array(
       'url' => $url,
       'name' => 'newSession',
       'parameters' => array('desiredCapabilities' => $desired_capabilities),
     );
-    $response = HttpCommandExecutor::remoteExecute($command, $timeout);
+    $response = HttpCommandExecutor::remoteExecute(
+      $command,
+      array(
+        CURLOPT_CONNECTTIMEOUT_MS => $timeout_in_ms,
+      )
+    );
 
     $this->executor = new HttpCommandExecutor(
       $url,