RequestFactory: script path detection is case-sensitive (BC break)

nette · Dec 21, 2014 · 98cc19a · 98cc19a
1 parent f781367
commit 98cc19a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/src/Http/RequestFactory.php b/src/Http/RequestFactory.php
@@ -115,10 +115,8 @@ public function createHttpRequest()
 
 		$path = $url->getPath();
 		$max = min(strlen($path), strlen($script));
-		for ($i = 0; $i < $max; $i++) {
-			if ($path[$i] !== $script[$i] && strcasecmp($path[$i], $script[$i])) {
-				break;
-			}
+		for ($i = 0; $i < $max && $path[$i] === $script[$i]; $i++) {
+			// nothing
 		}
 		if ($i === $max && strlen($path) === strlen($script)) {
 			$url->setScriptPath($path);

diff --git a/tests/Http/RequestFactory.scriptPath.phpt b/tests/Http/RequestFactory.scriptPath.phpt
@@ -28,7 +28,7 @@ test(function() use ($factory) {
 	$_SERVER = array(
 		'REQUEST_URI' => '/projects/modules-usage/www/default/add-item',
 		'SCRIPT_FILENAME' => 'W:/projects/Modules-Usage/www/index.php',
-		'SCRIPT_NAME' => '/projects/Modules-Usage/www/index.php',
+		'SCRIPT_NAME' => '/projects/modules-usage/www/index.php',
 	);
 
 	Assert::same( '/projects/modules-usage/www/', $factory->createHttpRequest()->getUrl()->getScriptPath() );
@@ -97,3 +97,13 @@ test(function() use ($factory) {
 
 	Assert::same( '/configuration/', $factory->createHttpRequest()->getUrl()->getScriptPath() );
 });
+
+
+test(function() use ($factory) {
+	$_SERVER = array(
+		'REQUEST_URI' => '/blog/WWW/',
+		'SCRIPT_NAME' => '/blog/www/index.php',
+	);
+
+	Assert::same( '/blog/', $factory->createHttpRequest()->getUrl()->getScriptPath() );
+});