aren't we doing the array addition twice here?

      $curl_options = $this->additionalCurlOptions + array(
        CURLOPT_COOKIEJAR => $this->cookieFile,
        CURLOPT_URL => $base_url,
        CURLOPT_FOLLOWLOCATION => FALSE,
        CURLOPT_RETURNTRANSFER => TRUE,
        CURLOPT_SSL_VERIFYPEER => FALSE, // Required to make the tests run on https.
        CURLOPT_SSL_VERIFYHOST => FALSE, // Required to make the tests run on https.
        CURLOPT_HEADERFUNCTION => array(&$this, 'curlHeaderCallback'),
        CURLOPT_USERAGENT => $this->databasePrefix,
      );
      if (isset($this->httpauth_credentials)) {
        $curl_options[CURLOPT_HTTPAUTH] = $this->httpauth_method;
        $curl_options[CURLOPT_USERPWD] = $this->httpauth_credentials;
      }
      curl_setopt_array($this->curlHandle, $this->additionalCurlOptions + $curl_options);
CommentFileSizeAuthor
#1 drupal_web_test_case.php_.patch812 bytesglipay
Support from Acquia helps fund testing for Drupal Acquia logo

Comments

glipay’s picture

Assigned: Unassigned » glipay
Status: Active » Needs review
FileSize
812 bytes

I removed the first aray addition so the current behavior would be maintained, but I don't completely understand what this code is doing, so maybe it's more appropriate to remove the second array addition, I don't know.

Anonymous’s picture

Status: Needs review » Reviewed & tested by the community

looks fine to me, simple patch, RTBC.

Dries’s picture

Status: Reviewed & tested by the community » Fixed

Committed to CVS HEAD. Thanks.

Status: Fixed » Closed (fixed)

Automatically closed -- issue fixed for 2 weeks with no activity.