From a109d966c8f0627262e5cac03b6b2caba96ece3c Mon Sep 17 00:00:00 2001
From: xiongziliang <771730766@qq.com>
Date: Wed, 29 May 2019 09:26:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=99=9A=E6=8B=9F=E4=B8=BB?=
 =?UTF-8?q?=E6=9C=BA=E7=9B=B8=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Common/MediaSource.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Common/MediaSource.cpp b/src/Common/MediaSource.cpp
index 3af134ca..a7ca79ab 100644
--- a/src/Common/MediaSource.cpp
+++ b/src/Common/MediaSource.cpp
@@ -230,6 +230,8 @@ void MediaInfo::parse(const string &url){
             _streamid = steamid;
         }
     }
+
+    GET_CONFIG(bool,enableVhost,General::kEnableVhost);
     if(_vhost.empty()){
         //无效vhost
         _vhost = DEFAULT_VHOST;
@@ -237,17 +239,15 @@ void MediaInfo::parse(const string &url){
         if(INADDR_NONE != inet_addr(_vhost.data())){
             //这是ip,未指定vhost;使用默认vhost
             _vhost = DEFAULT_VHOST;
+        }else if(_vhost == "localhost"){
+            //localhost也是默认vhost
+            _vhost = DEFAULT_VHOST;
+        }else if(!enableVhost){
+            //关闭了虚拟主机
+            _vhost = DEFAULT_VHOST;
         }
     }
 
-    if(_vhost == "localhost"){
-        _vhost = DEFAULT_VHOST;
-    }
-
-    GET_CONFIG(bool,enableVhost,General::kEnableVhost);
-    if(!enableVhost){
-        _vhost = DEFAULT_VHOST;
-    }
 }