github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

comments

pull/131/head
v2ray 2016-04-24 22:54:41 +02:00
parent 9e1d0d8c5e
commit 6486891b18
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
proxy/vmess/inbound/config_json.go
View File

@ -62,7 +62,7 @@ func (this *Config) UnmarshalJSON(data []byte) error {
return err return err
} }
this.AllowedUsers = jsonConfig.Users this.AllowedUsers = jsonConfig.Users
this.Features = jsonConfig.Features this.Features = jsonConfig.Features // Backward compatibility
this.Defaults = jsonConfig.Defaults this.Defaults = jsonConfig.Defaults
if this.Defaults == nil { if this.Defaults == nil {
this.Defaults = &DefaultConfig{ this.Defaults = &DefaultConfig{
@ -70,6 +70,7 @@ func (this *Config) UnmarshalJSON(data []byte) error {
AlterIDs: 32, AlterIDs: 32,
} }
} }
// Backward compatibility
if this.Features != nil && this.DetourConfig == nil { if this.Features != nil && this.DetourConfig == nil {
this.DetourConfig = this.Features.Detour this.DetourConfig = this.Features.Detour
} }