Respect http_timeout core setting for Guzzle HTTP requests

diff --git a/CRM/Utils/Address/USPS.php b/CRM/Utils/Address/USPS.php
index 721b2e70e079b5bccf6e0875048ab165da95489a..fc53a7a70fcafb34c2d933792e02982e937f2b7e 100644 (file)
--- a/CRM/Utils/Address/USPS.php
+++ b/CRM/Utils/Address/USPS.php
@@ -74,6 +74,7 @@ class CRM_Utils_Address_USPS {
         'API' => 'Verify',
         'XML' => $XMLQuery,
       ],
+      'timeout' => \Civi::settings()->get('http_timeout'),
     ]);
 
     $session = CRM_Core_Session::singleton();

diff --git a/CRM/Utils/Geocode/Google.php b/CRM/Utils/Geocode/Google.php
index 6ab1397fea8d8be13c67b0ca51c570f4dff30798..ad670f6c94ffe796fde3d12bba175f70a4b98ca8 100644 (file)
--- a/CRM/Utils/Geocode/Google.php
+++ b/CRM/Utils/Geocode/Google.php
@@ -106,7 +106,7 @@ class CRM_Utils_Geocode_Google {
     $query = 'https://' . self::$_server . self::$_uri . $add;
 
     $client = new GuzzleHttp\Client();
-    $request = $client->request('GET', $query);
+    $request = $client->request('GET', $query, ['timeout' => \Civi::settings()->get('http_timeout')]);
     $string = $request->getBody();
 
     libxml_use_internal_errors(TRUE);

diff --git a/ext/recaptcha/lib/recaptcha/recaptchalib.php b/ext/recaptcha/lib/recaptcha/recaptchalib.php
index fdc506eed1c9952ddaaec22f4fddddd6e10cd6d2..fa15dc44560dff764071815aa466e1694e1d30e9 100644 (file)
--- a/ext/recaptcha/lib/recaptcha/recaptchalib.php
+++ b/ext/recaptcha/lib/recaptcha/recaptchalib.php
@@ -67,7 +67,7 @@ function _recaptcha_qsencode ($data) {
 function _recaptcha_http_post($host, $path, $data) {
   $client = new Client();
   try {
-    $response = $client->request('POST', $host . '/' . $path, ['query' => $data]);
+    $response = $client->request('POST', $host . '/' . $path, ['query' => $data, 'timeout' => \Civi::settings()->get('http_timeout')]);
   }
   catch (Exception $e) {
     return '';