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

update default response

pull/170/head
v2ray 2016-06-10 23:09:14 +02:00
parent 8b3875050d
commit 9c3f2ada47
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
proxy/blackhole/config_json.go
View File

@ -17,9 +17,9 @@ func (this *Config) UnmarshalJSON(data []byte) error {
if err := json.Unmarshal(data, jsonConfig); err != nil { if err := json.Unmarshal(data, jsonConfig); err != nil {
return err return err
} }
this.Response = new(NoneResponse)
if jsonConfig.Response == nil { if jsonConfig.Response == nil {
this.Response = new(NoneResponse)
} else {
loader := loader.NewJSONConfigLoader("type", "") loader := loader.NewJSONConfigLoader("type", "")
loader.RegisterCreator("none", func() interface{} { return new(NoneResponse) }) loader.RegisterCreator("none", func() interface{} { return new(NoneResponse) })
loader.RegisterCreator("http", func() interface{} { return new(HTTPResponse) }) loader.RegisterCreator("http", func() interface{} { return new(HTTPResponse) })