merge buf stream

This commit is contained in:
Darien Raymond
2017-03-27 11:26:44 +02:00
parent 14824c8451
commit f643344154
4 changed files with 60 additions and 14 deletions
+5 -2
View File
@@ -101,10 +101,13 @@ func (v *Client) Process(ctx context.Context, outboundRay ray.OutboundRay, diale
return err
}
bufferedWriter.SetBuffered(false)
if err := bufferedWriter.SetBuffered(false); err != nil {
return err
}
requestDone := signal.ExecuteAsync(func() error {
if err := buf.PipeUntilEOF(timer, outboundRay.OutboundInput(), bodyWriter); err != nil {
mergedInput := buf.NewMergingReader(outboundRay.OutboundInput())
if err := buf.PipeUntilEOF(timer, mergedInput, bodyWriter); err != nil {
return err
}
return nil
+9 -2
View File
@@ -124,9 +124,16 @@ func (v *Handler) Process(ctx context.Context, outboundRay ray.OutboundRay, dial
firstPayload.Release()
}
writer.SetBuffered(false)
if err := writer.SetBuffered(false); err != nil {
return err
}
if err := buf.PipeUntilEOF(timer, input, bodyWriter); err != nil {
var inputReader buf.Reader = input
if request.Command == protocol.RequestCommandTCP {
inputReader = buf.NewMergingReader(input)
}
if err := buf.PipeUntilEOF(timer, inputReader, bodyWriter); err != nil {
return err
}