fix error handling in mux

v2ray · Apr 5, 2018 · 435be61 · 435be61
1 parent 2b67533
commit 435be61
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/app/proxyman/mux/mux.go b/app/proxyman/mux/mux.go
@@ -208,6 +208,7 @@ func (m *Client) handleStatusKeep(meta *FrameMetadata, reader *buf.BufferedReade
 			s.input.CloseError()
 			return s.Close()
 		}
+		return nil
 	}
 	return drain(reader)
 }
@@ -368,6 +369,7 @@ func (w *ServerWorker) handleStatusKeep(meta *FrameMetadata, reader *buf.Buffere
 			s.input.CloseError()
 			return s.Close()
 		}
+		return nil
 	}
 	return drain(reader)
 }

diff --git a/app/proxyman/mux/reader.go b/app/proxyman/mux/reader.go
@@ -77,7 +77,6 @@ func NewStreamReader(reader *buf.BufferedReader) *StreamReader {
 // ReadMultiBuffer implmenets buf.Reader.
 func (r *StreamReader) ReadMultiBuffer() (buf.MultiBuffer, error) {
 	if r.leftOver == 0 {
-		r.leftOver = -1
 		return nil, io.EOF
 	}