diff options
| author | Andrey Andreev <narf@devilix.net> | 2015-07-16 10:46:37 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2015-07-16 10:46:37 +0200 |
| commit | 18ef61610735aaee76ca374fdede3fe4433e38a2 (patch) | |
| tree | 93a865d88f426aa40d50d6b3ae95f4f1b8ca81c0 /application | |
| parent | 924ac35f6d5a51ab5a9c0a27fed246a5678c5ea6 (diff) | |
| parent | 52ec8252a0cf1c57022fabe7a6d1abd0824f1d90 (diff) | |
Merge branch 'feature/mysqli-ssl' of github.com:ndigitals/CodeIgniter into feature/mysqli_ssl
Diffstat (limited to 'application')
| -rw-r--r-- | application/config/database.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/application/config/database.php b/application/config/database.php index 84aab9169..429b4d48a 100644 --- a/application/config/database.php +++ b/application/config/database.php @@ -43,6 +43,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); | ['compress'] Whether or not to use client compression (MySQL only) | ['stricton'] TRUE/FALSE - forces 'Strict Mode' connections | - good for ensuring strict SQL while developing +| ['ssl_options'] Used to set various SSL options that can be used when making SSL connections. | ['failover'] array - A array with 0 or more data for connections if the main should fail. | ['save_queries'] TRUE/FALSE - Whether to "save" all executed queries. | NOTE: Disabling this will also effectively disable both @@ -79,6 +80,7 @@ $db['default'] = array( 'encrypt' => FALSE, 'compress' => FALSE, 'stricton' => FALSE, + 'ssl_options' => array(), 'failover' => array(), 'save_queries' => TRUE ); |