Skip to content
Snippets Groups Projects
Commit 9a3772de authored by Angie Byron's avatar Angie Byron
Browse files

Issue #2244185 by damiankloip: Remove cURL dependent options from HTTP client.

parent c8f6aceb
No related branches found
No related tags found
2 merge requests!7452Issue #1797438. HTML5 validation is preventing form submit and not fully...,!789Issue #3210310: Adjust Database API to remove deprecated Drupal 9 code in Drupal 10
Show whitespace changes
Inline Side-by-side
core/lib/Drupal/Core/Http/Client.php
+ 1
− 6
View file @ 9a3772de
...@@ -22,12 +22,6 @@ class Client extends GuzzleClient { ...@@ -22,12 +22,6 @@ class Client extends GuzzleClient {
*/ */
public function __construct(array $config = []) { public function __construct(array $config = []) {
$default_config = array( $default_config = array(
'config' => array(
'curl' => array(
CURLOPT_TIMEOUT => 30,
CURLOPT_MAXREDIRS => 3,
),
),
// Security consideration: we must not use the certificate authority // Security consideration: we must not use the certificate authority
// file shipped with Guzzle because it can easily get outdated if a // file shipped with Guzzle because it can easily get outdated if a
// certificate authority is hacked. Instead, we rely on the certificate // certificate authority is hacked. Instead, we rely on the certificate
...@@ -35,6 +29,7 @@ public function __construct(array $config = []) { ...@@ -35,6 +29,7 @@ public function __construct(array $config = []) {
// going to be updated in a timely fashion. This overrides the default // going to be updated in a timely fashion. This overrides the default
// path to the pem file bundled with Guzzle. // path to the pem file bundled with Guzzle.
'verify' => TRUE, 'verify' => TRUE,
'timeout' => 30,
'headers' => array( 'headers' => array(
'User-Agent' => 'Drupal (+http://drupal.org/)', 'User-Agent' => 'Drupal (+http://drupal.org/)',
), ),
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment