From 73295d264410f4d0b5ae802e77d4d6b47172f64a Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Wed, 5 Jan 2022 19:09:23 +0200 Subject: [ci skip] Merge pull request #5896 from ytetsuro/patch-3 fix too many connection for oracle --- system/database/drivers/oci8/oci8_driver.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/system/database/drivers/oci8/oci8_driver.php b/system/database/drivers/oci8/oci8_driver.php index a9d75ebf2..511ef0e64 100644 --- a/system/database/drivers/oci8/oci8_driver.php +++ b/system/database/drivers/oci8/oci8_driver.php @@ -682,6 +682,16 @@ class CI_DB_oci8_driver extends CI_DB { */ protected function _close() { + if (is_resource($this->curs_id)) + { + oci_free_statement($this->curs_id); + } + + if (is_resource($this->stmt_id)) + { + oci_free_statement($this->stmt_id); + } + oci_close($this->conn_id); } -- cgit v1.2.3-24-g4f1b From b8445bf3f5ac18b6325e1205e068a24d80a19307 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Wed, 5 Jan 2022 20:57:43 +0200 Subject: [ci skip] Merge pull request #5690 from Lohith94/develop Corrected some grammar --- application/config/config.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/application/config/config.php b/application/config/config.php index ee599c7aa..1abe32c00 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -13,9 +13,9 @@ defined('BASEPATH') OR exit('No direct script access allowed'); | | WARNING: You MUST set this value! | -| If it is not set, then CodeIgniter will try guess the protocol and path -| your installation, but due to security concerns the hostname will be set -| to $_SERVER['SERVER_ADDR'] if available, or localhost otherwise. +| If it is not set, then CodeIgniter will try to guess the protocol and +| path your installation, but due to security concerns the hostname will +| be set to $_SERVER['SERVER_ADDR'] if available, or localhost otherwise. | The auto-detection mechanism exists only for convenience during | development and MUST NOT be used in production! | -- cgit v1.2.3-24-g4f1b From b8ad8411998b028f829db4231b3ef1db0eef8813 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Wed, 5 Jan 2022 20:59:30 +0200 Subject: [ci skip] Another minor grammar correction following #5690 --- application/config/config.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/config/config.php b/application/config/config.php index 1abe32c00..35ace5cc9 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -13,8 +13,8 @@ defined('BASEPATH') OR exit('No direct script access allowed'); | | WARNING: You MUST set this value! | -| If it is not set, then CodeIgniter will try to guess the protocol and -| path your installation, but due to security concerns the hostname will +| If it is not set, then CodeIgniter will try to guess the protocol and +| path to your installation, but due to security concerns the hostname will | be set to $_SERVER['SERVER_ADDR'] if available, or localhost otherwise. | The auto-detection mechanism exists only for convenience during | development and MUST NOT be used in production! -- cgit v1.2.3-24-g4f1b