Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
CiviCRM Core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Development
CiviCRM Core
Commits
d32b0c38
Unverified
Commit
d32b0c38
authored
3 years ago
by
DaveD
Committed by
GitHub
3 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #21096 from mattwire/guzzletimeout
Respect http_timeout core setting for Guzzle HTTP requests
parents
7379b910
0b181297
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CRM/Utils/Address/USPS.php
+1
-0
1 addition, 0 deletions
CRM/Utils/Address/USPS.php
CRM/Utils/Geocode/Google.php
+1
-1
1 addition, 1 deletion
CRM/Utils/Geocode/Google.php
ext/recaptcha/lib/recaptcha/recaptchalib.php
+1
-1
1 addition, 1 deletion
ext/recaptcha/lib/recaptcha/recaptchalib.php
with
3 additions
and
2 deletions
CRM/Utils/Address/USPS.php
+
1
−
0
View file @
d32b0c38
...
...
@@ -74,6 +74,7 @@ class CRM_Utils_Address_USPS {
'API'
=>
'Verify'
,
'XML'
=>
$XMLQuery
,
],
'timeout'
=>
\Civi
::
settings
()
->
get
(
'http_timeout'
),
]);
$session
=
CRM_Core_Session
::
singleton
();
...
...
This diff is collapsed.
Click to expand it.
CRM/Utils/Geocode/Google.php
+
1
−
1
View file @
d32b0c38
...
...
@@ -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
);
...
...
This diff is collapsed.
Click to expand it.
ext/recaptcha/lib/recaptcha/recaptchalib.php
+
1
−
1
View file @
d32b0c38
...
...
@@ -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
''
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment