summaryrefslogtreecommitdiffstats
path: root/application/config/database.php
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2015-07-16 12:14:49 +0200
committerAndrey Andreev <narf@devilix.net>2015-07-16 12:14:49 +0200
commit76e643e7e3ebff679407255f66eafae790912f31 (patch)
tree97988496970d86bcc3143d2b5c5334b45472e48e /application/config/database.php
parent18ef61610735aaee76ca374fdede3fe4433e38a2 (diff)
Refactor proposed changes from PR #3896
Diffstat (limited to 'application/config/database.php')
-rw-r--r--application/config/database.php11
1 files changed, 10 insertions, 1 deletions
diff --git a/application/config/database.php b/application/config/database.php
index 429b4d48a..656f0c35a 100644
--- a/application/config/database.php
+++ b/application/config/database.php
@@ -40,6 +40,16 @@ defined('BASEPATH') OR exit('No direct script access allowed');
| Sites using Latin-1 or UTF-8 database character set and collation are unaffected.
| ['swap_pre'] A default table prefix that should be swapped with the dbprefix
| ['encrypt'] Whether or not to use an encrypted connection.
+|
+| 'mysql' (deprecated), 'sqlsrv' and 'pdo/sqlsrv' drivers accept TRUE/FALSE
+| 'mysqli' driver accepts an array with the following options:
+|
+| 'ssl_key' - Path to the private key file
+| 'ssl_cert' - Path to the public key certificate file
+| 'ssl_ca' - Path to the certificate authority file
+| 'ssl_capath' - Path to a directory containing trusted CA certificats in PEM format
+| 'ssl_cipher' - List of *allowed* ciphers to be used for the encryption
+|
| ['compress'] Whether or not to use client compression (MySQL only)
| ['stricton'] TRUE/FALSE - forces 'Strict Mode' connections
| - good for ensuring strict SQL while developing
@@ -80,7 +90,6 @@ $db['default'] = array(
'encrypt' => FALSE,
'compress' => FALSE,
'stricton' => FALSE,
- 'ssl_options' => array(),
'failover' => array(),
'save_queries' => TRUE
);