From 9a3772dee1ad8ec56277ecaf96ffacb53936522d Mon Sep 17 00:00:00 2001
From: webchick <webchick@24967.no-reply.drupal.org>
Date: Fri, 18 Apr 2014 07:41:18 -0700
Subject: [PATCH] Issue #2244185 by damiankloip: Remove cURL dependent options
from HTTP client.
---
core/lib/Drupal/Core/Http/Client.php | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/core/lib/Drupal/Core/Http/Client.php b/core/lib/Drupal/Core/Http/Client.php
index dd285d09f7e8..092161107fc3 100644
--- a/core/lib/Drupal/Core/Http/Client.php
+++ b/core/lib/Drupal/Core/Http/Client.php
@@ -22,12 +22,6 @@ class Client extends GuzzleClient {
*/
public function __construct(array $config = []) {
$default_config = array(
- 'config' => array(
- 'curl' => array(
- CURLOPT_TIMEOUT => 30,
- CURLOPT_MAXREDIRS => 3,
- ),
- ),
// Security consideration: we must not use the certificate authority
// file shipped with Guzzle because it can easily get outdated if a
// certificate authority is hacked. Instead, we rely on the certificate
@@ -35,6 +29,7 @@ public function __construct(array $config = []) {
// going to be updated in a timely fashion. This overrides the default
// path to the pem file bundled with Guzzle.
'verify' => TRUE,
+ 'timeout' => 30,
'headers' => array(
'User-Agent' => 'Drupal (+http://drupal.org/)',
),
--
GitLab