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

use merging reader only for tcp traffic

pull/432/head
Darien Raymond 2017-04-09 09:08:10 +02:00
parent 35248497d2
commit 2a51b71ba4
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -140,9 +140,12 @@ func transferResponse(timer signal.ActivityTimer, session *encoding.ServerSessio
bodyWriter := session.EncodeResponseBody(request, output) bodyWriter := session.EncodeResponseBody(request, output)
mergeReader := buf.NewMergingReader(input) var reader buf.Reader = input
if request.Command == protocol.RequestCommandTCP {
reader = buf.NewMergingReader(input)
}
// Optimize for small response packet // Optimize for small response packet
data, err := mergeReader.Read() data, err := reader.Read()
if err != nil { if err != nil {
return err return err
} }
@ -158,7 +161,7 @@ func transferResponse(timer signal.ActivityTimer, session *encoding.ServerSessio
} }
} }
if err := buf.PipeUntilEOF(timer, mergeReader, bodyWriter); err != nil { if err := buf.PipeUntilEOF(timer, reader, bodyWriter); err != nil {
return err return err
} }