RequestFactory: optimized script path detection performance

Author: JanTvrdik

src/Http/RequestFactory.php

@@ -113,16 +113,18 @@ public function createHttpRequest()
 			$script = '/';
 		}
 
-		$path = strtolower($url->getPath()) . '/';
-		$script = strtolower($script) . '/';
+		$path = $url->getPath();
 		$max = min(strlen($path), strlen($script));
 		for ($i = 0; $i < $max; $i++) {
-			if ($path[$i] !== $script[$i]) {
+			if ($path[$i] !== $script[$i] && strcasecmp($path[$i], $script[$i])) {
 				break;
-			} elseif ($path[$i] === '/') {
-				$url->setScriptPath(substr($url->getPath(), 0, $i + 1));
 			}
 		}
+		if ($i === $max && strlen($path) === strlen($script)) {
+			$url->setScriptPath($path);
+		} else {
+			$url->setScriptPath(substr($path, 0, strrpos($path, '/', $i - $max - 1) + 1));
+		}
 
 		// GET, POST, COOKIE
 		$useFilter = (!in_array(ini_get('filter.default'), array('', 'unsafe_raw')) || ini_get('filter.default_flags'));

tests/Http/RequestFactory.scriptPath.phpt

@@ -55,3 +55,45 @@ test(function() use ($factory) {
 
 	Assert::same( '/www/', $factory->createHttpRequest()->getUrl()->getScriptPath() );
 });
+
+
+test(function() use ($factory) {
+	$_SERVER = array(
+		'REQUEST_URI' => '/test/in',
+		'SCRIPT_NAME' => '/test/index.php',
+	);
+
+	Assert::same( '/test/', $factory->createHttpRequest()->getUrl()->getScriptPath() );
+});
+
+
+test(function() use ($factory) {
+	$_SERVER = array(
+		'REQUEST_URI' => '/test//',
+		'SCRIPT_NAME' => '/test/index.php',
+	);
+
+	Assert::same( '/test/', $factory->createHttpRequest()->getUrl()->getScriptPath() );
+});
+
+
+// http://forum.nette.org/cs/5932-lepsi-detekce-requesturi-a-scriptpath
+test(function() use ($factory) {
+	$_SERVER = array(
+		'REQUEST_URI' => '/sign/in/',
+		'SCRIPT_NAME' => '/sign/in/',
+	);
+
+	Assert::same( '/sign/in/', $factory->createHttpRequest()->getUrl()->getScriptPath() );
+});
+
+
+// http://forum.nette.org/cs/9139-spatny-urlscript-scriptpath
+test(function() use ($factory) {
+	$_SERVER = array(
+		'REQUEST_URI' => '/configuration/',
+		'SCRIPT_NAME' => '/configuration/www/index.php',
+	);
+
+	Assert::same( '/configuration/', $factory->createHttpRequest()->getUrl()->getScriptPath() );
+});