diff options
| author | Andrey Andreev <narf@devilix.net> | 2019-01-08 16:55:37 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2019-01-08 16:55:37 +0100 |
| commit | 7ec458b45316b9f270e1e03de498244f71c605ea (patch) | |
| tree | a110bf9c71b49a69beec49d1874f423375cd0fd1 /application | |
| parent | 67563c64025085e61598a83fef3e25bef38b32c4 (diff) | |
| parent | 12ee9843877bf80159d1d89a0e3a4f170e902725 (diff) | |
Merge branch '3.1-stable' into develop
Conflicts resolved:
system/database/drivers/sqlite/sqlite_driver.php
system/database/drivers/sqlite/sqlite_forge.php
system/database/drivers/sqlite/sqlite_result.php
system/database/drivers/sqlite/sqlite_utility.php
system/helpers/captcha_helper.php
system/helpers/email_helper.php
system/helpers/inflector_helper.php
system/helpers/smiley_helper.php
system/language/english/form_validation_lang.php
system/libraries/Cart.php
system/libraries/Form_validation.php
system/libraries/Javascript.php
system/libraries/Javascript/Jquery.php
system/libraries/Session/SessionHandlerInterface.php
tests/codeigniter/helpers/inflector_helper_test.php
user_guide_src/source/helpers/inflector_helper.rst
Diffstat (limited to 'application')
| -rw-r--r-- | application/config/database.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/application/config/database.php b/application/config/database.php index d8566e8c3..77748959f 100644 --- a/application/config/database.php +++ b/application/config/database.php @@ -49,7 +49,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); | 'ssl_ca' - Path to the certificate authority file | 'ssl_capath' - Path to a directory containing trusted CA certificates in PEM format | 'ssl_cipher' - List of *allowed* ciphers to be used for the encryption, separated by colons (':') -| 'ssl_verify' - TRUE/FALSE; Whether verify the server certificate or not ('mysqli' only) +| 'ssl_verify' - TRUE/FALSE; Whether verify the server certificate or not | | ['compress'] Whether or not to use client compression (MySQL only) | ['stricton'] TRUE/FALSE - forces 'Strict Mode' connections |