改进swoole的method方法获取

top-think · Jul 2, 2018 · 833fcaf · 833fcaf
1 parent 0af55a5
commit 833fcaf
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/library/think/Request.php b/library/think/Request.php
@@ -783,7 +783,7 @@ public function method($origin = false)
     {
         if ($origin) {
             // 获取原始请求类型
-            return $this->isCli() ? 'GET' : $this->server('REQUEST_METHOD');
+            return $this->server('REQUEST_METHOD') ?: 'GET';
         } elseif (!$this->method) {
             if (isset($_POST[$this->config['var_method']])) {
                 $this->method    = strtoupper($_POST[$this->config['var_method']]);
@@ -792,7 +792,7 @@ public function method($origin = false)
             } elseif ($this->server('HTTP_X_HTTP_METHOD_OVERRIDE')) {
                 $this->method = strtoupper($this->server('HTTP_X_HTTP_METHOD_OVERRIDE'));
             } else {
-                $this->method = $this->isCli() ? 'GET' : $this->server('REQUEST_METHOD');
+                $this->method = $this->server('REQUEST_METHOD') ?: 'GET';
             }
         }