lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2026-05-04 19:49:08 -04:00
Code Issues Releases Wiki Activity

remove use of any

Browse Source
This commit is contained in:
Darien Raymond
2016-10-16 14:22:21 +02:00
parent 5d9e6b0799
commit e33b7df34c
72 changed files with 728 additions and 792 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
proxy/http/config_json.go
View File

@@ -5,8 +5,6 @@ package http
import (
"encoding/json"
"errors"
"v2ray.com/core/proxy/registry"
)
// UnmarshalJSON implements json.Unmarshaler
@@ -22,7 +20,3 @@ func (this *ServerConfig) UnmarshalJSON(data []byte) error {
return nil
}
func init() {
registry.RegisterInboundConfig("http", func() interface{} { return new(ServerConfig) })
}

3
proxy/http/server.go
View File

@@ -13,6 +13,7 @@ import (
"v2ray.com/core/app/dispatcher"
"v2ray.com/core/common"
v2io "v2ray.com/core/common/io"
"v2ray.com/core/common/loader"
"v2ray.com/core/common/log"
v2net "v2ray.com/core/common/net"
"v2ray.com/core/proxy"
@@ -281,5 +282,5 @@ func (this *ServerFactory) Create(space app.Space, rawConfig interface{}, meta *
}
func init() {
registry.MustRegisterInboundHandlerCreator("http", new(ServerFactory))
registry.MustRegisterInboundHandlerCreator(loader.GetType(new(ServerConfig)), new(ServerFactory))
}