strip the script name to ensure that we do not hit a redirect recursion

liip · May 4, 2012 · ddeebf2 · ddeebf2
1 parent 18875c1
commit ddeebf2
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/Imagine/Cache/Resolver/WebPathResolver.php b/Imagine/Cache/Resolver/WebPathResolver.php
@@ -35,6 +35,12 @@ public function resolve(Request $request, $path, $filter)
         // if the file has already been cached, we're probably not rewriting
         // correctly, hence make a 301 to proper location, so browser remembers
         if (file_exists($targetPath)) {
+            $scriptName = $request->getScriptName();
+            if (strpos($browserPath, $scriptName) === 0) {
+                // strip script name
+                $browserPath = substr($browserPath, strlen($scriptName));
+            }
+
             return new RedirectResponse($request->getBasePath().$browserPath);
         }