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

handle empty payload in freedom and outbound

pull/2034/head
v2ray 2016-08-15 12:23:35 +02:00
parent cc92973daf
commit 66bb7879e0
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
proxy/freedom/freedom.go
View File

@ -99,7 +99,9 @@ func (this *FreedomConnection) Dispatch(destination v2net.Destination, payload *
readMutex.Lock() readMutex.Lock()
writeMutex.Lock() writeMutex.Lock()
conn.Write(payload.Value) if !payload.IsEmpty() {
conn.Write(payload.Value)
}
go func() { go func() {
v2writer := v2io.NewAdaptiveWriter(conn) v2writer := v2io.NewAdaptiveWriter(conn)

6
proxy/vmess/outbound/outbound.go
View File

@ -97,8 +97,10 @@ func (this *VMessOutboundHandler) handleRequest(session *encoding.ClientSession,
if request.Option.Has(protocol.RequestOptionChunkStream) { if request.Option.Has(protocol.RequestOptionChunkStream) {
streamWriter = vmessio.NewAuthChunkWriter(streamWriter) streamWriter = vmessio.NewAuthChunkWriter(streamWriter)
} }
if err := streamWriter.Write(payload); err != nil { if !payload.IsEmpty() {
conn.SetReusable(false) if err := streamWriter.Write(payload); err != nil {
conn.SetReusable(false)
}
} }
writer.SetCached(false) writer.SetCached(false)