projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Comment fixes for CRM/Utils directory
[civicrm-core.git]
/
CRM
/
Utils
/
HttpClient.php
diff --git
a/CRM/Utils/HttpClient.php
b/CRM/Utils/HttpClient.php
index 9c22cc4d6aee51aa8f975ecf41b72f7442a1177b..92aed3c84245229ca9a89dd75d5f6ca20357b3eb 100644
(file)
--- a/
CRM/Utils/HttpClient.php
+++ b/
CRM/Utils/HttpClient.php
@@
-1,9
+1,9
@@
<?php
/*
+--------------------------------------------------------------------+
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.
6
|
+ | CiviCRM version 4.
7
|
+--------------------------------------------------------------------+
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-201
4
|
+ | Copyright CiviCRM LLC (c) 2004-201
5
|
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@
-34,9
+34,7
@@
* want to deal with that so late in the 4.3 dev cycle.
*
* @package CRM
* want to deal with that so late in the 4.3 dev cycle.
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2014
- * $Id$
- *
+ * @copyright CiviCRM LLC (c) 2004-2015
*/
class CRM_Utils_HttpClient {
*/
class CRM_Utils_HttpClient {
@@
-50,7
+48,8
@@
class CRM_Utils_HttpClient {
protected static $singleton;
/**
protected static $singleton;
/**
- * @var int|NULL seconds; or NULL to use system default
+ * @var int|NULL
+ * seconds; or NULL to use system default
*/
protected $connectionTimeout;
*/
protected $connectionTimeout;
@@
-135,7
+134,7
@@
class CRM_Utils_HttpClient {
list($ch, $caConfig) = $this->createCurl($remoteFile);
if (preg_match('/^https:/', $remoteFile) && !$caConfig->isEnableSSL()) {
list($ch, $caConfig) = $this->createCurl($remoteFile);
if (preg_match('/^https:/', $remoteFile) && !$caConfig->isEnableSSL()) {
- //CRM_Core_Error::fatal('Cannot install this extension - does not support SSL');
+ //
CRM_Core_Error::fatal('Cannot install this extension - does not support SSL');
return array(self::STATUS_DL_ERROR, NULL);
}
return array(self::STATUS_DL_ERROR, NULL);
}
@@
-171,7
+170,7
@@
class CRM_Utils_HttpClient {
list($ch, $caConfig) = $this->createCurl($remoteFile);
if (preg_match('/^https:/', $remoteFile) && !$caConfig->isEnableSSL()) {
list($ch, $caConfig) = $this->createCurl($remoteFile);
if (preg_match('/^https:/', $remoteFile) && !$caConfig->isEnableSSL()) {
- //CRM_Core_Error::fatal('Cannot install this extension - does not support SSL');
+ //
CRM_Core_Error::fatal('Cannot install this extension - does not support SSL');
return array(self::STATUS_DL_ERROR, NULL);
}
return array(self::STATUS_DL_ERROR, NULL);
}
@@
-197,7
+196,7
@@
class CRM_Utils_HttpClient {
*/
protected function createCurl($remoteFile) {
$caConfig = CA_Config_Curl::probe(array(
*/
protected function createCurl($remoteFile) {
$caConfig = CA_Config_Curl::probe(array(
- 'verify_peer' => (bool) CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME, 'verifySSL'
, NULL, TRUE
),
+ 'verify_peer' => (bool) CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME, 'verifySSL'),
));
$ch = curl_init();
));
$ch = curl_init();