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

Merge branch 'master' of https://github.com/v1ray/v2ray-core

pull/642/head^2 v2.31
Darien Raymond 2017-05-30 23:59:27 +02:00
parent cb33232411 3d13bba412
commit a703c30f4f
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
proxy/vmess/inbound/inbound.go
View File

@ -174,7 +174,9 @@ func transferResponse(timer signal.ActivityTimer, session *encoding.ServerSessio
// Process implements proxy.Inbound.Process(). // Process implements proxy.Inbound.Process().
func (v *Handler) Process(ctx context.Context, network net.Network, connection internet.Connection, dispatcher dispatcher.Interface) error { func (v *Handler) Process(ctx context.Context, network net.Network, connection internet.Connection, dispatcher dispatcher.Interface) error {
common.Must(connection.SetReadDeadline(time.Now().Add(time.Second * 8))) if err := connection.SetReadDeadline(time.Now().Add(time.Second * 8)); err != nil {
return err
}
reader := buf.NewBufferedReader(connection) reader := buf.NewBufferedReader(connection)