From fbd76aaf51d9d7f90bfc6eaae610c3658558fbea Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Sat, 15 Oct 2016 00:02:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9B=E8=B7=AF=E7=94=B1=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/Url.php | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/library/think/Url.php b/library/think/Url.php
index 0c22cd61..24087fc4 100644
--- a/library/think/Url.php
+++ b/library/think/Url.php
@@ -40,22 +40,24 @@ class Url
             $name = substr($url, 1, $pos - 1);
             $url  = 'name' . substr($url, $pos + 1);
         }
-        $info = parse_url($url);
-        $url  = !empty($info['path']) ? $info['path'] : '';
-        if (isset($info['fragment'])) {
-            // 解析锚点
-            $anchor = $info['fragment'];
-            if (false !== strpos($anchor, '?')) {
-                // 解析参数
-                list($anchor, $info['query']) = explode('?', $anchor, 2);
-            }
-            if (false !== strpos($anchor, '@')) {
+        if (false === strpos($url, '://') && 0 !== strpos($url, '/')) {
+            $info = parse_url($url);
+            $url  = !empty($info['path']) ? $info['path'] : '';
+            if (isset($info['fragment'])) {
+                // 解析锚点
+                $anchor = $info['fragment'];
+                if (false !== strpos($anchor, '?')) {
+                    // 解析参数
+                    list($anchor, $info['query']) = explode('?', $anchor, 2);
+                }
+                if (false !== strpos($anchor, '@')) {
+                    // 解析域名
+                    list($anchor, $domain) = explode('@', $anchor, 2);
+                }
+            } elseif (strpos($url, '@') && false === strpos($url, '\\')) {
                 // 解析域名
-                list($anchor, $domain) = explode('@', $anchor, 2);
+                list($url, $domain) = explode('@', $url, 2);
             }
-        } elseif (strpos($url, '@') && false === strpos($url, '\\')) {
-            // 解析域名
-            list($url, $domain) = explode('@', $url, 2);
         }
 
         // 解析参数