Merge pull request #296 from sreichel/fix/iis

Apply Magento 1.9.0.0 change
Shardj · Jan 11, 2023 · d147f02 · d147f02
2 parents dadd0c2 + 9d68215
commit d147f02
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/library/Zend/Controller/Request/Http.php b/library/Zend/Controller/Request/Http.php
@@ -390,13 +390,19 @@ public function getEnv($key = null, $default = null)
     public function setRequestUri($requestUri = null)
     {
         if ($requestUri === null) {
-            if (
+            if (isset($_SERVER['HTTP_X_ORIGINAL_URL'])) {
+                // IIS with Microsoft Rewrite Module
+                $requestUri = $_SERVER['HTTP_X_ORIGINAL_URL'];
+            } elseif (isset($_SERVER['HTTP_X_REWRITE_URL'])) {
+                // IIS with ISAPI_Rewrite
+                $requestUri = $_SERVER['HTTP_X_REWRITE_URL'];
+            } elseif (
                 // IIS7 with URL Rewrite: make sure we get the unencoded url (double slash problem)
                 isset($_SERVER['IIS_WasUrlRewritten'])
                 && $_SERVER['IIS_WasUrlRewritten'] == '1'
                 && isset($_SERVER['UNENCODED_URL'])
                 && $_SERVER['UNENCODED_URL'] != ''
-                ) {
+            ) {
                 $requestUri = $_SERVER['UNENCODED_URL'];
             } elseif (isset($_SERVER['REQUEST_URI'])) {
                 $requestUri = $_SERVER['REQUEST_URI'];