Merge pull request #12003 from vinuvarshith/dev/core/69-fix-state-province-name-token...

[civicrm-core.git] / CRM / Cxn / CiviCxnHttp.php

diff --git a/CRM/Cxn/CiviCxnHttp.php b/CRM/Cxn/CiviCxnHttp.php
index 249575847bd66dfe326a015ea43be2ebd0f5e929..f2b2c6357c8c1038b844817d7585473d2d756809 100644 (file)
--- a/CRM/Cxn/CiviCxnHttp.php
+++ b/CRM/Cxn/CiviCxnHttp.php
@@ -22,17 +22,11 @@ class CRM_Cxn_CiviCxnHttp extends \Civi\Cxn\Rpc\Http\PhpHttp {
    */
   public static function singleton($fresh = FALSE) {
     if (self::$singleton === NULL || $fresh) {
-      $config = CRM_Core_Config::singleton();
-
-      if ($config->debug) {
-        $cache = new CRM_Utils_Cache_Arraycache(array());
-      }
-      else {
-        $cache = new CRM_Utils_Cache_SqlGroup(array(
-          'group' => 'CiviCxnHttp',
-          'prefetch' => FALSE,
-        ));
-      }
+      $cache = CRM_Utils_Cache::create(array(
+        'name' => 'CiviCxnHttp',
+        'type' => Civi::settings()->get('debug_enabled') ? 'ArrayCache' : array('SqlGroup', 'ArrayCache'),
+        'prefetch' => FALSE,
+      ));
 
       self::$singleton = new CRM_Cxn_CiviCxnHttp($cache);
     }
@@ -85,11 +79,22 @@ class CRM_Cxn_CiviCxnHttp extends \Civi\Cxn\Rpc\Http\PhpHttp {
     return $result;
   }
 
+  /**
+   * Create stream options.
+   *
+   * @param string $verb
+   * @param string $url
+   * @param string $blob
+   * @param array $headers
+   *
+   * @return array
+   * @throws \Exception
+   */
   protected function createStreamOpts($verb, $url, $blob, $headers) {
     $result = parent::createStreamOpts($verb, $url, $blob, $headers);
 
     $caConfig = CA_Config_Stream::probe(array(
-      'verify_peer' => (bool) CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME, 'verifySSL', NULL, TRUE),
+      'verify_peer' => (bool) Civi::settings()->get('verifySSL'),
     ));
     if ($caConfig->isEnableSSL()) {
       $result['ssl'] = $caConfig->toStreamOptions();