From 6486891b188c81a81ef77a09d1c7b709e58d35e3 Mon Sep 17 00:00:00 2001 From: v2ray Date: Sun, 24 Apr 2016 22:54:41 +0200 Subject: [PATCH] comments --- proxy/vmess/inbound/config_json.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/proxy/vmess/inbound/config_json.go b/proxy/vmess/inbound/config_json.go index 19ad08bd..f042285f 100644 --- a/proxy/vmess/inbound/config_json.go +++ b/proxy/vmess/inbound/config_json.go @@ -62,7 +62,7 @@ func (this *Config) UnmarshalJSON(data []byte) error { return err } this.AllowedUsers = jsonConfig.Users - this.Features = jsonConfig.Features + this.Features = jsonConfig.Features // Backward compatibility this.Defaults = jsonConfig.Defaults if this.Defaults == nil { this.Defaults = &DefaultConfig{ @@ -70,6 +70,7 @@ func (this *Config) UnmarshalJSON(data []byte) error { AlterIDs: 32, } } + // Backward compatibility if this.Features != nil && this.DetourConfig == nil { this.DetourConfig = this.Features.Detour }