Age | Commit message (Collapse) | Author | Files | Lines |
|
Signed-off-by: Francisco Javier Llanquipichun Garcia <francisco.llanquipichun@gmail.com>
|
|
Conflicts resolved:
system/core/CodeIgniter.php
system/libraries/Cache/drivers/Cache_redis.php
system/libraries/Session/drivers/Session_redis_driver.php
user_guide_src/source/changelog.rst
user_guide_src/source/conf.py
user_guide_src/source/installation/downloads.rst
user_guide_src/source/installation/upgrading.rst
|
|
|
|
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
|
|
Update copyright date to 2019
|
|
|
|
|
|
|
|
Annual copyright update
Conflicts resolved:
system/libraries/Cache/drivers/Cache_apcu.php
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts resolved:
system/core/CodeIgniter.php
system/core/Common.php
system/core/Input.php
system/helpers/cookie_helper.php
tests/codeigniter/helpers/html_helper_test.php
user_guide_src/source/changelog.rst
user_guide_src/source/conf.py
user_guide_src/source/installation/downloads.rst
user_guide_src/source/installation/upgrading.rst
user_guide_src/source/libraries/input.rst
|
|
|
|
Spelling fixes in comment blocks and docs
|
|
|
|
|
|
|
|
Use MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT as a connection flag instead of option
|
|
|
|
|
|
|
|
|
|
Conflicts resolved:
.travis.yml
system/core/CodeIgniter.php
system/database/drivers/oci8/oci8_forge.php
system/database/drivers/pdo/subdrivers/pdo_oci_forge.php
system/helpers/path_helper.php
system/libraries/Email.php
user_guide_src/source/changelog.rst
user_guide_src/source/conf.py
user_guide_src/source/contributing/index.rst
user_guide_src/source/general/requirements.rst
user_guide_src/source/general/styleguide.rst
user_guide_src/source/installation/downloads.rst
user_guide_src/source/installation/upgrade_310.rst
user_guide_src/source/installation/upgrading.rst
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Resolved conflicts:
system/database/drivers/mysql/mysql_driver.php
system/database/drivers/mysqli/mysqli_driver.php
|
|
Ref: #4349
|
|
Ref: #4349
|
|
|
|
Available since PHP 5.6.16
|
|
|
|
|
|
Close #4311
|
|
|
|
MYSQLI_OPT_SSL_VERIFY_SERVER_CERT is an undocumented option that may not always be available.
Reference: http://svn.php.net/viewvc/php/php-src/trunk/ext/mysqli/tests/mysqli_constants.phpt?view=markup&pathrev=302897
|
|
Related: #3896
|
|
|
|
new MySQLi SSL configuration options to a single ssl_options config item that is an array that will be read to set the individual SSL options.
Signed-off-by: Tim Nolte <noltet@sekisui-spi.com>
|
|
database configuration documentation to include a list of the new MySQLi driver parameters.
Signed-off-by: Tim Nolte <noltet@sekisui-spi.com>
|
|
additional database connection options. Uses the DB_driver class encrypt option as the flag for turning on encryption. Also added SSL connection validation with error logging in order to provide users a way to know if they are actually connecting via SSL.
Signed-off-by: Tim Nolte <noltet@sekisui-spi.com>
|
|
It doesn't make sense to do a load->database() call
but not connect to the database. IIRC there was more
stuff in CI_DB_driver::initialize() at some point,
so that was probably the reason why the setting
existed in the first place. However, now it only
results in users making invalid bug reports because
they don't understand the feature ...
Examples during just the past 2 weeks: #3571 #3601 #3607
|
|
|