lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-12-30 05:55:20 -05:00
Code Issues Releases Wiki Activity

merge bad configuration error

Browse Source
This commit is contained in:
v2ray
2016-08-18 08:21:20 +02:00
parent 933e244d92
commit 39737f6fc1
10 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
proxy/http/server.go
View File

@@ -11,6 +11,7 @@ import (
"github.com/v2ray/v2ray-core/app"
"github.com/v2ray/v2ray-core/app/dispatcher"
"github.com/v2ray/v2ray-core/common"
v2io "github.com/v2ray/v2ray-core/common/io"
"github.com/v2ray/v2ray-core/common/log"
v2net "github.com/v2ray/v2ray-core/common/net"
@@ -269,7 +270,7 @@ func (this *ServerFactory) StreamCapability() internet.StreamConnectionType {
func (this *ServerFactory) Create(space app.Space, rawConfig interface{}, meta *proxy.InboundHandlerMeta) (proxy.InboundHandler, error) {
if !space.HasApp(dispatcher.APP_ID) {
return nil, registry.ErrBadConfiguration
return nil, common.ErrBadConfiguration
}
return NewServer(
rawConfig.(*Config),