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

fix typo

pull/432/head
Darien Raymond 2017-02-10 11:57:59 +01:00
parent 1aeab3dd96
commit cfcf16feed
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
transport/internet/websocket/dialer.go
View File

@ -82,7 +82,7 @@ func wsDial(ctx context.Context, dest v2net.Destination) (net.Conn, error) {
if resp != nil {
reason = resp.Status
}
return nil, errors.Base(err).Format("WebSocket|Dialer: Failed to dial to (", uri, "): ", reason)
return nil, errors.Base(err).Message("WebSocket|Dialer: Failed to dial to (", uri, "): ", reason)
}
return &wsconn{

5
transport/internet/websocket/hub.go
View File

@ -74,8 +74,7 @@ func ListenWS(address v2net.Address, port v2net.Port, options internet.ListenOpt
if options.Stream != nil && options.Stream.HasSecuritySettings() {
securitySettings, err := options.Stream.GetEffectiveSecuritySettings()
if err != nil {
log.Error("WebSocket: Failed to create apply TLS config: ", err)
return nil, err
return nil, errors.Base(err).Message("WebSocket: Failed to create apply TLS config.")
}
tlsConfig, ok := securitySettings.(*v2tls.Config)
if ok {
@ -108,7 +107,7 @@ func (ln *Listener) listenws(address v2net.Address, port v2net.Port) error {
go func() {
http.Serve(listener, &requestHandler{
path: "/" + ln.config.GetNormailzedPath(),
path: ln.config.GetNormailzedPath(),
conns: ln.awaitingConns,
})
}()