lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-01-02 15:36:41 -05:00
Code Issues Releases Wiki Activity

Properly close inbound when no payload

Browse Source
This commit is contained in:
v2ray 2016-06-11 01:37:33 +02:00
parent 8a83a0b30e
commit d9b59133cc
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -191,14 +191,13 @@ func (this *VMessInboundHandler) HandleConnection(connection *hub.Connection) {
session.EncodeResponseHeader(response, writer) session.EncodeResponseHeader(response, writer)
bodyWriter := session.EncodeResponseBody(writer) bodyWriter := session.EncodeResponseBody(writer)
// Optimize for small response packet
if data, err := output.Read(); err == nil {
var v2writer v2io.Writer = v2io.NewAdaptiveWriter(bodyWriter) var v2writer v2io.Writer = v2io.NewAdaptiveWriter(bodyWriter)
if request.Option.Has(protocol.RequestOptionChunkStream) { if request.Option.Has(protocol.RequestOptionChunkStream) {
v2writer = vmessio.NewAuthChunkWriter(v2writer) v2writer = vmessio.NewAuthChunkWriter(v2writer)
} }
// Optimize for small response packet
if data, err := output.Read(); err == nil {
if err := v2writer.Write(data); err != nil { if err := v2writer.Write(data); err != nil {
connection.SetReusable(false) connection.SetReusable(false)
} }
@ -210,6 +209,7 @@ func (this *VMessInboundHandler) HandleConnection(connection *hub.Connection) {
connection.SetReusable(false) connection.SetReusable(false)
} }
}
output.Release() output.Release()
if request.Option.Has(protocol.RequestOptionChunkStream) { if request.Option.Has(protocol.RequestOptionChunkStream) {
if err := v2writer.Write(alloc.NewSmallBuffer().Clear()); err != nil { if err := v2writer.Write(alloc.NewSmallBuffer().Clear()); err != nil {
@ -217,7 +217,6 @@ func (this *VMessInboundHandler) HandleConnection(connection *hub.Connection) {
} }
} }
v2writer.Release() v2writer.Release()
}
readFinish.Lock() readFinish.Lock()
} }