projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #22662 from colemanw/softDeleteEntity
[civicrm-core.git]
/
CRM
/
Utils
/
HttpClient.php
diff --git
a/CRM/Utils/HttpClient.php
b/CRM/Utils/HttpClient.php
index c2d12ae18cffc677d923bd78b7b1c62a78147289..3a34e18970c665a5c3b3e68a6871ec71863c27f0 100644
(file)
--- a/
CRM/Utils/HttpClient.php
+++ b/
CRM/Utils/HttpClient.php
@@
-48,7
+48,8
@@
class CRM_Utils_HttpClient {
}
/**
}
/**
- * @param null $connectionTimeout
+ * @param int|null $connectionTimeout
+ * seconds; or NULL to use system default
*/
public function __construct($connectionTimeout = NULL) {
$this->connectionTimeout = $connectionTimeout;
*/
public function __construct($connectionTimeout = NULL) {
$this->connectionTimeout = $connectionTimeout;
@@
-201,7
+202,7
@@
class CRM_Utils_HttpClient {
* @return bool
*/
public function isRedirectSupported() {
* @return bool
*/
public function isRedirectSupported() {
- return (ini_get('open_basedir') == '')
&& (ini_get('safe_mode') == 'Off' || ini_get('safe_mode') == '' || ini_get('safe_mode') === FALSE)
;
+ return (ini_get('open_basedir') == '');
}
}
}
}