lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-01-17 23:06:30 -05:00
Code Issues Releases Wiki Activity

fix some lint warnings.

Browse Source
This commit is contained in:
lucifer9 2019-06-27 14:27:47 +08:00
parent e744537b80
commit 1955d72e3e
1 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
transport/internet/http/hub.go
View File

@ -108,12 +108,12 @@ func Listen(ctx context.Context, address net.Address, port net.Port, streamSetti
config := tls.ConfigFromStreamSettings(streamSettings) config := tls.ConfigFromStreamSettings(streamSettings)
if config == nil { if config == nil {
// return nil, newError("TLS must be enabled for http transport.").AtWarning() // return nil, newError("TLS must be enabled for http transport.").AtWarning()
h2s:=&http2.Server{} h2s := &http2.Server{}
server := &http.Server{ server := &http.Server{
Addr: serial.Concat(address, ":", port), Addr: serial.Concat(address, ":", port),
// TLSConfig: config.GetTLSConfig(tls.WithNextProto("h2")), // TLSConfig: config.GetTLSConfig(tls.WithNextProto("h2")),
Handler: h2c.NewHandler(listener,h2s), Handler: h2c.NewHandler(listener, h2s),
ReadHeaderTimeout: time.Second * 4, ReadHeaderTimeout: time.Second * 4,
} }
@ -135,7 +135,7 @@ func Listen(ctx context.Context, address net.Address, port net.Port, streamSetti
}() }()
return listener, nil return listener, nil
} else { }
server := &http.Server{ server := &http.Server{
Addr: serial.Concat(address, ":", port), Addr: serial.Concat(address, ":", port),
TLSConfig: config.GetTLSConfig(tls.WithNextProto("h2")), TLSConfig: config.GetTLSConfig(tls.WithNextProto("h2")),
@ -159,9 +159,7 @@ func Listen(ctx context.Context, address net.Address, port net.Port, streamSetti
newError("stoping serving TLS").Base(err).WriteToLog(session.ExportIDToError(ctx)) newError("stoping serving TLS").Base(err).WriteToLog(session.ExportIDToError(ctx))
} }
}() }()
return listener, nil return listener, nil
}
} }
func init() { func init() {