|
@@ -8,6 +8,7 @@ import (
|
|
"time"
|
|
"time"
|
|
|
|
|
|
"github.com/sagernet/sing/common"
|
|
"github.com/sagernet/sing/common"
|
|
|
|
+ E "github.com/sagernet/sing/common/exceptions"
|
|
)
|
|
)
|
|
|
|
|
|
type HTTPConn struct {
|
|
type HTTPConn struct {
|
|
@@ -16,11 +17,13 @@ type HTTPConn struct {
|
|
}
|
|
}
|
|
|
|
|
|
func (c *HTTPConn) Read(b []byte) (n int, err error) {
|
|
func (c *HTTPConn) Read(b []byte) (n int, err error) {
|
|
- return c.reader.Read(b)
|
|
|
|
|
|
+ n, err = c.reader.Read(b)
|
|
|
|
+ return n, wrapError(err)
|
|
}
|
|
}
|
|
|
|
|
|
func (c *HTTPConn) Write(b []byte) (n int, err error) {
|
|
func (c *HTTPConn) Write(b []byte) (n int, err error) {
|
|
- return c.writer.Write(b)
|
|
|
|
|
|
+ n, err = c.writer.Write(b)
|
|
|
|
+ return n, wrapError(err)
|
|
}
|
|
}
|
|
|
|
|
|
func (c *HTTPConn) Close() error {
|
|
func (c *HTTPConn) Close() error {
|
|
@@ -59,3 +62,10 @@ func (c *ServerHTTPConn) Write(b []byte) (n int, err error) {
|
|
}
|
|
}
|
|
return
|
|
return
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+func wrapError(err error) error {
|
|
|
|
+ if E.IsMulti(err, io.ErrUnexpectedEOF) {
|
|
|
|
+ return io.EOF
|
|
|
|
+ }
|
|
|
|
+ return err
|
|
|
|
+}
|