Merge branch 'master' of https://github.com/iunruh/zf2

zendframework · Jun 13, 2012 · 66a4342 · 66a4342
commit 66a4342
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/PhpEnvironment/Request.php b/src/PhpEnvironment/Request.php
@@ -247,6 +247,12 @@ protected function detectRequestUri()
         if ($httpXRewriteUrl !== null) {
             $requestUri = $httpXRewriteUrl;
         }
+
+        // Check for IIS 7.0 or later with ISAPI_Rewrite
+        $httpXOriginalUrl = $this->server()->get('HTTP_X_ORIGINAL_URL');
+        if ($httpXOriginalUrl !== null) {
+            $requestUri = $httpXOriginalUrl;
+        }
 
         // IIS7 with URL Rewrite: make sure we get the unencoded url
         // (double slash problem).