FPM 模式支持 PATH_INFO，增强 https 判断

imiphp · Oct 8, 2021 · a8582d8 · a8582d8
1 parent fa1632f
commit a8582d8
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/src/Http/Message/FpmRequest.php b/src/Http/Message/FpmRequest.php
@@ -66,7 +66,8 @@ protected function initBody(): void
      */
     protected function initUri(): void
     {
-        if ('on' === ($_SERVER['HTTPS'] ?? null))
+        $https = $_SERVER['HTTPS'] ?? null;
+        if ('on' === $https || '1' === $https || 'https' === ($_SERVER['REQUEST_SCHEME'] ?? null))
         {
             $url = 'https://';
         }
@@ -75,7 +76,19 @@ protected function initUri(): void
             $url = 'http://';
         }
 
-        $this->uri = new Uri($url . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
+        if (isset($_SERVER['PATH_INFO']))
+        {
+            $path = $_SERVER['PATH_INFO'];
+            if (isset($_SERVER['QUERY_STRING']))
+            {
+                $path .= '?' . $_SERVER['QUERY_STRING'];
+            }
+        }
+        else
+        {
+            $path = $_SERVER['REQUEST_URI'];
+        }
+        $this->uri = new Uri($url . $_SERVER['HTTP_HOST'] . $path);
     }
 
     /**