From 96a3c3aaaa827d0c78aa4dfc103f5a6d51fd39e2 Mon Sep 17 00:00:00 2001 From: Chuck Hagenbuch Date: Tue, 17 Feb 2009 13:50:33 -0500 Subject: [PATCH] #7998 SQL SSL support --- kronolith/lib/Driver/sql.php | 6 ++++-- kronolith/lib/Storage/sql.php | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/kronolith/lib/Driver/sql.php b/kronolith/lib/Driver/sql.php index 2cbcd0b1c..b8c0a83b8 100644 --- a/kronolith/lib/Driver/sql.php +++ b/kronolith/lib/Driver/sql.php @@ -725,7 +725,8 @@ class Kronolith_Driver_sql extends Kronolith_Driver { /* Connect to the SQL server using the supplied parameters. */ $this->_write_db = DB::connect($this->_params, - array('persistent' => !empty($this->_params['persistent']))); + array('persistent' => !empty($this->_params['persistent']), + 'ssl' => !empty($this->_params['ssl']))); if (is_a($this->_write_db, 'PEAR_Error')) { return $this->_write_db; } @@ -736,7 +737,8 @@ class Kronolith_Driver_sql extends Kronolith_Driver { if (!empty($this->_params['splitread'])) { $params = array_merge($this->_params, $this->_params['read']); $this->_db = DB::connect($params, - array('persistent' => !empty($params['persistent']))); + array('persistent' => !empty($params['persistent']), + 'ssl' => !empty($params['ssl']))); if (is_a($this->_db, 'PEAR_Error')) { return $this->_db; } diff --git a/kronolith/lib/Storage/sql.php b/kronolith/lib/Storage/sql.php index 37b351ef4..19c34d546 100644 --- a/kronolith/lib/Storage/sql.php +++ b/kronolith/lib/Storage/sql.php @@ -70,7 +70,8 @@ class Kronolith_Storage_sql extends Kronolith_Storage { /* Connect to the SQL server using the supplied parameters. */ include_once 'DB.php'; $this->_write_db = &DB::connect($this->_params, - array('persistent' => !empty($this->_params['persistent']))); + array('persistent' => !empty($this->_params['persistent']), + 'ssl' => !empty($this->_params['ssl']))); if (is_a($this->_write_db, 'PEAR_Error')) { return PEAR::raiseError(_("Unable to connect to SQL server.")); } @@ -89,7 +90,8 @@ class Kronolith_Storage_sql extends Kronolith_Storage { if (!empty($this->_params['splitread'])) { $params = array_merge($this->_params, $this->_params['read']); $this->_db = &DB::connect($params, - array('persistent' => !empty($params['persistent']))); + array('persistent' => !empty($params['persistent']), + 'ssl' => !empty($params['ssl']))); if (is_a($this->_db, 'PEAR_Error')) { return $this->_db; } -- 2.11.0