From b0f43e29e43228366390de7e0aa80d2134d1f224 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Fri, 10 May 2019 20:04:57 +0300
Subject: Merge pull request #5744 from sharadrsoni/patch-1

Adding support for proper CRLF
---
 system/core/Log.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'system/core')

diff --git a/system/core/Log.php b/system/core/Log.php
index 4338aa939..f37726e02 100644
--- a/system/core/Log.php
+++ b/system/core/Log.php
@@ -247,11 +247,11 @@ class CI_Log {
 	 * @param	string	$level 	The error level
 	 * @param	string	$date 	Formatted date string
 	 * @param	string	$message 	The log message
-	 * @return	string	Formatted log line with a new line character '\n' at the end
+	 * @return	string	Formatted log line with a new line character at the end
 	 */
 	protected function _format_line($level, $date, $message)
 	{
-		return $level.' - '.$date.' --> '.$message."\n";
+		return $level.' - '.$date.' --> '.$message.PHP_EOL;
 	}
 
 	// --------------------------------------------------------------------
-- 
cgit v1.2.3-24-g4f1b


From 0f6841fbf1aa9e10a55f3aa3bae966f3bed46c2f Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Sun, 2 Jun 2019 05:15:01 +0300
Subject: Close #5763

---
 system/core/Controller.php | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'system/core')

diff --git a/system/core/Controller.php b/system/core/Controller.php
index 2bb157802..e25b8472c 100644
--- a/system/core/Controller.php
+++ b/system/core/Controller.php
@@ -58,6 +58,13 @@ class CI_Controller {
 	 */
 	private static $instance;
 
+	/**
+	 * CI_Loader
+	 *
+	 * @var	CI_Loader
+	 */
+	public $load;
+
 	/**
 	 * Class constructor
 	 *
-- 
cgit v1.2.3-24-g4f1b


From ba67b297d1e2baa281eed2cc7bf1fb16742cde87 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Fri, 2 Aug 2019 15:53:03 +0300
Subject: [ci skip] Fix a CSRF-related bug

---
 system/core/Security.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'system/core')

diff --git a/system/core/Security.php b/system/core/Security.php
index 883968e26..6a81faff1 100644
--- a/system/core/Security.php
+++ b/system/core/Security.php
@@ -228,6 +228,7 @@ class CI_Security {
 
 		// Check CSRF token validity, but don't error on mismatch just yet - we'll want to regenerate
 		$valid = isset($_POST[$this->_csrf_token_name], $_COOKIE[$this->_csrf_cookie_name])
+			&& is_string($_POST[$this->_csrf_token_name]) && is_string($_COOKIE[$this->_csrf_cookie_name])
 			&& hash_equals($_POST[$this->_csrf_token_name], $_COOKIE[$this->_csrf_cookie_name]);
 
 		// We kill this since we're done and we don't want to pollute the _POST array
-- 
cgit v1.2.3-24-g4f1b


From f4502e4ad6d8a595e472b85a5e0bc3f552b63306 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Thu, 19 Sep 2019 15:12:46 +0300
Subject: [ci skip] Begin 3.1.12-dev

---
 system/core/CodeIgniter.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'system/core')

diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php
index a053777c1..bd0c4c5d8 100644
--- a/system/core/CodeIgniter.php
+++ b/system/core/CodeIgniter.php
@@ -55,7 +55,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
  * @var	string
  *
  */
-	const CI_VERSION = '3.1.11-dev';
+	const CI_VERSION = '3.1.12-dev';
 
 /*
  * ------------------------------------------------------
-- 
cgit v1.2.3-24-g4f1b