From 62fe0117ae087ccfb5fd94cc9f83977c86f2452f Mon Sep 17 00:00:00 2001
From: Claudio Galdiolo <claudio.galdiolo@gmail.com>
Date: Thu, 13 Aug 2015 10:21:42 -0400
Subject: Fix typo in comments

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

(limited to 'system/core')

diff --git a/system/core/Common.php b/system/core/Common.php
index ce324a1cc..ad3ca9f93 100644
--- a/system/core/Common.php
+++ b/system/core/Common.php
@@ -677,7 +677,7 @@ if ( ! function_exists('_shutdown_handler'))
 	 * of CodeIgniter.php. The main reason we use this is to simulate
 	 * a complete custom exception handler.
 	 *
-	 * E_STRICT is purposivly neglected because such events may have
+	 * E_STRICT is purposively neglected because such events may have
 	 * been caught. Duplication or none? None is preferred for now.
 	 *
 	 * @link	http://insomanic.me.uk/post/229851073/php-trick-catching-fatal-errors-e-error-with-a
-- 
cgit v1.2.3-24-g4f1b


From c2c7cb7e9d869ba8ba8b16a04e5d8300d462d8de Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Fri, 14 Aug 2015 13:48:31 +0300
Subject: Fix #4052

The bug actually had two instances:
- Callback routes with literal matches and HTTP verbs has never worked
- The reported issue in #4052, which is a regression introduced in 3.0.1
  with abc299b3a234eb7da1b7e3d257b7eba2da649219

Removed the literal matches logic altogether to avoid similar issues
in the future and reduce code complexity. The same logic is performed
with the regular expressions logic.
---
 system/core/Router.php | 20 --------------------
 1 file changed, 20 deletions(-)

(limited to 'system/core')

diff --git a/system/core/Router.php b/system/core/Router.php
index 0c793e418..eb868cd5b 100644
--- a/system/core/Router.php
+++ b/system/core/Router.php
@@ -372,26 +372,6 @@ class CI_Router {
 		// Get HTTP verb
 		$http_verb = isset($_SERVER['REQUEST_METHOD']) ? strtolower($_SERVER['REQUEST_METHOD']) : 'cli';
 
-		// Is there a literal match?  If so we're done
-		if (isset($this->routes[$uri]))
-		{
-			// Is it an HTTP verb-based route?
-			if (is_array($this->routes[$uri]))
-			{
-				$route = array_change_key_case($this->routes[$uri], CASE_LOWER);
-				if (isset($route[$http_verb]))
-				{
-					$this->_set_request(explode('/', $route[$http_verb]));
-					return;
-				}
-			}
-			else
-			{
-				$this->_set_request(explode('/', $this->routes[$uri]));
-				return;
-			}
-		}
-
 		// Loop through the route array looking for wildcards
 		foreach ($this->routes as $key => $val)
 		{
-- 
cgit v1.2.3-24-g4f1b