From 53db5d0a7acd472299b0f4c7da6fb60d9358894c Mon Sep 17 00:00:00 2001
From: leunggamciu <gamciuleung@gmail.com>
Date: Tue, 21 Jun 2016 16:46:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8Request=E6=9D=A5=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E8=AF=B7=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/Url.php | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/library/think/Url.php b/library/think/Url.php
index fb9f5a79..9a840b50 100644
--- a/library/think/Url.php
+++ b/library/think/Url.php
@@ -153,9 +153,10 @@ class Url
     protected static function parseDomain(&$url, $domain)
     {
         if ($domain) {
+            $request = Request::instance();
             if (true === $domain) {
                 // 自动判断域名
-                $domain = $_SERVER['HTTP_HOST'];
+                $domain = $request->host();
                 if (Config::get('url_domain_deploy')) {
                     // 根域名
                     $urlDomainRoot = Config::get('url_domain_root');
@@ -184,9 +185,9 @@ class Url
                     }
                 }
             } else {
-                $domain .= strpos($domain, '.') ? '' : strstr($_SERVER['HTTP_HOST'], '.');
+                $domain .= strpos($domain, '.') ? '' : strstr($request->host(), '.');
             }
-            $domain = (self::isSsl() ? 'https://' : 'http://') . $domain;
+            $domain = ($request->isSsl() ? 'https://' : 'http://') . $domain;
         } else {
             $domain = '';
         }
@@ -217,20 +218,6 @@ class Url
         return (empty($suffix) || 0 === strpos($suffix, '.')) ? $suffix : '.' . $suffix;
     }
 
-    /**
-     * 判断是否SSL协议
-     * @return boolean
-     */
-    public static function isSsl()
-    {
-        if (isset($_SERVER['HTTPS']) && ('1' == $_SERVER['HTTPS'] || 'on' == strtolower($_SERVER['HTTPS']))) {
-            return true;
-        } elseif (isset($_SERVER['SERVER_PORT']) && ('443' == $_SERVER['SERVER_PORT'])) {
-            return true;
-        }
-        return false;
-    }
-
     // 匹配路由地址
     public static function getRouteUrl($alias, &$vars = [])
     {