Fixed missing MySQLi driver parameter DOCBLOCK descriptions. Updated database configuration documentation to include a list of the new MySQLi driver parameters.
Signed-off-by: Tim Nolte <noltet@sekisui-spi.com>
diff --git a/system/database/drivers/mysqli/mysqli_driver.php b/system/database/drivers/mysqli/mysqli_driver.php
index dd4a9c4..26b2a8a 100644
--- a/system/database/drivers/mysqli/mysqli_driver.php
+++ b/system/database/drivers/mysqli/mysqli_driver.php
@@ -102,6 +102,8 @@
public $stricton = FALSE;
/**
+ * The path name to the key file.
+ *
* @see http://php.net/manual/en/mysqli.ssl-set.php Documentation for MySQLi
*
* @var string
@@ -109,6 +111,8 @@
public $ssl_key = '';
/**
+ * The path name to the certificate file.
+ *
* @see http://php.net/manual/en/mysqli.ssl-set.php Documentation for MySQLi
*
* @var string
@@ -116,6 +120,8 @@
public $ssl_cert = '';
/**
+ * The path name to the certificate authority file.
+ *
* @see http://php.net/manual/en/mysqli.ssl-set.php Documentation for MySQLi
*
* @var string
@@ -123,6 +129,8 @@
public $ssl_ca = '';
/**
+ * The pathname to a directory that contains trusted SSL CA certificates in PEM format.
+ *
* @see http://php.net/manual/en/mysqli.ssl-set.php Documentation for MySQLi
*
* @var string
@@ -130,6 +138,8 @@
public $ssl_capath = '';
/**
+ * A list of allowable ciphers to use for SSL encryption.
+ *
* @see http://php.net/manual/en/mysqli.ssl-set.php Documentation for MySQLi
*
* @var string
diff --git a/user_guide_src/source/database/configuration.rst b/user_guide_src/source/database/configuration.rst
index d21c79e..1d10bc1 100644
--- a/user_guide_src/source/database/configuration.rst
+++ b/user_guide_src/source/database/configuration.rst
@@ -186,10 +186,17 @@
::
$db['default']['port'] = 5432;
+
+**db_options** Used to set various database connections options and values. (MySQLi only)
+**ssl_key** The path name to the key file. (MySQLi only)
+**ssl_cert** The path name to the certificate file. (MySQLi only)
+**ssl_ca** The path name to the certificate authority file. (MySQLi only)
+**ssl_capath** The pathname to a directory that contains trusted SSL CA certificates in PEM format. (MySQLi only)
+**ssl_cipher** A list of allowable ciphers to use for SSL encryption. (MySQLi only)
====================== ==================================================================================================
.. note:: Depending on what database platform you are using (MySQL, PostgreSQL,
etc.) not all values will be needed. For example, when using SQLite you
will not need to supply a username or password, and the database name
will be the path to your database file. The information above assumes
- you are using MySQL.
\ No newline at end of file
+ you are using MySQL.